From: Raspbian forward porter Date: Tue, 17 May 2016 23:45:58 +0000 (+0000) Subject: klibc (2.0.4-9+rpi1) stretch-staging; urgency=medium X-Git-Tag: archive/raspbian/2.0.4-11+rpi1~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cdd2bdbd751a70ab84ed065a46f3c36d83797ee5;p=klibc.git klibc (2.0.4-9+rpi1) stretch-staging; urgency=medium [changes brought forward from 2.0.4-2+rpi1 by Peter Michael Green at Wed, 26 Nov 2014 22:01:00 +0000] * Change compiler settings to values suitable for raspberry pi [dgit import unpatched klibc 2.0.4-9+rpi1] --- cdd2bdbd751a70ab84ed065a46f3c36d83797ee5 diff --cc debian/changelog index 0000000,0000000..3fcaaa8 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,1347 @@@ ++klibc (2.0.4-9+rpi1) stretch-staging; urgency=medium ++ ++ [changes brought forward from 2.0.4-2+rpi1 by Peter Michael Green at Wed, 26 Nov 2014 22:01:00 +0000] ++ * Change compiler settings to values suitable for raspberry pi ++ ++ -- Raspbian forward porter Tue, 17 May 2016 23:45:58 +0000 ++ ++klibc (2.0.4-9) unstable; urgency=medium ++ ++ * Change dh_fixperms arguments to restore binary reproducibility ++ * initramfs-tools: Ensure busybox's hook runs before ours if it is ++ going to be used in the initramfs (Closes: #823323) ++ ++ -- Ben Hutchings Sun, 08 May 2016 21:59:37 +0100 ++ ++klibc (2.0.4-8) unstable; urgency=medium ++ ++ * run-init: Update documentation comment to cover -n option ++ * Add initramfs-tools hook script, in preparation for dropping it from ++ the initramfs-tools-core package ++ ++ -- Ben Hutchings Wed, 10 Feb 2016 23:33:55 +0000 ++ ++klibc (2.0.4-7) unstable; urgency=medium ++ ++ * Drop "revert upstream nuked insmod", as nothing needs it any more ++ * Drop "Use static tools on IA64", as this architecture is dead ++ * Drop "Use static tools on ppc64", as shared builds appear to work now ++ * run-init: Add dry-run mode ++ ++ -- Ben Hutchings Mon, 18 Jan 2016 17:02:18 +0000 ++ ++klibc (2.0.4-6) unstable; urgency=medium ++ ++ * Revert "syscalls: Use direct socket syscalls on i386" (Closes: #809927) ++ * syscalls: Override detection of direct socket syscalls on i386, m68k, s390 ++ ++ -- Ben Hutchings Tue, 05 Jan 2016 21:18:07 +0000 ++ ++klibc (2.0.4-5) unstable; urgency=medium ++ ++ * syscalls: Use direct socket syscalls on i386 (Closes: 809423). ++ This requires Linux 4.3. ++ ++ -- Ben Hutchings Mon, 04 Jan 2016 19:14:50 +0000 ++ ++klibc (2.0.4-4) unstable; urgency=medium ++ ++ * Fix another issue that prevents a reproducible build: ++ - Use dh_lintian-overrides instead of direct installation ++ ++ -- Ben Hutchings Sat, 19 Sep 2015 11:23:44 +0200 ++ ++klibc (2.0.4-3) unstable; urgency=medium ++ ++ * Fix issues that prevent a reproducible build: ++ - Install headers with consistent mode ++ - dash: mkbuiltins: Fix sort order harder ++ * debian/watch: Look for xz-compressed tarballs (Closes: #778299) ++ and use HTTP-S ++ * Remove udebs as they are no longer used (see #653840) ++ * [klibc] Add pread and pwrite 32bit syscall wrappers for parisc ++ (Closes: #745660) ++ * [klibc] ppc64: fix struct stat (Closes: #783292) ++ * debian/control: Add Build-Conflicts: ccache (Closes: #777217) ++ * gzip: Fix silent fallback to decompression (Closes: #355809) ++ * [klibc] mips/setjmp.S: don't save and restore floating-point registers ++ (Closes: #789683) ++ * debian/rules: Fix mips* architecture mapping (fixes FTBFS on mips, mipsel) ++ * debian/control: Change Vcs-Git, Vcs-Browser and Homepage to canonical ++ HTTP-S URLs ++ * debian/control: Bump Standards-Version to 3.9.6; no changes required ++ ++ -- Ben Hutchings Fri, 18 Sep 2015 23:39:49 +0200 ++ ++klibc (2.0.4-2.1) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Add mips64 support. (Closes: #741241) ++ ++ -- YunQiang Su Thu, 27 Aug 2015 21:17:00 +0800 ++ ++klibc (2.0.4-2) unstable; urgency=medium ++ ++ * debian/control: Add myself to Uploaders ++ * [klibc] MIPS: Update archfcntl.h (fixes FTBFS) ++ * Fix compiler warning in usr/klibc/realpath.c ++ ++ -- Ben Hutchings Sun, 05 Oct 2014 01:13:31 +0100 ++ ++klibc (2.0.4-1.2) unstable; urgency=medium ++ ++ * Non-maintainer upload ++ * Implement features needed for mounting /usr in initramfs (Closes: #763049): ++ - Implement realpath() ++ - readlink: Add -f option ++ - mount: Implement -o defaults ++ * debian/rules: Fix clean when userland and kernel architecture differ ++ ++ -- Ben Hutchings Sat, 04 Oct 2014 17:01:24 +0100 ++ ++klibc (2.0.4-1.1) unstable; urgency=medium ++ ++ [ Aurelien Jarno ] ++ * Non-maintainer upload. ++ ++ [ Mauricio Faria de Oliveira ] ++ * Add ppc64el-load-toc-syscall-stub.patch: fix segfault on dynamically-linked ++ binaries on ppc64el. (Closes: #749060) ++ ++ -- Aurelien Jarno Wed, 17 Sep 2014 13:47:02 +0200 ++ ++klibc (2.0.4-1) unstable; urgency=medium ++ ++ * New upstream release (x86, readlink) (closes: #760587) ++ ++ -- maximilian attems Thu, 11 Sep 2014 21:23:25 +0200 ++ ++klibc (2.0.3-1) unstable; urgency=medium ++ ++ * New upstream release (arm64, ppc64) (closes: #698018, #744884) ++ Thanks to Steve Capper ++ and Anton Blanchard . ++ * Pump standard version to 3.9.5 without changes. ++ ++ -- maximilian attems Mon, 21 Apr 2014 10:52:22 -0700 ++ ++klibc (2.0.2-1) unstable; urgency=low ++ ++ * New upstream release (dash, arm) ++ - drop merged patches ++ - build fixes for Linux > 3.4 (closes: #702068) ++ ++ -- maximilian attems Mon, 19 Aug 2013 22:59:22 +0200 ++ ++klibc (2.0.1-3) unstable; urgency=medium ++ ++ [ Bill Pringlemeir ] ++ * [f05ff11] [klibc] fix ARM longjmp with zero 'val'. ++ ++ -- maximilian attems Mon, 08 Oct 2012 21:57:01 +0200 ++ ++klibc (2.0.1-2) unstable; urgency=low ++ ++ [ Sven Joachim ] ++ * [08c03cf] klibc: produces 64-bit binaries on i386 with x86_64 kernel ++ (Closes: #677087) ++ ++ [ Thorsten Glaser ] ++ * [d8eae3a] [klibc] arm: fix trashing of callee-saved registers in thumb ++ setjmp() (Closes: #634890) ++ * [81170b5] [klibc] arm: unbreak armhf shared binaries (those with thumb) ++ * [aeb7847] armhf builds are always thumb ++ ++ [ Jim Meyering ] ++ * [9ba90cd] [klibc] Avoid overflow for very long variable name ++ ++ -- maximilian attems Mon, 01 Oct 2012 15:54:05 +0200 ++ ++klibc (2.0.1-1) unstable; urgency=high ++ ++ * New upstream release (nfsmount, get{host,domain}name()) ++ * debian/watch: fix file for new repo layout. ++ ++ -- maximilian attems Thu, 28 Jun 2012 18:29:48 +0200 ++ ++klibc (2.0-2) unstable; urgency=low ++ ++ * debian/control: Add breaks to initramfs-tools for ipconfig /run switch. ++ ++ -- maximilian attems Thu, 31 May 2012 15:42:03 +0200 ++ ++klibc (2.0-1) unstable; urgency=low ++ ++ * New upstream release (arch, ipconfig) ++ - ipconfig support domain-search, lease (closes: #627166) ++ ++ -- maximilian attems Thu, 31 May 2012 15:05:55 +0200 ++ ++klibc (2.0~rc5-1) unstable; urgency=low ++ ++ * New upstream snapshot (arch fixes) (closes: #673413) ++ ++ -- maximilian attems Fri, 18 May 2012 18:16:51 +0200 ++ ++klibc (2.0~rc4-1) unstable; urgency=low ++ ++ * New upstream snapshot (stdio work) ++ - drop merged m68k-support ++ * armel: Set arm arch for cross compiling. ++ * klibc-linux-libc-dev: Adapt for cross building (closes: #666389) ++ Based on Marcin Juszkiewicz ++ ++ -- maximilian attems Fri, 18 May 2012 14:48:04 +0200 ++ ++klibc (2.0~rc3-1) unstable; urgency=low ++ ++ * New upstream snapshot (closes: #653790) ++ - klibc/s390x klcc fix thanks to Aurelien Jarno . ++ * Pump standard version to 3.9.3 without changes. ++ ++ -- maximilian attems Fri, 02 Mar 2012 11:08:51 +0100 ++ ++klibc (2.0~rc2-0.1) unstable; urgency=low ++ ++ * Non-maintainer upload with consent of maintainer. ++ * Upload to unstable (maks says we target 2.0 for wheezy) ++ * New upstream snapshot (fixes FTBFS) ++ * Update Vcs-* for (temporary) move to collab-maint ++ * Refresh all patches ++ * Add m68k patch submitted upstream, for testing (Closes: #334917) ++ * Shut up lintian ++ ++ -- Thorsten Glaser Sat, 11 Feb 2012 19:25:23 +0000 ++ ++klibc (1.5.25-1.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Fix build to work with multiarched linux-libc-dev (using patch from ++ Ubuntu), closes: #645738. ++ ++ -- Julien Cristau Fri, 30 Dec 2011 17:04:30 +0100 ++ ++klibc (2.0~rc1-1experimental1) experimental; urgency=low ++ ++ * New upstream snapshot release (buffered stdio) ++ * Ubuntu sync fix klcc for multiarch. (closes: #639057, LP: #829356) ++ Thanks Colin Watson . ++ ++ -- maximilian attems Tue, 06 Sep 2011 17:57:54 +0200 ++ ++klibc (1.5.25-1) unstable; urgency=low ++ ++ * New upstream release (scandir, capset, capget, kinit drop_capabilities) ++ ++ -- maximilian attems Tue, 23 Aug 2011 17:54:43 +0200 ++ ++klibc (1.5.24-1) unstable; urgency=low ++ ++ * New upstream release (sched_setaffinity, sched_getaffinity, kexec_load) ++ - ipconfig: Don't try to guess the nameserver. (closes: #594638) ++ - refresh debian/patches/klibc-linux-libc-dev ++ ++ -- maximilian attems Wed, 27 Jul 2011 16:54:47 +0200 ++ ++klibc (1.5.23-2) unstable; urgency=low ++ ++ * Really apply Fix-minimal-mv-to-work-across-fs. ++ ++ -- maximilian attems Fri, 08 Jul 2011 01:09:48 +0200 ++ ++klibc (1.5.23-1) unstable; urgency=low ++ ++ * New upstream release (arm, dash sync, limits.h, ppc64) ++ - minimal mv in klibc-utils. ++ - refresh debian/patches/insmod ++ * Add Fix-minimal-mv-to-work-across-fs.patch (closes: #627808) ++ * Add armhf support. (closes: #627252) ++ Thanks to Konstantinos Margaritis . ++ * Add klibc crosscompile support. (closes: #629934) ++ Thanks to Steve McIntyre . ++ * debian/copyright: Add specific BSD license text to keep lintian happy. ++ ++ -- maximilian attems Tue, 14 Jun 2011 17:32:53 +0200 ++ ++klibc (1.5.22-1) unstable; urgency=high ++ ++ * New upstream release (arm, ipconfig) ++ - arm: fix build failure with latest binutils. (closes: #618616) ++ - arm: use bx on thumb2 (v3) (LP: #527720) ++ - ipconfig: handle multiple connected network dev. (closes: #621065) ++ * Ubuntu sync add ppc64-static. (closes: #613955) ++ Thanks Colin Watson . ++ * Ubuntu sync add klcc multiarch-include-path. (closes: #622814) ++ Thanks Steve Langasek ++ * Pump standard version to 3.9.2 without changes. ++ * Drop Jeff Bailey from Uploaders. ++ ++ -- maximilian attems Wed, 18 May 2011 13:39:01 +0200 ++ ++klibc (1.5.21-1) unstable; urgency=low ++ ++ * New upstream release (i386 signal(), make 3.82, cleanups) ++ ++ -- maximilian attems Tue, 25 Jan 2011 23:45:20 +0100 ++ ++klibc (1.5.20-1) unstable; urgency=high ++ ++ * New upstream release ++ - ipconfig: fix infinite loop. (closes: #552554) ++ - ipconfig: fix multiple dns domains. (closes: #594208) ++ * klibc-utils.postinst: Nuke non empty dirs too. (closes: #594651) ++ ++ -- maximilian attems Sat, 28 Aug 2010 12:23:51 +0200 ++ ++klibc (1.5.19-1) unstable; urgency=high ++ ++ * New upstream release ++ - resume: silence warning on resume try. (closes: #586006) ++ - sh4: syscalls fixes. (closes: #578076) ++ * Fix doc symlinks on upgrade. (closes: #588763) ++ Thanks Sven Joachim . ++ * Pump standard version to 3.9.1 without changes. ++ ++ -- maximilian attems Wed, 25 Aug 2010 13:07:03 +0200 ++ ++klibc (1.5.18-1) unstable; urgency=medium ++ ++ * New upstream release (dash 0.5.6) ++ - fstype btrfs (closes: #548047), ext4 !journal (closes: #536592) ++ - sh4 build fix (closes: #574834) ++ - shipp renamed README.ipconfig (closes: #478589) ++ ++ -- maximilian attems Thu, 22 Apr 2010 03:38:55 +0200 ++ ++klibc (1.5.17-4) unstable; urgency=medium ++ ++ * libklibc-dev: On preinst remove old include dirs that hinder ++ shipped symlinks to linux-libc-dev. (closes: #574854) ++ ++ -- maximilian attems Sun, 21 Mar 2010 22:51:11 +0100 ++ ++klibc (1.5.17-3) unstable; urgency=low ++ ++ * Override dh_auto_test to pass DEB_HOST_ARCH on make test. (closes: #574746) ++ ++ -- maximilian attems Sat, 20 Mar 2010 20:52:09 +0100 ++ ++klibc (1.5.17-2) unstable; urgency=low ++ ++ * Set DEB_HOST_ARCH using dpkg-architecture. (closes: #574740) ++ ++ -- maximilian attems Sat, 20 Mar 2010 18:24:16 +0100 ++ ++klibc (1.5.17-1) unstable; urgency=low ++ ++ [ Jan Hauke Rahm ] ++ * Switch from cdbs to debhelper 7 ++ * Switch to Source Format 3.0 (quilt) (closes: #573908) ++ * Make documentation of klibc-utils and libklibc-dev be a symlink to ++ libklibc ++ ++ [ maximilian attems ] ++ * New upstream release ++ - Fix FTFBS i386/sparc. (closes: #573926) ++ - sparc, sparc64 use sys_socketcall unconditionally. (closes: #444087) ++ - ipconfig may discard useful packets. (closes: #511959) ++ ++ -- maximilian attems Sat, 20 Mar 2010 02:11:20 +0100 ++ ++klibc (1.5.16-1) unstable; urgency=low ++ ++ [ maximilian attems ] ++ * New upstream release ++ - ipconfig: raise field length for rootpath DHCP option. ++ (closes: #497800) ++ - ipconfig: send requested hostname in DHCP discover/request. ++ (closes: #367301) ++ - ipconfig: set null ciaddr on DHCPREQUEST during SELECTING state. ++ (closes: #497879) ++ - mount: list fs all mounted fs, support -t switch for one fs. ++ (closes: #491067) ++ - refresh 10_insmod.patch. ++ - readlink be silent on failure. (closes: #565224) ++ - fix compilation against up to 2.6.33 linux-libc-dev. (closes: #552825) ++ * watch file fixup for new upstream directories. ++ * Pump standard version to 3.8.4 without changes. ++ * Add lintian overrides for embedded-zlib needed for early userspace. ++ ++ [ Nobuhiro Iwamatsu ] ++ * klibc: add support Renesas SH(sh4) (closes: #540126) ++ ++ [ Ben Hutchings ] ++ * Fix klibc Debian specific build with 02-klibc_linux_libc_dev.patch. ++ * Add libklibc-dev depends on linux-libc-dev. ++ ++ -- maximilian attems Sun, 14 Mar 2010 22:46:21 +0100 ++ ++klibc (1.5.15-1) unstable; urgency=low ++ ++ [ maximilian attems ] ++ * New upstream release: ++ - fstype ext4 support. (closes: #510758) ++ - chroot cmd fixed. (closes: #494829) ++ * Pump standard version to 3.8.0 without changes. ++ * Drop arm of the klibc-utils-floppy-udeb arch list. ++ * Fix debhelper-but-no-misc-depends. ++ * debian/copyright refer to GPL v2. ++ * debian/rules nuke old commented unused lines. ++ ++ [ Colin Watson ] ++ * Add lpia to the architecture list for klibc-utils-floppy-udeb. ++ (closes: #506427) ++ ++ [ Thiemo Seufer ] ++ * Fix FTBFS on MIPS64 kernel. (closes: #496175) ++ ++ -- maximilian attems Mon, 16 Feb 2009 16:41:51 +0100 ++ ++klibc (1.5.14-1~exp1) experimental; urgency=low ++ ++ * New upstream version ++ - nuke merged 11_klibc-Default-signal-3-to-bsd_signal-3.patch ++ - no longer hardcode gcc ++ ++ -- maximilian attems Mon, 11 Aug 2008 16:34:11 +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 diff --cc debian/compat index 0000000,0000000..7f8f011 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++7 diff --cc debian/control index 0000000,0000000..2be47ae new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,44 @@@ ++Source: klibc ++Priority: optional ++Maintainer: maximilian attems ++Uploaders: Ben Hutchings ++Build-Depends: debhelper (>= 7.0.50), linux-libc-dev, bison, m4 ++# klcc will depend on ccache if it was installed at build time; see #777217 ++Build-Conflicts: ccache ++Section: libs ++Standards-Version: 3.9.6 ++Vcs-Browser: https://anonscm.debian.org/cgit/kernel/klibc.git ++Vcs-Git: https://anonscm.debian.org/git/kernel/klibc.git ++# maybe some day replace with a real one? ++Homepage: https://git.kernel.org/cgit/libs/klibc/klibc.git ++ ++Package: libklibc-dev ++Section: libdevel ++Architecture: any ++Depends: libklibc (= ${binary:Version}), linux-libc-dev, ${misc:Depends} ++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 ++Architecture: any ++Depends: ${misc:Depends} ++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 ++Architecture: any ++Depends: libklibc (= ${binary:Version}), ${misc:Depends} ++Breaks: initramfs-tools (<< 0.103) ++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. ++ diff --cc debian/copyright index 0000000,0000000..7b60024 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,56 @@@ ++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 GNU General Public ++License v2 can be found in `/usr/share/common-licenses/GPL-2'. ++ ++-- BSD license text ++ ++Some files are derived from files copyrighted by the Regents of The ++University of California, and are available under the following ++license: ++ ++Note: The advertising clause in the license appearing on BSD Unix ++files was officially rescinded by the Director of the Office of ++Technology Licensing of the University of California on July 22 ++1999. He states that clause 3 is "hereby deleted in its entirety." ++ ++ * Copyright (c) ++ * The Regents of the University of California. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. All advertising materials mentioning features or use of this software ++ * must display the following acknowledgement: ++ * This product includes software developed by the University of ++ * California, Berkeley and its contributors. ++ * 4. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ diff --cc debian/initramfs-tools/hooks/klibc-utils index 0000000,0000000..0fb6dd9 new file mode 100755 --- /dev/null +++ b/debian/initramfs-tools/hooks/klibc-utils @@@ -1,0 -1,0 +1,38 @@@ ++#!/bin/sh ++ ++prereqs() ++{ ++ if [ "${BUSYBOX}" = "n" ] || [ -z "${BUSYBOXDIR}" ]; then ++ echo '' ++ else ++ # Ensure busybox installs all its commands before ++ # checking what we should provide ++ echo zz-busybox ++ fi ++} ++ ++case $1 in ++# get pre-requisites ++prereqs) ++ prereqs ++ exit 0 ++ ;; ++esac ++ ++# klibc ++cp -pnL /usr/lib/klibc/bin/* ${DESTDIR}/bin ++cp -pL /lib/klibc-*.so ${DESTDIR}/lib ++rm -f ${DESTDIR}/bin/kinit* ++if [ "${BUSYBOX}" = "n" ] || [ -z "${BUSYBOXDIR}" ]; then ++ rm -f ${DESTDIR}/bin/zcat ++ if [ -e ${DESTDIR}/bin/sh.shared ]; then ++ # Some platforms build a shared klibc/sh: ++ mv ${DESTDIR}/bin/sh.shared ${DESTDIR}/bin/sh ++ elif [ -e /usr/lib/klibc/bin/sh ]; then ++ # Others build a static version instead: ++ cp -pL /usr/lib/klibc/bin/sh ${DESTDIR}/bin/sh ++ fi ++else ++ # Nobody wanted it, so save a tiny bit of space: ++ rm -f ${DESTDIR}/bin/sh.shared ++fi diff --cc debian/klibc-utils.install index 0000000,0000000..f8fdf1b new file mode 100644 --- /dev/null +++ b/debian/klibc-utils.install @@@ -1,0 -1,0 +1,2 @@@ ++debian/tmp/usr/lib/klibc/bin/* ++debian/initramfs-tools/hooks/klibc-utils /usr/share/initramfs-tools/hooks/ diff --cc debian/klibc-utils.lintian-overrides index 0000000,0000000..72e5b01 new file mode 100644 --- /dev/null +++ b/debian/klibc-utils.lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++klibc-utils: statically-linked-binary ++klibc-utils: embedded-zlib diff --cc debian/klibc-utils.postinst index 0000000,0000000..8f6e196 new file mode 100644 --- /dev/null +++ b/debian/klibc-utils.postinst @@@ -1,0 -1,0 +1,12 @@@ ++#!/bin/sh ++ ++set -e ++ ++if [ ! -L /usr/share/doc/klibc-utils ] && \ ++[ -e /usr/share/doc/klibc-utils ]; then ++ rm -rf /usr/share/doc/klibc-utils ++ cd /usr/share/doc/ ++ ln -sf libklibc /usr/share/doc/klibc-utils ++fi ++ ++#DEBHELPER# diff --cc debian/klibc-utils.postrm index 0000000,0000000..88f239c new file mode 100755 --- /dev/null +++ b/debian/klibc-utils.postrm @@@ -1,0 -1,0 +1,12 @@@ ++#!/bin/sh -e ++ ++if [ "$1" = remove ] || [ "$1" = abort-install ] || [ "$1" = disappear ] || \ ++ { { [ "$1" = abort-upgrade ] || [ "$1" = upgrade ]; } && \ ++ dpkg --compare-versions "$2" lt 2.0.4-8~; }; then ++ # Restore the klibc hook installed by older versions of initramfs-tools ++ dpkg-divert --package klibc-utils --remove --rename \ ++ --divert /usr/share/initramfs-tools/hooks/klibc^i-t \ ++ /usr/share/initramfs-tools/hooks/klibc ++fi ++ ++#DEBHELPER# diff --cc debian/klibc-utils.preinst index 0000000,0000000..c4d91e9 new file mode 100755 --- /dev/null +++ b/debian/klibc-utils.preinst @@@ -1,0 -1,0 +1,10 @@@ ++#!/bin/sh -e ++ ++if [ "$1" != upgrade ] || dpkg --compare-versions "$2" lt 2.0.4-8~; then ++ # Disable the klibc hook installed by older versions of initramfs-tools ++ dpkg-divert --package klibc-utils --add --rename \ ++ --divert /usr/share/initramfs-tools/hooks/klibc^i-t \ ++ /usr/share/initramfs-tools/hooks/klibc ++fi ++ ++#DEBHELPER# diff --cc debian/libklibc-dev.install index 0000000,0000000..709ddf1 new file mode 100644 --- /dev/null +++ b/debian/libklibc-dev.install @@@ -1,0 -1,0 +1,3 @@@ ++debian/tmp/usr/lib/klibc/include/* ++debian/tmp/usr/lib/klibc/lib/* ++debian/tmp/usr/bin/klcc* diff --cc debian/libklibc-dev.lintian-overrides index 0000000,0000000..bd22adb new file mode 100644 --- /dev/null +++ b/debian/libklibc-dev.lintian-overrides @@@ -1,0 -1,0 +1,7 @@@ ++libklibc-dev: statically-linked-binary ++libklibc-dev: unstripped-binary-or-object ++libklibc-dev: embedded-zlib ++# lintian cannot check these; they are part of linux-libc-dev ++libklibc-dev: package-contains-broken-symlink usr/lib/klibc/include/asm * ++libklibc-dev: package-contains-broken-symlink usr/lib/klibc/include/asm-generic * ++libklibc-dev: package-contains-broken-symlink usr/lib/klibc/include/linux * diff --cc debian/libklibc-dev.manpages index 0000000,0000000..006f97c new file mode 100644 --- /dev/null +++ b/debian/libklibc-dev.manpages @@@ -1,0 -1,0 +1,1 @@@ ++klcc/klcc.1 diff --cc debian/libklibc-dev.preinst index 0000000,0000000..9694ab2 new file mode 100644 --- /dev/null +++ b/debian/libklibc-dev.preinst @@@ -1,0 -1,0 +1,11 @@@ ++#!/bin/sh ++ ++set -e ++ ++#DEBHELPER# ++ ++BASEDIR=/usr/lib/klibc/include/ ++# these are shipped symlinks to linux-libc-dev and not directories ++if [ -d ${BASEDIR}linux ] || [ -d ${BASEDIR}asm ]; then ++ rm -rf ${BASEDIR}linux ${BASEDIR}asm* ++fi diff --cc debian/libklibc.docs index 0000000,0000000..fa8b07f new file mode 100644 --- /dev/null +++ b/debian/libklibc.docs @@@ -1,0 -1,0 +1,4 @@@ ++README ++usr/klibc/README.klibc ++usr/klibc/arch/README.klibc.arch ++usr/kinit/ipconfig/README.ipconfig diff --cc debian/libklibc.install index 0000000,0000000..8cd41ea new file mode 100644 --- /dev/null +++ b/debian/libklibc.install @@@ -1,0 -1,0 +1,1 @@@ ++debian/tmp/lib/klibc*.so diff --cc debian/libklibc.lintian-overrides index 0000000,0000000..9ab08bb new file mode 100644 --- /dev/null +++ b/debian/libklibc.lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++libklibc: statically-linked-binary ++libklibc: embedded-zlib diff --cc debian/patches/0001-add-mips64-support-headers.patch index 0000000,0000000..21f64f2 new file mode 100644 --- /dev/null +++ b/debian/patches/0001-add-mips64-support-headers.patch @@@ -1,0 -1,0 +1,171 @@@ ++From: Dejan Latinovic ++Date: Thu, 5 Mar 2015 16:51:44 -0800 ++Subject: [PATCH 1/3] add-mips64-support-headers ++Origin: https://git.kernel.org/cgit/libs/klibc/klibc.git/commit/?id=493f9a99220aed4eb7c6e3dd9018c037d45b13e2 ++ ++Description: Added header files for mips64. ++Modeled on mips 32 header files and adapted for 64 bit ABI. ++ - archsetjmp.h: do not save floating-point state ++ - asm.h: Symbolic register names for 64 bit ABI ++--- ++ usr/include/arch/mips64/klibc/archconfig.h | 5 ++ ++ usr/include/arch/mips64/klibc/archsetjmp.h | 26 ++++++++++ ++ usr/include/arch/mips64/machine/asm.h | 82 ++++++++++++++++++++++++++++++ ++ usr/include/fcntl.h | 2 +- ++ 4 files changed, 114 insertions(+), 1 deletion(-) ++ create mode 100644 usr/include/arch/mips64/klibc/archsetjmp.h ++ create mode 100644 usr/include/arch/mips64/machine/asm.h ++ ++diff --git a/usr/include/arch/mips64/klibc/archconfig.h b/usr/include/arch/mips64/klibc/archconfig.h ++index 4d856a5..df3cf1c 100644 ++--- a/usr/include/arch/mips64/klibc/archconfig.h +++++ b/usr/include/arch/mips64/klibc/archconfig.h ++@@ -12,7 +12,12 @@ ++ /* MIPS has nonstandard socket definitions */ ++ #define _KLIBC_HAS_ARCHSOCKET_H 1 ++ +++#define _KLIBC_STATFS_F_TYPE_64 1 +++ ++ /* We can use RT signals on MIPS */ ++ #define _KLIBC_USE_RT_SIG 1 ++ +++/* MIPS has architecture-specific code for vfork() */ +++#define _KLIBC_REAL_VFORK 1 +++ ++ #endif /* _KLIBC_ARCHCONFIG_H */ ++diff --git a/usr/include/arch/mips64/klibc/archsetjmp.h b/usr/include/arch/mips64/klibc/archsetjmp.h ++new file mode 100644 ++index 0000000..c4587dc ++--- /dev/null +++++ b/usr/include/arch/mips64/klibc/archsetjmp.h ++@@ -0,0 +1,26 @@ +++/* +++ * arch/mips64/include/klibc/archsetjmp.h +++ */ +++ +++#ifndef _KLIBC_ARCHSETJMP_H +++#define _KLIBC_ARCHSETJMP_H +++ +++struct __jmp_buf { +++ unsigned long __s0; +++ unsigned long __s1; +++ unsigned long __s2; +++ unsigned long __s3; +++ unsigned long __s4; +++ unsigned long __s5; +++ unsigned long __s6; +++ unsigned long __s7; +++ unsigned long __gp; +++ unsigned long __sp; +++ unsigned long __s8; +++ unsigned long __ra; +++ unsigned long __unused; +++} __attribute__ ((aligned(8))); +++ +++typedef struct __jmp_buf jmp_buf[1]; +++ +++#endif /* _KLIBC_ARCHSETJMP_H */ ++diff --git a/usr/include/arch/mips64/machine/asm.h b/usr/include/arch/mips64/machine/asm.h ++new file mode 100644 ++index 0000000..42dcaa4 ++--- /dev/null +++++ b/usr/include/arch/mips64/machine/asm.h ++@@ -0,0 +1,82 @@ +++/* +++ * arch/mips64/include/machine/asm.h +++ */ +++ +++#ifndef _MACHINE_ASM_H +++#define _MACHINE_ASM_H +++ +++/* +++ * Symbolic register names for 64 bit ABI +++ */ +++ +++ +++#define zero $0 /* wired zero */ +++#define AT $at /* assembler temp - uppercase because of ".set at" */ +++#define v0 $2 /* return value - caller saved */ +++#define v1 $3 +++#define a0 $4 /* argument registers */ +++#define a1 $5 +++#define a2 $6 +++#define a3 $7 +++#define a4 $8 /* arg reg 64 bit; caller saved in 32 bit */ +++#define ta0 $8 +++#define a5 $9 +++#define ta1 $9 +++#define a6 $10 +++#define ta2 $10 +++#define a7 $11 +++#define ta3 $11 +++#define t4 $12 /* caller saved */ +++#define t5 $13 +++#define t6 $14 +++#define t7 $15 +++#define s0 $16 /* callee saved */ +++#define s1 $17 +++#define s2 $18 +++#define s3 $19 +++#define s4 $20 +++#define s5 $21 +++#define s6 $22 +++#define s7 $23 +++#define t8 $24 /* caller saved */ +++#define t9 $25 /* callee address for PIC/temp */ +++#define jp $25 /* PIC jump register */ +++#define k0 $26 /* kernel temporary */ +++#define k1 $27 +++#define gp $28 /* global pointer - caller saved for PIC */ +++#define sp $29 /* stack pointer */ +++#define fp $30 /* frame pointer */ +++#define s8 $30 /* callee saved */ +++#define ra $31 /* return address */ +++ +++ +++/* +++ * LEAF - declare leaf routine +++ */ +++#define LEAF(symbol) \ +++ .globl symbol; \ +++ .align 2; \ +++ .type symbol,@function; \ +++ .ent symbol,0; \ +++symbol: .frame sp,0,ra +++ +++ +++/* +++ * NESTED - declare nested routine entry point +++ */ +++#define NESTED(symbol, framesize, rpc) \ +++ .globl symbol; \ +++ .align 2; \ +++ .type symbol,@function; \ +++ .ent symbol,0; \ +++symbol: .frame sp, framesize, rpc +++ +++/* +++ * END - mark end of function +++ */ +++#define END(function) \ +++ .end function; \ +++ .size function,.-function +++ +++ +++#endif /* _MACHINE_ASM_H */ ++diff --git a/usr/include/fcntl.h b/usr/include/fcntl.h ++index bbd6917..16128f8 100644 ++--- a/usr/include/fcntl.h +++++ b/usr/include/fcntl.h ++@@ -9,7 +9,7 @@ ++ #include ++ #include ++ #include ++-#if defined(__mips__) && !defined(__mips64__) +++#if defined(__mips__) && ! defined(__mips64) ++ # include ++ #endif ++ #include ++-- ++2.4.5 ++ diff --cc debian/patches/0002-add-mips64-support-arch-mips32.patch index 0000000,0000000..79a5eae new file mode 100644 --- /dev/null +++ b/debian/patches/0002-add-mips64-support-arch-mips32.patch @@@ -1,0 -1,0 +1,71 @@@ ++From: Dejan Latinovic ++Date: Thu, 5 Mar 2015 16:51:44 -0800 ++Subject: [PATCH 2/3] add-mips64-support-arch-mips32 ++Origin: https://git.kernel.org/cgit/libs/klibc/klibc.git/commit/?id=ccd50880175e79fb9bc544c96d72b8971303cc0a ++ ++Description: Add mips64 support, using existing mips32 code. ++ - using mips32 assembler source files: pipe.S vfork.S syscall.S ++ - sysstub.ph: copied over from klibc/arch/mips ++--- ++ usr/klibc/arch/mips64/Kbuild | 11 +++++++++++ ++ usr/klibc/arch/mips64/sysstub.ph | 29 +++++++++++++++++++++++++++++ ++ 2 files changed, 40 insertions(+) ++ create mode 100644 usr/klibc/arch/mips64/sysstub.ph ++ ++diff --git a/usr/klibc/arch/mips64/Kbuild b/usr/klibc/arch/mips64/Kbuild ++index 970c0f8..6fe3b53 100644 ++--- a/usr/klibc/arch/mips64/Kbuild +++++ b/usr/klibc/arch/mips64/Kbuild ++@@ -1,3 +1,14 @@ ++ # ++ # klibc files for mips64 ++ # +++ +++klib-y := ../mips/pipe.o ../mips/vfork.o setjmp.o ../mips/syscall.o +++ +++klib-y += ../../libgcc/__clzsi2.o ../../libgcc/__ashldi3.o +++klib-y += ../../libgcc/__ashrdi3.o ../../libgcc/__lshrdi3.o +++klib-y += ../../libgcc/__divdi3.o ../../libgcc/__moddi3.o +++klib-y += ../../libgcc/__udivdi3.o ../../libgcc/__umoddi3.o +++klib-y += ../../libgcc/__udivmoddi4.o +++ +++always := crt0.o +++targets := crt0.o ++diff --git a/usr/klibc/arch/mips64/sysstub.ph b/usr/klibc/arch/mips64/sysstub.ph ++new file mode 100644 ++index 0000000..e8a0200 ++--- /dev/null +++++ b/usr/klibc/arch/mips64/sysstub.ph ++@@ -0,0 +1,29 @@ +++# -*- perl -*- +++# +++# arch/mips64/sysstub.ph +++# +++# Script to generate system call stubs +++# +++ +++# On MIPS, most system calls follow the standard convention, with the +++# system call number in r0 (v0), return an error value in r19 (a3) as +++# well as the return value in r0 (v0). +++ +++sub make_sysstub($$$$$@) { +++ my($outputdir, $fname, $type, $sname, $stype, @args) = @_; +++ +++ $stype = $stype || 'common'; +++ open(OUT, '>', "${outputdir}/${fname}.S"); +++ print OUT "#include \n"; +++ print OUT "#include \n"; +++ print OUT "\n"; +++ print OUT "\t.set noreorder\n"; +++ print OUT "\n"; +++ print OUT "LEAF(${fname})\n"; +++ print OUT "\tj\t__syscall_${stype}\n"; +++ print OUT "\t li\tv0, __NR_${sname}\n"; +++ print OUT "\tEND(${fname})\n"; +++ close(OUT); +++} +++ +++1; ++-- ++2.4.5 ++ diff --cc debian/patches/0003-add-mips64-support-arch-mips64-specific.patch index 0000000,0000000..134d298 new file mode 100644 --- /dev/null +++ b/debian/patches/0003-add-mips64-support-arch-mips64-specific.patch @@@ -1,0 -1,0 +1,124 @@@ ++From: Dejan Latinovic ++Date: Thu, 5 Mar 2015 16:51:45 -0800 ++Subject: [PATCH 3/3] add-mips64-support-arch-mips64-specific ++Origin: https://git.kernel.org/cgit/libs/klibc/klibc.git/commit/?id=3438d861da2e6939a6b0d454ffe247c19ead5993 ++ ++Description: Adding mips64 specific chagnes. ++Modeled on mips 32 and adapted for 64 bit ABI. ++ - MCONFIG: using existing klibc.ld scrpit ++ - crt0.S: adapted gp initialization ++ - setjmp.S: do not save floating-point state ++--- ++ usr/klibc/arch/mips64/MCONFIG | 2 ++ ++ usr/klibc/arch/mips64/crt0.S | 31 ++++++++++++++++++++++++++ ++ usr/klibc/arch/mips64/setjmp.S | 50 ++++++++++++++++++++++++++++++++++++++++++ ++ 3 files changed, 83 insertions(+) ++ create mode 100644 usr/klibc/arch/mips64/crt0.S ++ create mode 100644 usr/klibc/arch/mips64/setjmp.S ++ ++diff --git a/usr/klibc/arch/mips64/MCONFIG b/usr/klibc/arch/mips64/MCONFIG ++index 5c50b8d..b37cc6a 100644 ++--- a/usr/klibc/arch/mips64/MCONFIG +++++ b/usr/klibc/arch/mips64/MCONFIG ++@@ -9,3 +9,5 @@ ++ ++ KLIBCOPTFLAGS += -Os ++ KLIBCBITSIZE = 64 +++ +++KLIBCSHAREDFLAGS = -T $(src)/arch/mips/klibc.ld ++diff --git a/usr/klibc/arch/mips64/crt0.S b/usr/klibc/arch/mips64/crt0.S ++new file mode 100644 ++index 0000000..775a919 ++--- /dev/null +++++ b/usr/klibc/arch/mips64/crt0.S ++@@ -0,0 +1,31 @@ +++# +++# arch/mips64/crt0.S +++# +++# Does arch-specific initialization and invokes __libc_init +++# with the appropriate arguments. +++# +++# See __static_init.c or __shared_init.c for the expected +++# arguments. +++# +++ +++#include +++ +++NESTED(__start, 64, sp) +++ daddiu sp,sp,-64 +++ sd zero, 32(sp) +++ +++ # Initialize gp +++ lui gp,%highest(_gp) # load highest "halfword" +++ daddiu gp,gp,%higher(_gp) # merge next "halfword" +++ dsll gp,gp,16 # shift by one halfword +++ daddiu gp,gp,%hi(_gp) # merge next "halfword" +++ dsll gp,gp,16 # shift into final position +++ daddiu gp,gp,%lo(_gp) # merge lowest "halfword" +++ +++ daddiu a0, sp, 64 # Pointer to ELF entry structure +++ move a1, v0 # Kernel-provided atexit() pointer +++ +++ ld t9, %call16(__libc_init)(gp) +++ jalr t9 +++ +++ END(__start) ++diff --git a/usr/klibc/arch/mips64/setjmp.S b/usr/klibc/arch/mips64/setjmp.S ++new file mode 100644 ++index 0000000..5d902e2 ++--- /dev/null +++++ b/usr/klibc/arch/mips64/setjmp.S ++@@ -0,0 +1,50 @@ +++# +++# arch/mips64/setjmp.S +++# +++# setjmp/longjmp for the MIPS architecture +++# +++# The jmp_buf is assumed to contain the following, in order: +++# s0..s7 +++# gp +++# sp +++# s8 +++# ra +++# +++ +++#include +++ +++LEAF(setjmp) +++ sd s0, 0(a0) +++ sd s1, 8(a0) +++ sd s2, 16(a0) +++ sd s3, 24(a0) +++ sd s4, 32(a0) +++ sd s5, 40(a0) +++ sd s6, 48(a0) +++ sd s7, 56(a0) +++ sd gp, 64(a0) +++ sd sp, 72(a0) +++ sd s8, 80(a0) +++ sd ra, 88(a0) +++ move v0, zero +++ jr ra +++ +++ END(setjmp) +++ +++LEAF(longjmp) +++ ld s0, 0(a0) +++ ld s1, 8(a0) +++ ld s2, 16(a0) +++ ld s3, 24(a0) +++ ld s4, 32(a0) +++ ld s5, 40(a0) +++ ld s6, 48(a0) +++ ld s7, 56(a0) +++ ld gp, 64(a0) +++ ld sp, 72(a0) +++ ld s8, 80(a0) +++ ld ra, 88(a0) +++ move v0, a1 +++ jr ra +++ +++ END(longjmp) ++-- ++2.4.5 ++ diff --cc debian/patches/Fix-minimal-mv-to-work-across-fs index 0000000,0000000..12df497 new file mode 100644 --- /dev/null +++ b/debian/patches/Fix-minimal-mv-to-work-across-fs @@@ -1,0 -1,0 +1,297 @@@ ++From: maximilian attems ++Date: Mon, 4 Jul 2011 17:51:52 +0200 ++Subject: [PATCH] [klibc] Fix minimal mv to work across fs ++Forwarded: not-needed ++ ++This is the use case in initramfs to keep data from /run to /root/run ++before calling switch_root(). ++ ++copy_file() doesn't yet catch EINTR, but that seems less of an issue ++in initramfs. ++ ++copy_file() and much logic out of copy() is from Ulrich Dangel. ++Thank you for the collaboration on this blocker for ++http://bugs.debian.org/627808 ++ ++While we are it require move to have mv at least 2 arguments passed. ++ ++Signed-off-by: Ulrich Dangel ++Signed-off-by: maximilian attems ++[bwh: This is no longer needed by initramfs-tools starting with version 0.121, ++ so can be dropped after the stretch release] ++--- ++ usr/utils/mv.c | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++----- ++ 1 files changed, 216 insertions(+), 18 deletions(-) ++ ++Index: klibc-2.0~rc2/usr/utils/mv.c ++=================================================================== ++--- klibc-2.0~rc2.orig/usr/utils/mv.c 2012-02-11 18:50:21.000000000 +0000 +++++ klibc-2.0~rc2/usr/utils/mv.c 2012-02-11 19:04:54.000000000 +0000 ++@@ -1,3 +1,6 @@ +++#include +++#include +++#include ++ #include ++ #include ++ #include ++@@ -7,10 +10,204 @@ ++ ++ #include ++ +++#define BUFFER_SIZE 32768 +++ +++/* copy_file - copy a file, used on different fs mv */ +++static int copy_file(const char *src, const char *dest, mode_t mode) +++{ +++ char buf[BUFFER_SIZE]; +++ int sfd, dfd; +++ ssize_t len; +++ +++ sfd = open(src, O_RDONLY); +++ if (sfd < 0) +++ return -1; +++ +++ dfd = open(dest, O_WRONLY | O_CREAT, mode); +++ if (dfd < 0) { +++ close(sfd); +++ return -1; +++ } +++ +++ while ((len = read(sfd, buf, sizeof(buf))) > 0) { +++ len = write(dfd, buf, len); +++ if (len < 0) { +++ close(sfd); +++ close(dfd); +++ return -1; +++ } +++ } +++ +++ close(sfd); +++ close(dfd); +++ return 0; +++} +++ +++/* copy - recursively copy directories */ +++static int copy(char *src, const char *dest) +++{ +++ int len; +++ struct stat sb, sf; +++ char target[PATH_MAX]; +++ char *p; +++ +++ p = strrchr(src, '/'); +++ if (p) { +++ p++; +++ /* trailing slashes case */ +++ if (strlen(p) == 0) { +++ len = strlen(src) - 1; +++ p = src; +++ while (0 < len && p[len] == '/') +++ p[len--] = '\0'; +++ p = strrchr(p, '/'); +++ p++; +++ } +++ } else { +++ p = src; +++ } +++ +++ memset(&sb, 0, sizeof(struct stat)); +++ /* might not exist yet */ +++ if (stat(dest, &sb) == 0) { +++ if (S_ISDIR(sb.st_mode)) { +++ len = snprintf(target, PATH_MAX, "%s/%s", dest, p); +++ if (len >= PATH_MAX) +++ return -1; +++ } else { +++ len = snprintf(target, PATH_MAX, "%s/%s", dest, src); +++ if (len >= PATH_MAX) +++ return -1; +++ } +++ } else { +++ len = snprintf(target, PATH_MAX, "%s", dest); +++ if (len >= PATH_MAX) +++ return -1; +++ } +++ +++ if (rename(src, target) == 0) { +++ return 0; +++ } else { +++ if (errno != EXDEV) +++ return -1; +++ } +++ +++ +++ /* cross fs copy */ +++ memset(&sf, 0, sizeof(struct stat)); +++ if (stat(src, &sf) < 0) +++ return -1; +++ if (!S_ISDIR(sf.st_mode)) { +++ len = copy_file(src, target, sf.st_mode); +++ if (len == 0) +++ return 0; +++ else +++ return -1; +++ } +++ +++ DIR *dir; +++ struct dirent *d; +++ char path[PATH_MAX]; +++ +++ if (mkdir(target, sf.st_mode) < 0) +++ return -1; +++ +++ dir = opendir(src); +++ if (!dir) { +++ /* EACCES means we can't read it. +++ * Might be empty and removable. */ +++ if (errno != EACCES) +++ return -1; +++ } +++ while ((d = readdir(dir))) { +++ +++ /* Skip . and .. */ +++ if (d->d_name[0] == '.' && (d->d_name[1] == '\0' +++ || (d->d_name[1] == '.' && d->d_name[2] == '\0'))) +++ continue; +++ +++ /* skip to long path */ +++ if (strlen(src) + 1 + strlen(d->d_name) >= PATH_MAX - 1) +++ continue; +++ +++ snprintf(path, sizeof path, "%s/%s", src, d->d_name); +++ if (len >= sizeof path) +++ return -1; +++ +++ memset(&sf, 0, sizeof(struct stat)); +++ if (stat(path, &sf) < 0) { +++ closedir(dir); +++ return -1; +++ } +++ +++ /* recursively copy files and directories */ +++ if (copy(path, target) < 0) +++ return -1; +++ } +++ closedir(dir); +++ return 0; +++} +++ +++/* nuke - rm a file or directory recursively */ +++static int nuke(const char *src) +++{ +++ struct stat sb; +++ DIR *dir; +++ struct dirent *d; +++ char path[PATH_MAX]; +++ int len; +++ +++ memset(&sb, 0, sizeof(struct stat)); +++ /* gone, no work */ +++ if (stat(src, &sb) < 0) +++ return 0; +++ +++ if (!S_ISDIR(sb.st_mode)) { +++ if (unlink(src) == 0) +++ return 0; +++ else +++ return 1; +++ } +++ +++ dir = opendir(src); +++ if (!dir) { +++ /* EACCES means we can't read it. +++ * Might be empty and removable. */ +++ if (errno != EACCES) +++ return -1; +++ } +++ while ((d = readdir(dir))) { +++ +++ /* Skip . and .. */ +++ if (d->d_name[0] == '.' && (d->d_name[1] == '\0' +++ || (d->d_name[1] == '.' && d->d_name[2] == '\0'))) +++ continue; +++ +++ /* skip to long path */ +++ if (strlen(src) + 1 + strlen(d->d_name) >= PATH_MAX - 1) +++ continue; +++ +++ len = snprintf(path, sizeof path, "%s/%s", src, d->d_name); +++ if (len >= sizeof path) +++ return -1; +++ +++ memset(&sb, 0, sizeof(struct stat)); +++ if (stat(path, &sb) < 0) { +++ closedir(dir); +++ return -1; +++ } +++ +++ if (nuke(path) < 0) +++ return -1; +++ } +++ closedir(dir); +++ rmdir(src); +++ return 0; +++} +++ ++ int main(int argc, char *argv[]) ++ { ++ int c, f; ++- char *p; ++ struct stat sb; ++ ++ f = 0; ++@@ -32,11 +229,13 @@ ++ ++ } while (1); ++ ++- if (optind == argc) { +++ /* not enough arguments */ +++ if (argc - optind < 2) { ++ fprintf(stderr, "Usage: %s [-f] source dest\n", argv[0]); ++ return 1; ++ } ++ +++ /* check on many archs if destination is a directory to mv in */ ++ memset(&sb, 0, sizeof(struct stat)); ++ if (stat(argv[argc - 1], &sb) < 0 && argc - optind > 2) { ++ if (!(S_ISDIR(sb.st_mode))) { ++@@ -47,23 +246,22 @@ ++ } ++ } ++ ++- for (c = optind; c < argc - 1; c++) { ++- char target[PATH_MAX]; ++- ++- p = strrchr(argv[c], '/'); ++- p++; ++- ++- if (S_ISDIR(sb.st_mode)) ++- snprintf(target, PATH_MAX, "%s/%s", argv[argc - 1], p); ++- else ++- snprintf(target, PATH_MAX, "%s", argv[argc - 1]); ++- ++- if (f) ++- unlink(target); ++- ++- if (rename(argv[c], target) == -1) ++- perror(target); ++- } +++ /* remove destination */ +++ if (f) +++ nuke(argv[argc - 1]); +++ +++ /* the mv action */ +++ for (c = optind; c < argc - 1; c++) +++ if (copy(argv[c], argv[argc - 1]) < 0) { +++ perror("Could not copy file"); +++ return -1; +++ } ++ +++ /* Only rm after sucessfull rename */ +++ for (c = optind; c < argc - 1; c++) +++ if (nuke(argv[c]) < 0) { +++ perror("Could not rm file"); +++ return -1; +++ } ++ return 0; ++ } diff --cc debian/patches/dash-mkbuiltins-fix-sort-order-harder.patch index 0000000,0000000..0071611 new file mode 100644 --- /dev/null +++ b/debian/patches/dash-mkbuiltins-fix-sort-order-harder.patch @@@ -1,0 -1,0 +1,21 @@@ ++From: Ben Hutchings ++Date: Wed, 09 Sep 2015 02:12:40 +0100 ++Subject: dash: mkbuiltins: Fix sort order harder ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003890.html ++ ++LC_COLLATE can be overriden by LC_ALL, so set LC_ALL instead when ++running sort. ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/usr/dash/mkbuiltins +++++ b/usr/dash/mkbuiltins ++@@ -78,7 +78,7 @@ awk '{ for (i = 2 ; i <= NF ; i++) { ++ if ($i ~ /^-/) ++ line = $(++i) "\t" line ++ print line ++- }}' $temp | LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{ +++ }}' $temp | LC_ALL=C sort -k 1,1 | tee $temp2 | awk '{ ++ opt = "" ++ if (NF > 2) { ++ opt = substr($2, 2) diff --cc debian/patches/gzip-fix-silent-fallback-to-decompression.patch index 0000000,0000000..e3ec327 new file mode 100644 --- /dev/null +++ b/debian/patches/gzip-fix-silent-fallback-to-decompression.patch @@@ -1,0 -1,0 +1,85 @@@ ++From: Ben Hutchings ++Date: Fri, 18 Sep 2015 21:59:17 +0200 ++Subject: gzip: Fix silent fallback to decompression ++Bug-Debian: https://bugs.debian.org/355809 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003892.html ++ ++If the gzip utilities are built without support for compression, ++they will always attempt to carry out decompression even if the ++command name and options don't imply that. Instead they should ++fail with an explicit error in this case. ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/usr/gzip/gzip.c +++++ b/usr/gzip/gzip.c ++@@ -90,8 +90,11 @@ int level = 6; /* compression lev ++ #endif ++ ++ int to_stdout; /* output to stdout (-c) */ ++-#ifndef decompress +++#ifdef decompress +++int decompress_wanted; +++#else ++ int decompress; /* decompress (-d) */ +++#define decompress_wanted decompress ++ #endif ++ int force; /* don't ask questions, compress links (-f) */ ++ int no_name = -1; /* don't save or restore the original file name */ ++@@ -259,17 +262,13 @@ int main (argc, argv) ++ * Systems which do not support links can still use -d or -dc. ++ * Ignore an .exe extension for MSDOS, OS/2 and VMS. ++ */ ++-#ifndef decompress ++ if ( strncmp(progname, "un", 2) == 0 /* ungzip, uncompress */ ++ || strncmp(progname, "gun", 3) == 0) { /* gunzip */ ++- decompress = 1; +++ decompress_wanted = 1; ++ } ++-#endif ++ if (strequ(progname+1, "cat") /* zcat, pcat, gcat */ ++ || strequ(progname, "gzcat")) { /* gzcat */ ++-#ifndef decompress ++- decompress = 1; ++-#endif +++ decompress_wanted = 1; ++ to_stdout = 1; ++ } ++ #endif ++@@ -282,9 +281,7 @@ int main (argc, argv) ++ case 'c': ++ to_stdout = 1; break; ++ case 'd': ++-#ifndef decompress ++- decompress = 1; ++-#endif +++ decompress_wanted = 1; ++ break; ++ case 'f': ++ force++; break; ++@@ -308,9 +305,7 @@ int main (argc, argv) ++ break; ++ case 't': ++ test = to_stdout = 1; ++-#ifndef decompress ++- decompress = 1; ++-#endif +++ decompress_wanted = 1; ++ break; ++ case 'v': ++ verbose++; quiet = 0; break; ++@@ -329,6 +324,14 @@ int main (argc, argv) ++ } ++ } /* loop on all arguments */ ++ +++#ifndef SUPPORT_ZIP +++ if (!decompress_wanted) { +++ fprintf(stderr, "%s: this version does not support compression\n", +++ progname); +++ do_exit(ERROR); +++ } +++#endif +++ ++ /* By default, save name and timestamp on compression but do not ++ * restore them on decompression. ++ */ diff --cc debian/patches/implement-realpath.patch index 0000000,0000000..7739f22 new file mode 100644 --- /dev/null +++ b/debian/patches/implement-realpath.patch @@@ -1,0 -1,0 +1,82 @@@ ++From: Ben Hutchings ++Date: Sat, 27 Sep 2014 15:04:15 +0100 ++Subject: [klibc] Implement realpath() ++Bug-Debian: https://bugs.debian.org/763049 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003885.html ++ ++This is needed as the basis for the readlink -f option. ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/usr/include/stdlib.h +++++ b/usr/include/stdlib.h ++@@ -92,4 +92,6 @@ static __inline__ int grantpt(int __fd) ++ return 0; /* devpts does this all for us! */ ++ } ++ +++__extern char *realpath(const char *, char *); +++ ++ #endif /* _STDLIB_H */ ++--- a/usr/klibc/Kbuild +++++ b/usr/klibc/Kbuild ++@@ -60,7 +60,7 @@ klib-y += vsnprintf.o snprintf.o vsprint ++ send.o recv.o \ ++ access.o chmod.o chown.o dup2.o mknod.o poll.o rename.o stat.o \ ++ lchown.o link.o rmdir.o unlink.o utimes.o lstat.o mkdir.o \ ++- readlink.o select.o symlink.o pipe.o \ +++ readlink.o realpath.o select.o symlink.o pipe.o \ ++ ctype/isalnum.o ctype/isalpha.o ctype/isascii.o \ ++ ctype/isblank.o ctype/iscntrl.o ctype/isdigit.o \ ++ ctype/isgraph.o ctype/islower.o ctype/isprint.o \ ++--- /dev/null +++++ b/usr/klibc/realpath.c ++@@ -0,0 +1,49 @@ +++#include +++#include +++#include +++#include +++#include +++#include +++ +++/* +++ * Note that this requires name to refer to an existing file. This is +++ * correct according to POSIX. However, BSD and GNU implementations +++ * also allow name to refer to a non-existing file in an existing +++ * directory. +++ */ +++ +++char *realpath(const char *name, char *resolved_name) +++{ +++ static const char proc_fd_prefix[] = "/proc/self/fd/"; +++ char proc_fd_name[sizeof(proc_fd_prefix) + sizeof(int) * 3]; +++ int allocated = 0; +++ int fd; +++ ssize_t len; +++ +++ /* Open for path lookup only */ +++ fd = open(name, O_PATH); +++ if (fd < 0) +++ return NULL; +++ +++ if (!resolved_name) { +++ resolved_name = malloc(PATH_MAX); +++ if (!resolved_name) +++ goto out_close; +++ allocated = 1; +++ } +++ +++ /* Use procfs to read back the resolved name */ +++ sprintf(proc_fd_name, "%s%d", proc_fd_prefix, fd); +++ len = readlink(proc_fd_name, resolved_name, PATH_MAX - 1); +++ if (len < 0) { +++ if (allocated) +++ free(resolved_name); +++ resolved_name = NULL; +++ } else { +++ resolved_name[len] = 0; +++ } +++ +++out_close: +++ close(fd); +++ return resolved_name; +++} diff --cc debian/patches/install-headers-with-consistent-mode.patch index 0000000,0000000..fa1fa29 new file mode 100644 --- /dev/null +++ b/debian/patches/install-headers-with-consistent-mode.patch @@@ -1,0 -1,0 +1,22 @@@ ++From: Ben Hutchings ++Date: Wed, 09 Sep 2015 01:24:56 +0100 ++Subject: Install headers with consistent mode ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003891.html ++ ++Currently we ensure the installed headers are readable by everyone, ++but write permissions will depend on the current umask. Turn off the ++group and other writable bits to ensure consistent results. ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/scripts/Kbuild.install +++++ b/scripts/Kbuild.install ++@@ -102,7 +102,7 @@ header: ++ ln -sf /usr/include/$(DEB_HOST_MULTIARCH)/asm $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ ++ fi ++ $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. ++- $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include +++ $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include ++ $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 ++ $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) ++ diff --cc debian/patches/klibc-add-pread-and-pwrite-32bit-syscall-wrappers-for-parisc.patch index 0000000,0000000..3aaef92 new file mode 100644 --- /dev/null +++ b/debian/patches/klibc-add-pread-and-pwrite-32bit-syscall-wrappers-for-parisc.patch @@@ -1,0 -1,0 +1,117 @@@ ++From: Helge Deller ++Subject: [klibc] Add pread and pwrite 32bit syscall wrappers for parisc ++Date: Wed, 23 Apr 2014 22:52:53 +0200 ++Bug-Debian: https://bugs.debian.org/745660 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003880.html ++ ++On the hppa arch (32bit userspace and 32 or 64bit kernel), the fstype ++program fails to detect the filesystem. The reason for this failure ++is, that fstype calls the pread() syscall, which has on some ++architectures with 32bit userspace a different calling syntax. I ++noticed this bug on hppa, but I assume s390 (32bit) and others might ++run into similiar issues. ++ ++Signed-off-by: Helge Deller ++--- ++--- a/usr/include/endian.h +++++ b/usr/include/endian.h ++@@ -12,4 +12,10 @@ ++ #define PDP_ENDIAN __PDP_ENDIAN ++ #define BYTE_ORDER __BYTE_ORDER ++ +++#if __BYTE_ORDER == __LITTLE_ENDIAN +++# define __LONG_LONG_PAIR(HI, LO) LO, HI +++#elif __BYTE_ORDER == __BIG_ENDIAN +++# define __LONG_LONG_PAIR(HI, LO) HI, LO +++#endif +++ ++ #endif /* _ENDIAN_H */ ++--- a/usr/klibc/Kbuild +++++ b/usr/klibc/Kbuild ++@@ -35,6 +35,7 @@ klib-y += vsnprintf.o snprintf.o vsprint ++ siglongjmp.o \ ++ sigaction.o sigpending.o sigprocmask.o sigsuspend.o \ ++ pselect.o ppoll.o \ +++ pread.o pwrite.o \ ++ brk.o sbrk.o malloc.o realloc.o zalloc.o calloc.o \ ++ mmap.o shm_open.o shm_unlink.o \ ++ memcpy.o memcmp.o memset.o memccpy.o memmem.o memswap.o \ ++--- /dev/null +++++ b/usr/klibc/pread.c ++@@ -0,0 +1,29 @@ +++/* +++ * pread.c +++ * +++ * Some architectures need to wrap the system call +++ */ +++ +++#include +++#include +++ +++#if defined(__hppa__) +++ +++#if _BITSIZE == 32 +++extern size_t __pread(int, void *, size_t, unsigned int, unsigned int); +++#else +++extern size_t __pread(int, void *, size_t, off_t); +++#endif +++ +++size_t pread(int fd, void *buf, size_t count, off_t offset) +++{ +++#if _BITSIZE == 32 +++ unsigned int hi = offset >> 32; +++ unsigned int lo = (unsigned int) offset; +++ return __pread(fd, buf, count, __LONG_LONG_PAIR(hi, lo)); +++#else +++ return __pread(fd, buf, count, offset); +++#endif +++} +++ +++#endif ++--- /dev/null +++++ b/usr/klibc/pwrite.c ++@@ -0,0 +1,29 @@ +++/* +++ * pwrite.c +++ * +++ * Some architectures need to wrap the system call +++ */ +++ +++#include +++#include +++ +++#if defined(__hppa__) +++ +++#if _BITSIZE == 32 +++extern ssize_t __pwrite(int, const void *, size_t, unsigned int, unsigned int); +++#else +++extern ssize_t __pwrite(int, const void *, size_t, off_t); +++#endif +++ +++size_t pwrite(int fd, void *buf, size_t count, off_t offset) +++{ +++#if _BITSIZE == 32 +++ unsigned int hi = offset >> 32; +++ unsigned int lo = (unsigned int) offset; +++ return __pwrite(fd, buf, count, __LONG_LONG_PAIR(hi, lo)); +++#else +++ return __pwrite(fd, buf, count, offset); +++#endif +++} +++ +++#endif ++--- a/usr/klibc/SYSCALLS.def +++++ b/usr/klibc/SYSCALLS.def ++@@ -189,8 +189,10 @@ int fdatasync,fsync::fdatasync(int); ++ int readv(int, const struct iovec *, int); ++ int writev(int, const struct iovec *, int); ++ int ftruncate64,ftruncate::ftruncate(int, off_t); ++-ssize_t pread64,pread::pread(int, void *, size_t, off_t); ++-ssize_t pwrite64,pwrite::pwrite(int, void *, size_t, off_t); +++ ssize_t pread64,pread::__pread(int, void *, size_t, off_t); +++ ssize_t pwrite64,pwrite::__pwrite(int, void *, size_t, off_t); +++ ssize_t pread64,pread::pread(int, void *, size_t, off_t); +++ ssize_t pwrite64,pwrite::pwrite(int, void *, size_t, off_t); ++ int sync_file_range,fdatasync,fsync::sync_file_range(int, off_t, off_t, unsigned int); ++ int splice(int, off_t *, int, off_t *, size_t, unsigned int); ++ int tee(int, int, size_t, unsigned int); diff --cc debian/patches/klibc-linux-libc-dev index 0000000,0000000..d9ce3c3 new file mode 100644 --- /dev/null +++ b/debian/patches/klibc-linux-libc-dev @@@ -1,0 -1,0 +1,45 @@@ ++From: Ben Hutchings ++Date: Sun, 14 Mar 2010 18:41:56 +0000 ++Subject: Fix klibc Debian specific build trouble ++ ++Simply remove the headers_install invocation and rely on linux-libc-dev. ++ ++With these changes: ++ ++(the extra chmod was needed to allow for umask > 022) I could compile, ++link and run this program: ++ ++#include ++ ++int main(void) ++{ ++ write(1, "Hello world\n", 12); ++ return 0; ++} ++ ++Signed-off-by: Ben Hutchings ++[ added multi arch support ] ++Signed-off-by: Colin Watson ++Signed-off-by: maximilian attems ++[ fixed cross building ] ++Signed-off-by: Marcin Juszkiewicz ++--- ++Index: klibc-2.0~rc2/scripts/Kbuild.install ++=================================================================== ++--- klibc-2.0~rc2.orig/scripts/Kbuild.install 2012-02-11 18:50:21.000000000 +0000 +++++ klibc-2.0~rc2/scripts/Kbuild.install 2012-02-11 19:04:52.000000000 +0000 ++@@ -95,7 +95,12 @@ ++ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include ++ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib ++ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin ++- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install +++ $(Q)for x in /usr/include/linux /usr/include/asm*; do \ +++ ln -s $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ +++ done +++ $(Q)if [ -n "$(DEB_HOST_MULTIARCH)" ]; then \ +++ ln -sf /usr/include/$(DEB_HOST_MULTIARCH)/asm $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ +++ fi ++ $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. ++ $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include ++ $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 ++ diff --cc debian/patches/klibc-mips-setjmp-s-don-t-save-and-restore-floating-point.patch index 0000000,0000000..90e59c7 new file mode 100644 --- /dev/null +++ b/debian/patches/klibc-mips-setjmp-s-don-t-save-and-restore-floating-point.patch @@@ -1,0 -1,0 +1,55 @@@ ++From: YunQiang Su ++Date: Sat Sep 5 06:39:25 PDT 2015 ++Subject: [klibc] mips/setjmp.S: don't save and restore floating-point registers ++Bug-Debian: https://bugs.debian.org/789683 ++Forwarded: http://www.zytor.com/pipermail/klibc/2015-September/003833.html ++ ++Klibc FTBFS with '-mno-odd-spreg' on mips32(el) platforms, ++As it try to save/restore odd-number FPR. ++ ++Indeed no other architectures save/restore FPR at all. ++It shouldn't be needed. ++--- ++ usr/klibc/arch/mips/setjmp.S | 24 ------------------------ ++ 1 file changed, 24 deletions(-) ++ ++--- a/usr/klibc/arch/mips/setjmp.S +++++ b/usr/klibc/arch/mips/setjmp.S ++@@ -29,18 +29,6 @@ LEAF(setjmp) ++ sw s8, 40(a0) ++ sw ra, 44(a0) ++ cfc1 t0,$31 ++- swc1 $f20,48(a0) ++- swc1 $f21,52(a0) ++- swc1 $f22,56(a0) ++- swc1 $f23,60(a0) ++- swc1 $f24,64(a0) ++- swc1 $f25,68(a0) ++- swc1 $f26,72(a0) ++- swc1 $f27,76(a0) ++- swc1 $f28,80(a0) ++- swc1 $f29,84(a0) ++- swc1 $f30,88(a0) ++- swc1 $f31,92(a0) ++ sw t0,96(a0) ++ move v0,zero ++ jr ra ++@@ -61,18 +49,6 @@ LEAF(longjmp) ++ lw s8, 40(a0) ++ lw ra, 44(a0) ++ lw t0, 96(a0) ++- lwc1 $f20,48(a0) ++- lwc1 $f21,52(a0) ++- lwc1 $f22,56(a0) ++- lwc1 $f23,60(a0) ++- lwc1 $f24,64(a0) ++- lwc1 $f25,68(a0) ++- lwc1 $f26,72(a0) ++- lwc1 $f27,76(a0) ++- lwc1 $f28,80(a0) ++- lwc1 $f29,84(a0) ++- lwc1 $f30,88(a0) ++- lwc1 $f31,92(a0) ++ ctc1 t0,$31 ++ move v0,a1 ++ jr ra diff --cc debian/patches/klibc-ppc64-fix-struct-stat.patch index 0000000,0000000..677ee90 new file mode 100644 --- /dev/null +++ b/debian/patches/klibc-ppc64-fix-struct-stat.patch @@@ -1,0 -1,0 +1,30 @@@ ++From: Aurelien Jarno ++Date: Sat, 25 Apr 2015 14:16:16 +0200 ++Subject: [PATCH] ppc64: fix struct stat ++Bug-Debian: https://bugs.debian.org/783292 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003881.html ++ ++On ppc64 the struct stat defined by klibc matches the kernel one. ++However it contains implicit padding before the st_rdev field due to the ++64-bit alignement. For internal reasons, klibc defines st_rdev as a pair ++of 32-bit values (using the __stdev64 macro). They only need to be ++32-bit aligned and as a consequence st->st_rdev is incorrectly defined. ++ ++The solution is to add an explicit padding in the structure. This fixes ++the resume binary on ppc64 BE and LE, and probably other things. ++ ++Signed-off-by: Aurelien Jarno ++--- ++ usr/include/arch/ppc64/klibc/archstat.h | 1 + ++ 1 file changed, 1 insertion(+) ++ ++--- a/usr/include/arch/ppc64/klibc/archstat.h +++++ b/usr/include/arch/ppc64/klibc/archstat.h ++@@ -12,6 +12,7 @@ struct stat { ++ mode_t st_mode; ++ uid_t st_uid; ++ gid_t st_gid; +++ unsigned int __pad1; ++ __stdev64 (st_rdev); ++ off_t st_size; ++ unsigned long st_blksize; diff --cc debian/patches/mips-update-archfcntl-h.patch index 0000000,0000000..0ce5b91 new file mode 100644 --- /dev/null +++ b/debian/patches/mips-update-archfcntl-h.patch @@@ -1,0 -1,0 +1,65 @@@ ++From: Ben Hutchings ++Date: Sun, 05 Oct 2014 01:08:21 +0100 ++Subject: [klibc] MIPS: Update archfcntl.h ++Bug-Debian: https://bugs.debian.org/763049 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003879.html ++ ++Update usr/include/arch/mips/archfcntl.h from kernel headers: ++ ++- Add definitions of O_PATH, O_TMPFILE ++- Update value of O_SYNC to include __O_SYNC ++- Add definitions of F_{SET,GET}OWN_EX, F_GETOWNER_UIDS, ++ F_OFD_{GETLK,SETLK,SETLKW}, F_OWNER_{TID,PID,PGRP} ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/usr/include/arch/mips/klibc/archfcntl.h +++++ b/usr/include/arch/mips/klibc/archfcntl.h ++@@ -19,7 +19,6 @@ ++ #define O_WRONLY 0x0001 ++ #define O_RDWR 0x0002 ++ #define O_APPEND 0x0008 ++-#define O_SYNC 0x0010 ++ #define O_NONBLOCK 0x0080 ++ #define O_CREAT 0x0100 ++ #define O_TRUNC 0x0200 ++@@ -27,11 +26,14 @@ ++ #define O_NOCTTY 0x0800 ++ #define FASYNC 0x1000 ++ #define O_LARGEFILE 0x2000 +++#define O_SYNC 0x4010 ++ #define O_DIRECT 0x8000 ++ #define O_DIRECTORY 0x10000 ++ #define O_NOFOLLOW 0x20000 ++ #define O_NOATIME 0x40000 ++ #define O_CLOEXEC 0x80000 +++#define O_PATH 0x200000 +++#define O_TMPFILE 0x410000 ++ ++ #define O_NDELAY O_NONBLOCK ++ ++@@ -53,6 +55,24 @@ ++ #define F_SETLK64 34 ++ #define F_SETLKW64 35 ++ +++#define F_SETOWN_EX 15 +++#define F_GETOWN_EX 16 +++ +++#define F_GETOWNER_UIDS 17 +++ +++#define F_OFD_GETLK 36 +++#define F_OFD_SETLK 37 +++#define F_OFD_SETLKW 38 +++ +++#define F_OWNER_TID 0 +++#define F_OWNER_PID 1 +++#define F_OWNER_PGRP 2 +++ +++struct f_owner_ex { +++ int type; +++ pid_t pid; +++}; +++ ++ #define FD_CLOEXEC 1 ++ ++ #define F_RDLCK 0 diff --cc debian/patches/mount-implement-o-defaults.patch index 0000000,0000000..8f73692 new file mode 100644 --- /dev/null +++ b/debian/patches/mount-implement-o-defaults.patch @@@ -1,0 -1,0 +1,29 @@@ ++From: Ben Hutchings ++Date: Sat, 4 Oct 2014 16:32:39 +0100 ++Subject: mount: Implement -o defaults ++Bug-Debian: https://bugs.debian.org/763049 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003887.html ++ ++This is needed to support mounting non-root filesystems in ++initramfs-tools. ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/usr/utils/mount_opts.c +++++ b/usr/utils/mount_opts.c ++@@ -89,8 +89,13 @@ parse_mount_options(char *arg, unsigned ++ break; ++ } ++ ++- if (res != 0 && s[0]) ++- add_extra_option(extra, opt); +++ if (res != 0 && s[0]) { +++ if (!strcmp(opt, "defaults")) +++ rwflag &= ~(MS_RDONLY|MS_NOSUID|MS_NODEV| +++ MS_NOEXEC|MS_SYNCHRONOUS); +++ else +++ add_extra_option(extra, opt); +++ } ++ } ++ ++ return rwflag; diff --cc debian/patches/multiarch-include-path index 0000000,0000000..01bcc97 new file mode 100644 --- /dev/null +++ b/debian/patches/multiarch-include-path @@@ -1,0 -1,0 +1,39 @@@ ++Description: Include the multiarch include directory in klcc's path ++ The multiarch include directory, /usr/include/, needs to be ++ explicitly added to klcc's path; without this, klcc is incompatible ++ with recent Ubuntu versions of linux-libc-dev and fails to find any asm/ ++ headers. ++ . ++ This change is safe to apply on non-multiarch-enabled systems, since ++ $(DEB_HOST_MULTIARCH) will evaluate empty. However, upstreaming should ++ probably wait until we have a way to get this path information in a ++ vendor-neutral manner. ++Author: Steve Langasek ++ ++Index: klibc-2.0~rc2/klcc/Kbuild ++=================================================================== ++--- klibc-2.0~rc2.orig/klcc/Kbuild 2012-02-11 18:45:42.000000000 +0000 +++++ klibc-2.0~rc2/klcc/Kbuild 2012-02-11 19:04:53.000000000 +0000 ++@@ -26,6 +26,7 @@ ++ $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@ ++ $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@ ++ $(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@ +++ $(Q)echo 'multiarch_path=$(DEB_HOST_MULTIARCH)' >> $@ ++ ++ ++ # Generate klcc ++Index: klibc-2.0~rc2/klcc/klcc.in ++=================================================================== ++--- klibc-2.0~rc2.orig/klcc/klcc.in 2012-02-11 18:50:21.000000000 +0000 +++++ klibc-2.0~rc2/klcc/klcc.in 2012-02-11 19:04:53.000000000 +0000 ++@@ -7,6 +7,10 @@ ++ "-I${prefix}/${KCROSS}include/bits${BITSIZE}", ++ "-I${prefix}/${KCROSS}include"); ++ +++if ($multiarch_path ne '') { +++ unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}"); +++} +++ ++ # Default optimization options (for compiles without -g) ++ @optopt = @OPTFLAGS; ++ @goptopt = ('-O'); diff --cc debian/patches/ppc64el-load-toc-syscall-stub.patch index 0000000,0000000..c535e84 new file mode 100644 --- /dev/null +++ b/debian/patches/ppc64el-load-toc-syscall-stub.patch @@@ -1,0 -1,0 +1,57 @@@ ++From: Mauricio Faria de Oliveira ++Date: Tue, 09 Sep 2014 15:17:19 -0700 ++Subject: [klibc] [PATCH] ppc64: ELFv2: Load TOC value in system call stub ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003878.html ++ ++This fixes a segmentation fault in the system call's error handling path with ++dynamically-linked binaries on PowerPC64 little endian. The system call stub ++wasn't loading up r2 with the appropriate TOC value in its global entry point. ++ ++The r2 setup code comes from the FUNC_START macro in gcc [1] and an equivalent ++one can also be found in the LOCALENTRY macro in glibc [2]. ++ ++On the ELFv2 ABI (see [1]): ++ - The global entry point is expected to load up r2 with the appropriate TOC ++ value for this function. ++ - The local entry point expects r2 to be set up to the current TOC. ++ ++The problem happened with dynamically-linked binaries because: ++ - the system call is an indirect call (via global entry point) from the binary ++ to the shared library, landing in the syscall stub (which didn't load up r2 ++ with the TOC of the shared library) ++ - its branch to __syscall_error is a direct call (via local entry point) within ++ the shared library, landing in the function (which expects r2 to be set up to ++ that TOC) ++ - when the function attempts to store errno (in an address relative to the TOC), ++ that address incorrectly pointed to a read-only segment -- segmentation fault. ++ ++The problem didn't happen with statically-linked binaries because the TOC value ++wasn't different on that case. ++ ++Thanks and credits to Alan Modra and Ulrich Weigand, for helping with this and ++pointing out the solution. ++ ++[1] https://gcc.gnu.org/ml/gcc-patches/2013-11/msg01141.html ++[2] https://www.sourceware.org/ml/libc-alpha/2013-11/msg00315.html ++ ++Signed-off-by: Mauricio Faria de Oliveira ++--- ++ usr/klibc/arch/ppc64/sysstub.ph | 3 +++ ++ 1 files changed, 3 insertions(+), 0 deletions(-) ++ ++diff --git a/usr/klibc/arch/ppc64/sysstub.ph b/usr/klibc/arch/ppc64/sysstub.ph ++index b3f6e38..a0c6d41 100644 ++--- a/usr/klibc/arch/ppc64/sysstub.ph +++++ b/usr/klibc/arch/ppc64/sysstub.ph ++@@ -18,6 +18,9 @@ sub make_sysstub($$$$$@) { ++ #if _CALL_ELF == 2 ++ .type ${fname},\@function ++ ${fname}: +++0: addis 2,12,(.TOC.-0b)\@ha +++ addi 2,2,(.TOC.-0b)\@l +++ .localentry ${fname},.-${fname} ++ #else ++ .section ".opd","aw" ++ .balign 8 ++-- ++1.7.1 diff --cc debian/patches/readlink-add-f-option.patch index 0000000,0000000..78cf4c1 new file mode 100644 --- /dev/null +++ b/debian/patches/readlink-add-f-option.patch @@@ -1,0 -1,0 +1,63 @@@ ++From: Ben Hutchings ++Date: Sat, 27 Sep 2014 15:18:21 +0100 ++Subject: readlink: Add -f option ++Bug-Debian: https://bugs.debian.org/763049 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003886.html ++ ++This is needed to support mounting non-root filesystems in ++initramfs-tools. ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/usr/utils/readlink.c +++++ b/usr/utils/readlink.c ++@@ -7,24 +7,45 @@ const char *progname; ++ ++ static __noreturn usage(void) ++ { ++- fprintf(stderr, "Usage: %s link...\n", progname); +++ fprintf(stderr, "Usage: %s [-f] link...\n", progname); ++ exit(1); ++ } ++ ++ int main(int argc, char *argv[]) ++ { +++ int c, f_flag = 0; ++ const char *name; ++ char link_name[PATH_MAX]; ++ int rv; ++ int i; ++ ++- progname = *argv++; +++ progname = argv[0]; ++ ++- if (argc < 2) +++ do { +++ c = getopt(argc, argv, "f"); +++ if (c == EOF) +++ break; +++ switch (c) { +++ case 'f': +++ f_flag = 1; +++ break; +++ +++ case '?': +++ fprintf(stderr, "%s: invalid option -%c\n", +++ progname, optopt); +++ usage(); +++ } +++ } while (1); +++ +++ if (optind == argc) ++ usage(); ++ +++ argv += optind; ++ while ((name = *argv++)) { ++- rv = readlink(name, link_name, sizeof link_name - 1); +++ if (f_flag) +++ rv = realpath(name, link_name) ? strlen(link_name) : -1; +++ else +++ rv = readlink(name, link_name, sizeof link_name - 1); ++ if (rv < 0) { ++ perror(name); ++ exit(1); diff --cc debian/patches/run-init-add-dry-run-mode.patch index 0000000,0000000..1f5aa37 new file mode 100644 --- /dev/null +++ b/debian/patches/run-init-add-dry-run-mode.patch @@@ -1,0 -1,0 +1,192 @@@ ++From: Ben Hutchings ++Date: Sun, 17 Jan 2016 19:50:28 +0000 ++Subject: run-init: Add dry-run mode ++Bug-Debian: https://bugs.debian.org/810965 ++ ++initramfs-tools wants to validate the real init program before running ++it, as there is no way out once it has exec'd run-init. This is ++complicated by the increasing use of symlinks for /sbin/init and for ++/sbin itself. We can't simply resolve them with 'readlink -f' because ++any absolute symlinks will be resolved using the wrong root. Add a ++dry-run mode (-n option) to run-init that goes as far as possible to ++validate that the given init is executable. ++ ++Signed-off-by: Ben Hutchings ++--- ++--- a/usr/kinit/run-init/run-init.c +++++ b/usr/kinit/run-init/run-init.c ++@@ -26,19 +26,23 @@ ++ * ----------------------------------------------------------------------- */ ++ ++ /* ++- * Usage: exec run-init [-d caps] [-c /dev/console] /real-root /sbin/init "$@" +++ * Usage: exec run-init [-d caps] [-c /dev/console] [-n] /real-root /sbin/init "$@" ++ * ++ * This program should be called as the last thing in a shell script ++ * acting as /init in an initramfs; it does the following: ++ * ++- * - Delete all files in the initramfs; ++- * - Remounts /real-root onto the root filesystem; ++- * - Drops comma-separated list of capabilities; ++- * - Chroots; ++- * - Opens /dev/console; ++- * - Spawns the specified init program (with arguments.) +++ * 1. Delete all files in the initramfs; +++ * 2. Remounts /real-root onto the root filesystem; +++ * 3. Drops comma-separated list of capabilities; +++ * 4. Chroots; +++ * 5. Opens /dev/console; +++ * 6. Spawns the specified init program (with arguments.) +++ * +++ * With the -n option, it skips steps 1, 2 and 6 and can be used to check +++ * whether the given root and init are likely to work. ++ */ ++ +++#include ++ #include ++ #include ++ #include ++@@ -51,7 +55,7 @@ static const char *program; ++ static void __attribute__ ((noreturn)) usage(void) ++ { ++ fprintf(stderr, ++- "Usage: exec %s [-d caps] [-c consoledev] /real-root /sbin/init [args]\n", +++ "Usage: exec %s [-d caps] [-c consoledev] [-n] /real-root /sbin/init [args]\n", ++ program); ++ exit(1); ++ } ++@@ -64,6 +68,7 @@ int main(int argc, char *argv[]) ++ const char *init; ++ const char *error; ++ const char *drop_caps = NULL; +++ bool dry_run = false; ++ char **initargs; ++ ++ /* Variables... */ ++@@ -72,11 +77,13 @@ int main(int argc, char *argv[]) ++ /* Parse the command line */ ++ program = argv[0]; ++ ++- while ((o = getopt(argc, argv, "c:d:")) != -1) { +++ while ((o = getopt(argc, argv, "c:d:n")) != -1) { ++ if (o == 'c') { ++ console = optarg; ++ } else if (o == 'd') { ++ drop_caps = optarg; +++ } else if (o == 'n') { +++ dry_run = true; ++ } else { ++ usage(); ++ } ++@@ -89,9 +96,13 @@ int main(int argc, char *argv[]) ++ init = argv[optind + 1]; ++ initargs = argv + optind + 1; ++ ++- error = run_init(realroot, console, drop_caps, init, initargs); +++ error = run_init(realroot, console, drop_caps, dry_run, init, initargs); ++ ++- /* If run_init returns, something went wrong */ ++- fprintf(stderr, "%s: %s: %s\n", program, error, strerror(errno)); ++- return 1; +++ if (error) { +++ fprintf(stderr, "%s: %s: %s\n", program, error, strerror(errno)); +++ return 1; +++ } else { +++ /* Must have been a dry run */ +++ return 0; +++ } ++ } ++--- a/usr/kinit/run-init/run-init.h +++++ b/usr/kinit/run-init/run-init.h ++@@ -28,7 +28,10 @@ ++ #ifndef RUN_INIT_H ++ #define RUN_INIT_H ++ +++#include +++ ++ const char *run_init(const char *realroot, const char *console, ++- const char *drop_caps, const char *init, char **initargs); +++ const char *drop_caps, bool dry_run, +++ const char *init, char **initargs); ++ ++ #endif ++--- a/usr/kinit/run-init/runinitlib.c +++++ b/usr/kinit/run-init/runinitlib.c ++@@ -156,10 +156,10 @@ static int nuke(const char *what) ++ } ++ ++ const char *run_init(const char *realroot, const char *console, ++- const char *drop_caps, const char *init, +++ const char *drop_caps, bool dry_run, const char *init, ++ char **initargs) ++ { ++- struct stat rst, cst; +++ struct stat rst, cst, ist; ++ struct statfs sfs; ++ int confd; ++ ++@@ -186,13 +186,15 @@ const char *run_init(const char *realroo ++ ++ /* Okay, I think we should be safe... */ ++ ++- /* Delete rootfs contents */ ++- if (nuke_dir("/")) ++- return "nuking initramfs contents"; ++- ++- /* Overmount the root */ ++- if (mount(".", "/", NULL, MS_MOVE, NULL)) ++- return "overmounting root"; +++ if (!dry_run) { +++ /* Delete rootfs contents */ +++ if (nuke_dir("/")) +++ return "nuking initramfs contents"; +++ +++ /* Overmount the root */ +++ if (mount(".", "/", NULL, MS_MOVE, NULL)) +++ return "overmounting root"; +++ } ++ ++ /* chroot, chdir */ ++ if (chroot(".") || chdir("/")) ++@@ -205,12 +207,24 @@ const char *run_init(const char *realroo ++ /* Open /dev/console */ ++ if ((confd = open(console, O_RDWR)) < 0) ++ return "opening console"; ++- dup2(confd, 0); ++- dup2(confd, 1); ++- dup2(confd, 2); +++ if (!dry_run) { +++ dup2(confd, 0); +++ dup2(confd, 1); +++ dup2(confd, 2); +++ } ++ close(confd); ++ ++- /* Spawn init */ ++- execv(init, initargs); ++- return init; /* Failed to spawn init */ +++ if (!dry_run) { +++ /* Spawn init */ +++ execv(init, initargs); +++ return init; /* Failed to spawn init */ +++ } else { +++ if (stat(init, &ist)) +++ return init; +++ if (!S_ISREG(ist.st_mode) || !(ist.st_mode & S_IXUGO)) { +++ errno = EACCES; +++ return init; +++ } +++ return NULL; /* Success */ +++ } ++ } ++--- a/usr/kinit/kinit.c +++++ b/usr/kinit/kinit.c ++@@ -304,7 +304,7 @@ int main(int argc, char *argv[]) ++ init_argv[0] = strrchr(init_path, '/') + 1; ++ ++ errmsg = run_init("/root", "/dev/console", ++- get_arg(cmdc, cmdv, "drop_capabilities="), +++ get_arg(cmdc, cmdv, "drop_capabilities="), false, ++ init_path, init_argv); ++ ++ /* If run_init returned, something went bad */ diff --cc debian/patches/series index 0000000,0000000..51533e7 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,19 @@@ ++klibc-linux-libc-dev ++multiarch-include-path ++Fix-minimal-mv-to-work-across-fs ++ppc64el-load-toc-syscall-stub.patch ++implement-realpath.patch ++readlink-add-f-option.patch ++mount-implement-o-defaults.patch ++mips-update-archfcntl-h.patch ++0001-add-mips64-support-headers.patch ++0002-add-mips64-support-arch-mips32.patch ++0003-add-mips64-support-arch-mips64-specific.patch ++install-headers-with-consistent-mode.patch ++dash-mkbuiltins-fix-sort-order-harder.patch ++klibc-add-pread-and-pwrite-32bit-syscall-wrappers-for-parisc.patch ++klibc-ppc64-fix-struct-stat.patch ++gzip-fix-silent-fallback-to-decompression.patch ++klibc-mips-setjmp-s-don-t-save-and-restore-floating-point.patch ++syscalls-override-detection-of-direct-socket-syscalls-on-i386-m68k-s390.patch ++run-init-add-dry-run-mode.patch diff --cc debian/patches/syscalls-override-detection-of-direct-socket-syscalls-on-i386-m68k-s390.patch index 0000000,0000000..4290ddf new file mode 100644 --- /dev/null +++ b/debian/patches/syscalls-override-detection-of-direct-socket-syscalls-on-i386-m68k-s390.patch @@@ -1,0 -1,0 +1,42 @@@ ++From: Ben Hutchings ++Date: Tue, 05 Jan 2016 21:11:41 +0000 ++Subject: syscalls: Override detection of direct socket syscalls on i386, m68k, s390 ++Bug-Debian: https://bugs.debian.org/809423 ++Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003882.html ++ ++The direct socket syscalls are now implemented on i386, m68k and s390, ++making socketcall() obsolete. However we need to keep klibc/unstable ++working with the last stable kernel version (3.16) so we shouldn't use ++them yet. ++ ++--- ++--- a/usr/include/arch/i386/klibc/archconfig.h +++++ b/usr/include/arch/i386/klibc/archconfig.h ++@@ -15,4 +15,7 @@ ++ /* We have __libc_arch_init() */ ++ #define _KLIBC_HAS_ARCHINIT 1 ++ +++/* Use sys_socketcall unconditionally */ +++#define _KLIBC_SYS_SOCKETCALL 1 +++ ++ #endif /* _KLIBC_ARCHCONFIG_H */ ++--- a/usr/include/arch/m68k/klibc/archconfig.h +++++ b/usr/include/arch/m68k/klibc/archconfig.h ++@@ -12,4 +12,7 @@ ++ /* On m68k, sys_mmap2 uses the current page size as the shift factor */ ++ #define _KLIBC_MMAP2_SHIFT __getpageshift() ++ +++/* Use sys_socketcall unconditionally */ +++#define _KLIBC_SYS_SOCKETCALL 1 +++ ++ #endif /* _KLIBC_ARCHCONFIG_H */ ++--- a/usr/include/arch/s390/klibc/archconfig.h +++++ b/usr/include/arch/s390/klibc/archconfig.h ++@@ -12,4 +12,7 @@ ++ /* Both s390 and s390x use the "32-bit" version of this structure */ ++ #define _KLIBC_STATFS_F_TYPE_64 0 ++ +++/* Use sys_socketcall unconditionally */ +++#define _KLIBC_SYS_SOCKETCALL 1 +++ ++ #endif /* _KLIBC_ARCHCONFIG_H */ diff --cc debian/rules index 0000000,0000000..2df1cf9 new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,87 @@@ ++#!/usr/bin/make -f ++ ++# let debhelper be verbose ++#export DH_VERBOSE=1 ++ ++DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) ++export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ++ ++ifeq ($(DEB_HOST_ARCH),armel) ++DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y ++endif ++ifeq ($(DEB_HOST_ARCH),armhf) ++DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y CPU_ARCH=armv6 CPU_TUNE=arm1176jzf-s CONFIG_KLIBC_THUMB=n ++endif ++ifeq ($(DEB_HOST_ARCH),ia64) ++DEB_MAKE_ENVVARS := ARCH=ia64 ++endif ++ifeq ($(DEB_HOST_ARCH),i386) ++DEB_MAKE_ENVVARS := ARCH=i386 ++endif ++ifeq ($(DEB_HOST_ARCH),sparc) ++DEB_MAKE_ENVVARS := ARCH=sparc ++endif ++ifeq ($(DEB_HOST_ARCH),s390) ++DEB_MAKE_ENVVARS := ARCH=s390 ++endif ++ifeq ($(DEB_HOST_ARCH),powerpc) ++ARCH=ppc ++endif ++ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH))) ++DEB_MAKE_ENVVARS := ARCH=mips ++endif ++ifneq (,$(filter mips64 mips64el,$(DEB_HOST_ARCH))) ++DEB_MAKE_ENVVARS := ARCH=mips64 ++endif ++ifeq ($(DEB_HOST_ARCH),sh4) ++DEB_MAKE_ENVVARS := ARCH=sh ++endif ++ifeq ($(DEB_HOST_ARCH),ppc64) ++DEB_MAKE_ENVVARS := ARCH=ppc64 ++endif ++ ++DEB_MAKE_ENVVARS := INSTALLROOT=debian/tmp $(DEB_MAKE_ENVVARS) ++ ++DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ++DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ++ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) ++ DEB_MAKE_ENVVARS += CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- ++endif ++ ++ ++# Enable this to get verbose build information ++DEB_MAKE_ENVVARS += KBUILD_VERBOSE=1 ++ ++%: ++ dh $@ --link-doc=libklibc ++ ++override_dh_auto_build: ++ if [ ! -e linux ]; then \ ++ rm -rf linux/include; \ ++ mkdir -p linux/include; \ ++ ln -s /usr/include/linux linux/include; \ ++ INC_PATH="/usr/include/asm*"; \ ++ if [ -n "$(DEB_HOST_MULTIARCH)" ]; then \ ++ INC_PATH="$${INC_PATH} /usr/include/$(DEB_HOST_MULTIARCH)/asm*"; \ ++ INC_PATH="$${INC_PATH} /usr/$(DEB_HOST_MULTIARCH)/include/asm*"; \ ++ fi; \ ++ for x in $${INC_PATH}; do \ ++ if [ -e $${x} ] ; then \ ++ ln -sf $${x} linux/include; \ ++ fi; \ ++ done \ ++ fi ++ make all $(DEB_MAKE_ENVVARS) ++ ++override_dh_auto_clean: ++ rm -rf linux ++ MAKEFLAGS="$(DEB_MAKE_ENVVARS)" dh_auto_clean ++ ++override_dh_auto_install: ++ make install $(DEB_MAKE_ENVVARS) ++ ++override_dh_auto_test: ++ make test $(DEB_MAKE_ENVVARS) ++ ++override_dh_fixperms: ++ dh_fixperms -X.so diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/watch index 0000000,0000000..2e4a75b new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,2 @@@ ++version=3 ++https://www.kernel.org/pub/linux/libs/klibc/2.0/klibc-([0-9.]+).tar.xz