--- scratchbox2-1.99.0.27.orig/debian/copyright +++ scratchbox2-1.99.0.27/debian/copyright @@ -0,0 +1,57 @@ +This package was debianized by Riku Voipio + +The source may be fetched from git://anongit.freedesktop.org/git/sbox2 + +preload library and most of sratchbox 2.0 : + Copyright (C) 2006 Lauri Leukkunen + Heavily based on the libfakechroot library by Piotr Roszatycki + +It may be redistributed under the terms of the GNU LGPL, Version 2 or +later, found on Debian systems in the file /usr/share/common-licenses/LGPL-2. + +sb_alien, libsb_env and utils: + + Copyright (C) 2004-2005 Nokia + Author: Timo Savola + Author: Toni Timonen + Licensed under GPL + +On Debian systems, the complete text of the GPL license can be found in the +/usr/share/common-licenses/GPL file. + +Lua License +----------- + +Lua is licensed under the terms of the MIT license reproduced below. +This means that Lua is free software and can be used for both academic +and commercial purposes at absolutely no cost. + +For details and rationale, see http://www.lua.org/license.html . + +=============================================================================== + +Copyright (C) 1994-2006 Lua.org, PUC-Rio. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +=============================================================================== + +(end of COPYRIGHT) + + --- scratchbox2-1.99.0.27.orig/debian/rules +++ scratchbox2-1.99.0.27/debian/rules @@ -0,0 +1,69 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif + +build: build-stamp +build-stamp: patch + dh_testdir + ./autogen.sh + $(MAKE) prefix=/usr + touch build-stamp + +# this is really not part of debian package build, but just for convinience + +clean: unpatch checkroot + $(checkdir) + make superclean + rm -f build-stamp + dh_clean + +# Build architecture-independent files here. +binary-indep: build +# We have nothing to do by default. + +# Build architecture-dependent files here. +install: build + dh_testdir + dh_testroot + dh_installdirs + $(MAKE) prefix="$(CURDIR)/debian/scratchbox2/usr" install + # make lintian happy + rm -f debian/scratchbox2/usr/share/scratchbox2/host_usr + ln -sf ../.. debian/scratchbox2/usr/share/scratchbox2/host_usr + +binary-arch: install + dh_testdir -a + dh_testroot -a + dh_installdocs -a README + dh_installchangelogs -a + dh_strip -a + dh_compress -a + dh_fixperms -a + # FIXME, do in postinst + dh_installdeb -a + LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:debian/scratchbox2/usr/lib/libsb2/ dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch + +.PHONY: build clean binary-indep binary-arch binary checkroot prebuild + +define checkdir + dh_testdir +endef + +checkroot: + $(checkdir) + dh_testroot --- scratchbox2-1.99.0.27.orig/debian/control +++ scratchbox2-1.99.0.27/debian/control @@ -0,0 +1,24 @@ +Source: scratchbox2 +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Riku Voipio +Section: utils +Priority: extra +Standards-Version: 3.7.3 +Build-Depends: debhelper (>=5), automake1.10, autoconf, gcc-multilib [amd64], libc6-dev-i386 [amd64], g++-multilib [amd64], quilt +XS-Vcs-Git: git://anongit.freedesktop.org/git/sbox2 +XS-Vcs-Browser: http://gitweb.freedesktop.org/?p=sbox2.git +Homepage: http://www.freedesktop.org/wiki/Software/sbox2 + +Package: scratchbox2 +Architecture: i386 amd64 powerpc ia64 +Depends: ${shlibs:Depends} +Recommends: qemu, fakeroot +Suggests: sbrsh +Description: Transparent cross compiling environment + Scratchbox2 uses a LD_PRELOAD library to create a transparent cross compiling + environment. Scratchbox2 automatically maps file system accesses to + crosscompiler, target libraries and headers using a flexible lua path mapping + engine. Together with CPU transparency, provided by qemu or sbrsh, scratchbox2 + enables fast crosscompiling without modifying build scripts. + . + --- scratchbox2-1.99.0.27.orig/debian/changelog +++ scratchbox2-1.99.0.27/debian/changelog @@ -0,0 +1,179 @@ +scratchbox2 (1.99.0.27-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - add quilt support. + - add ubuntu_hardening.diff patch, this is a workaround to FTBFS caused by + -D_FORTIFY_SOURCE=2 compiler flag enabled in Ubuntu. + * Update ubuntu_hardening.diff patch. + + -- Devid Antonio Filoni Wed, 12 Nov 2008 13:59:03 +0100 + +scratchbox2 (1.99.0.27-1) unstable; urgency=low + + * New upstream version + * Simplify build rules + + -- Riku Voipio Mon, 20 Oct 2008 20:23:05 +0300 + +scratchbox2 (1.99.0.24-2ubuntu1) intrepid; urgency=low + + * Add quilt support. + * Add ubuntu_hardening.diff patch, fix FTBFS caused by -D_FORTIFY_SOURCE=2 + compiler flag enabled in Intrepid. + + -- Devid Antonio Filoni Sun, 07 Sep 2008 23:07:59 +0200 + +scratchbox2 (1.99.0.24-2) unstable; urgency=low + + * Save the world from masturbating monkeys (closes: #496409) + + -- Riku Voipio Mon, 25 Aug 2008 23:04:49 +0300 + +scratchbox2 (1.99.0.24-1) unstable; urgency=low + + [ Lauri Aarnio ] + * Bugfix: LD_PRELOAD in now set by sb2-monitor, not by the "sb2" + script + * Updated to use newer libtool version (1.5.26) + * Important bugfix to libpthread interface + * Fix to fts_open() + * Important bugfix: Renaming of symlinks + * Refactored sb2's dpkg-checkbuilddeps wrapper. + * sb2-monitor now appends libsb2 to an existing LD_PRELOAD variable + * sb_decolonize_path() bugfix: slashdot makes sense now + * Updates to path mapping code and mapping modes + * oops; fixed typos in mapping rules. + + [ Lauri Leukkunen ] + * increase version numbers to .24 + * debian packaging is tedious + + [ Riku Voipio ] + * Make multilib target use install target + * sb2-show needs libsb2 + * Update to latest policy (use Homepage: tag) + * Depend on "make clean" for cleanup + * upload to debian + + -- Riku Voipio Tue, 18 Mar 2008 01:00:34 +0200 + +scratchbox2 (1.99.0.24) unstable; urgency=low + * fill me up + -- Lauri Leukkunen Fri, 14 Mar 2008 07:48:35 +0200 + +scratchbox2 (1.99.0.23-1) unstable; urgency=low + + [ Janne J Kataja ] + * Bashism detected! Changed shell in utils/dpkg-checkbuilddeps + + [ Lauri Aarnio ] + * bugfix: fixed typos in macro names + * Added log post-processing tool and improved logging messages. + * Introduce SB1 bug emulation mode + * Modified interface generator to create SB_LOG calls at returns. + * A fix for host-gcc parameter generation + * Bugfix: added wrapper for eaccess() + * Introduced R/O mapping mode. + * Logging enhancements: show changes made to argv+envp + * sb2-init improvements + * Added "replace_by" action to path mapping engine + * Fixed a critical path mapping bug + * Minor bugfix (sb2-build-libtool) + * Added a SB1 compatibility mapping rule to maemo mode + * Print statistics after sb2 finishes (and/or error+warning messages) + + [ Lauri Leukkunen ] + * Split configure step from building for multilib + * Fix tool distro support + * Introduce sb2-show, cleanup some warnings + * Make exported.h generated by gen-interface.pl to be a proper header + file + * Fix -Wno-poison-system-directories check + * Implement arguments for CPUTRANSPARENCY_METHOD + * replace iswhitespace() with standard isspace() + * Optimize mappings by adding simple prefix check + * Make rest of the mapping modes work with mapping.lua changes + * Separate gcc argv mangling rule generation to argvenvp_gcc.lua + * gitignore utils/sb2-show + * Simplify path mapping code + * sb2-init allows specifying entire cputransparency command + * Map /usr/X11R6/lib in maemo mode + * Fix multilib compilation + * map /usr/X11R6/include to target root in maemo mode + + [ Riku Voipio ] + * Add IA64 and powerpc host support + * changelog update + * Clean up sb2 script and speed up running sb2 script + * Add scripts to use the qemu-sbrsh bridge + * New upstream version, closes: 468156 + + -- Riku Voipio Mon, 03 Mar 2008 11:44:50 +0200 + +scratchbox2 (1.99.0.22) unstable; urgency=low + + * New upstream version + * Fix building on 386, closes: #456352 + * Fix amd64 multilib install location, closes: #456528 + + -- Riku Voipio Tue, 18 Dec 2007 23:27:48 +0200 + +scratchbox2 (1.99.0.20) unstable; urgency=low + + * New upstream version + * Replaced hardcoded gcc/ld wrapper with generic lua-based + argument remapper. Tthus stopped using c++, closes: #455127 + * Tool distro support + * sbrsh support + * various fixes and cleanups + + -- Riku Voipio Fri, 14 Dec 2007 10:36:33 +0200 + +scratchbox2 (1.99.0.19) unstable; urgency=low + + * New upstream version + * reworked sb2 target setup + * improved dpkg-architecture handling + + -- Riku Voipio Thu, 20 Sep 2007 00:03:48 +0300 + +scratchbox2 (1.99.0.18) unstable; urgency=low + + * New upstream version + * endianness fixes, thus add powerpc and ia64 host support + * add testsuite for debugging target problems + * buggy cache code removed completly + + -- Riku Voipio Thu, 06 Sep 2007 11:06:48 +0300 + +scratchbox2 (1.99.0.16) unstable; urgency=low + + * New upstream version: + - Multilib support to allow using precompiled ia32 crosstoolchains + on amd64 hosts + - Fix hashbang support in execve() and do_exec() + - Fix symlink handling + - Add dbs support + * Change packagin to use multilib + + -- Riku Voipio Wed, 29 Aug 2007 15:13:36 +0300 + +scratchbox2 (1.99.0.11) unstable; urgency=low + + * New upstream version, fixes and sb1 cruft killing + * Add Homepage and git repos to debian/control + + -- Riku Voipio Thu, 26 Jul 2007 00:17:44 +0300 + +scratchbox2 (1.99.0.9) unstable; urgency=low + + * New upstream version + + -- Riku Voipio Tue, 10 Jul 2007 11:40:46 +0300 + +scratchbox2 (1.99.0.5) unstable; urgency=low + + * Initial upload to Debian. Closes: #414737 + + -- Riku Voipio Fri, 25 May 2007 21:46:52 +0300 + --- scratchbox2-1.99.0.27.orig/debian/compat +++ scratchbox2-1.99.0.27/debian/compat @@ -0,0 +1 @@ +5 --- scratchbox2-1.99.0.27.orig/debian/docs +++ scratchbox2-1.99.0.27/debian/docs @@ -0,0 +1 @@ +README --- scratchbox2-1.99.0.27.orig/debian/patches/ubuntu_hardening.diff +++ scratchbox2-1.99.0.27/debian/patches/ubuntu_hardening.diff @@ -0,0 +1,28 @@ +Index: scratchbox2-1.99.0.27/utils/sb2-show.c +=================================================================== +--- scratchbox2-1.99.0.27.orig/utils/sb2-show.c 2008-11-12 14:37:36.000000000 +0100 ++++ scratchbox2-1.99.0.27/utils/sb2-show.c 2008-11-12 14:40:25.000000000 +0100 +@@ -229,7 +229,7 @@ + /* fix __SB2_BINARYNAME in the environment that is going to be + * given to sb2show__execve_mods__() (otherwise it would be "sb2-show" + */ +- asprintf(&ba[0], "__SB2_BINARYNAME=%s", binary_name); ++ if (asprintf(&ba[0], "__SB2_BINARYNAME=%s", binary_name)) {} + ba[1] = NULL; + orig_env0 = join_env_vecs(environ, ba); + /* add user-specified environment varaibles */ +Index: scratchbox2-1.99.0.27/utils/sb2-monitor.c +=================================================================== +--- scratchbox2-1.99.0.27.orig/utils/sb2-monitor.c 2008-11-12 14:45:12.000000000 +0100 ++++ scratchbox2-1.99.0.27/utils/sb2-monitor.c 2008-11-12 14:45:57.000000000 +0100 +@@ -287,8 +287,8 @@ + if (!p_libsb2) { + /* LD_PRELOAD is defined, but libsb2 + * was not included. Add it now. */ +- asprintf(&new_ld_preload, "%s:%s", +- old_ld_preload, sbox_libsb2); ++ if (asprintf(&new_ld_preload, "%s:%s", ++ old_ld_preload, sbox_libsb2)) {} + } /* else libsb2 seems to be already included */ + } else { + /* LD_PRELOAD was not set. */ --- scratchbox2-1.99.0.27.orig/debian/patches/series +++ scratchbox2-1.99.0.27/debian/patches/series @@ -0,0 +1 @@ +ubuntu_hardening.diff