debian/0000755000000000000000000000000011747542430007175 5ustar debian/compat0000644000000000000000000000000211232135336010363 0ustar 5 debian/changelog0000644000000000000000000000446311747541537011065 0ustar makefs (20100306-3) unstable; urgency=low * Use debian/source/format 3.0 (quilt) with local single-debian-patch * Work with prospective libbsd 0.4.0 (Closes: #670183) * Clean up packaging; disable some gcc warnings for now -- Thorsten Glaser Mon, 30 Apr 2012 16:52:02 +0000 makefs (20100306-2) unstable; urgency=low * makefs can do Multi-Arch: foreign as requested by vorlon * Add build-{arch,indep} targets (as alias to build) * debian/rules: cleanup (remove install/check, dh_installdirs) * Mention lack of Large File Support as a FIXME * Policy 3.9.3, no relevant changes * debian/rules: modernise; enable +all hardening and --as-needed * Use DEB_HOST_ARCH_OS to check whether we’re compiling for Hurd * Attempt to use Link-Time Optimisation -- Thorsten Glaser Sun, 25 Mar 2012 19:43:59 +0000 makefs (20100306-1) unstable; urgency=low * Bump Standards-Version, no relevant change * debian/source/format: Enforce "1.0" manually, for now * debian/control: Remove DMUA, I'm a DD now * New upstream version, with the following change summary: - sync with NetBSD® upstream, gives us minor bugfixes and support for the Acorn Archimedes (untested) - support setting the {creation,modification,effective,expiry} date; GNU GRUB 2 uses mtime for “UUID”s… - add boot-info-table (J�rg compatible) support - get rid of MAXPATHLEN and PATH_MAX; avoid DEV_BSIZE * On Hurd, create an empty (Closes: #562297) -- Thorsten Glaser Sun, 07 Mar 2010 00:42:21 +0000 makefs (20091122-1) unstable; urgency=low * New upstream release, summary of changes: - Fixes to the bundled manual pages (e.g. - → \-) * Add README.Debian containing some notes on this programme -- Thorsten Glaser Tue, 15 Dec 2009 11:15:31 +0000 makefs (20090808-2) unstable; urgency=low * debian/rules: provide __RCSID if libbsd (< 0.1.3) doesn’t, helps backports and avr32; Closes: #547399 * remove lintian overrides no longer necessary * bump Standards-Version 3.8.2 -> 3.8.3, no relevant changes -- Thorsten Glaser Sat, 26 Sep 2009 16:57:42 +0000 makefs (20090808-1) unstable; urgency=low * Initial release (Closes: #538171) -- Thorsten Glaser Sat, 08 Aug 2009 13:46:39 +0000 debian/watch0000644000000000000000000000024411237276210010220 0ustar # $MirOS: contrib/hosted/tg/deb/makefs/debian/watch,v 1.1 2009/08/08 13:24:00 tg Exp $ version=3 http://www.mirbsd.org/MirOS/dist/mir/makefs/ makefs-(.*)\.tar\.gz debian/README.Debian0000644000000000000000000000224411733667417011250 0ustar Notes: • Upstream development is in both NetBSD® and MirBSD. The latter keeps NetBSD®’s code in a vendor branch, with periodic import and merge cycles, and applies fixes (especially to cd9660 code) as well as more features (such as support for boot-info-table and GRUB 2 UUIDs) to the MAIN branch, which is what we take. It also contains enough glue code to make it build on Debian systems, which includes Hurd. • The ffs code currently has bugs in the calculation of the image size, so it requires the use of the -s flag (or maybe -M). • The “-t fstype” flag must come before filesystem-specific flags, such as “-o options”. • The code uses “long” instead of “off_t” and other appropriate types, so it cannot work with filesystems of 4 GiB, if not 2 GiB, of size. ⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼ $MirOS: contrib/hosted/tg/deb/makefs/debian/README.Debian,v 1.3 2012/03/25 19:16:07 tg Exp $ debian/install0000644000000000000000000000020511232135336010553 0ustar # $MirOS: contrib/hosted/tg/deb/makefs/debian/install,v 1.1 2009/07/23 19:32:22 tg Exp $ #- builddir/usr.sbin/makefs/makefs usr/sbin debian/patches/0000755000000000000000000000000011747542430010624 5ustar debian/patches/debian-changes0000644000000000000000000000521311747542430013400 0ustar Please review changes against upstream code using SCM, see the Vcs-* tags in debian/control for its location. --- makefs-20100306.orig/src/usr.sbin/makefs/mbsdtree.h +++ makefs-20100306/src/usr.sbin/makefs/mbsdtree.h @@ -3,7 +3,7 @@ /* $NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $ */ /*- - * Copyright (c) 2009 + * Copyright (c) 2009, 2012 * Thorsten Glaser * Copyright (c) 1995 * The Regents of the University of California. All rights reserved. @@ -60,7 +60,7 @@ char *flags_to_string(u_long, const char int string_to_flags(char **, u_long *, u_long *); #endif -#ifdef DEBIAN +#ifdef MAKEFS_FPARSELN /* * fparseln() specific operation flags. */ --- makefs-20100306.orig/src/usr.sbin/makefs/ffs.c +++ makefs-20100306/src/usr.sbin/makefs/ffs.c @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /* - * Copyright (c) 2009, 2010 + * Copyright (c) 2009, 2010, 2012 * Thorsten Glaser * Copyright (c) 1982, 1986, 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -92,6 +92,7 @@ __RCSID("$NetBSD: ffs.c,v 1.44 2009/04/2 #include #include #include +#include #include #include "makefs.h" --- makefs-20100306.orig/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c +++ makefs-20100306/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c @@ -2,7 +2,7 @@ /* $NetBSD: spec.c,v 1.78 2009/09/22 04:38:21 apb Exp $ */ /*- - * Copyright (c) 2009 + * Copyright (c) 2009, 2012 * Thorsten Glaser * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -65,10 +65,6 @@ #include "nbtool_config.h" #endif -#if defined(__MirBSD__) || defined(DEBIAN) -#include "mbsdtree.h" -#endif - #include #if defined(__RCSID) && !defined(lint) #if 0 @@ -95,6 +91,12 @@ __RCSID("$NetBSD: spec.c,v 1.78 2009/09/ #include #ifndef DEBIAN #include +#else +#define MAKEFS_FPARSELN +#endif + +#if defined(__MirBSD__) || defined(DEBIAN) +#include "mbsdtree.h" #endif #include "extern.h" --- makefs-20100306.orig/src/lib/libutil/fparseln.c +++ makefs-20100306/src/lib/libutil/fparseln.c @@ -2,7 +2,8 @@ /* $NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $ */ /* - * Copyright (c) 2009 Thorsten Glaser + * Copyright (c) 2009, 2012 + * Thorsten Glaser * Copyright (c) 1997 Christos Zoulas. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,6 +34,8 @@ #include #ifdef DEBIAN +#define MAKEFS_FPARSELN +#include #include "mbsdtree.h" #else #include "util.h" debian/patches/series0000644000000000000000000000001711747542430012037 0ustar debian-changes debian/control0000644000000000000000000000267511733667417010622 0ustar # $MirOS: contrib/hosted/tg/deb/makefs/debian/control,v 1.10 2012/03/25 19:16:07 tg Exp $ # Source: makefs Section: otherosfs Priority: optional Maintainer: Thorsten Glaser Homepage: http://cvs.mirbsd.de/src/usr.sbin/makefs/ Build-Depends: debhelper (>= 5), libbsd-dev, pmake Standards-Version: 3.9.3 # First word is the $CVSROOT (-d arg) string, second word the module. Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/makefs Vcs-Browser: http://cvs.mirbsd.de/contrib/hosted/tg/deb/makefs/ Package: makefs Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} Description: create a cd9660 or ffs file system image from a directory tree NetBSD® makefs(8) creates a file system image from a directory tree without the need for superuser privileges. The MirBSD version fixes ECMA 119, SUSP and RRIP (Rock Ridge) compliance and adds features. . Supported target filesystem types are: . cd9660 ISO 9660 (ECMA 119) compatible filesystem images, with Rock Ridge, El Torito, and other features ffs 4.2FFS, the BSD Fast Filesystem, also known as UFS1; UFS2 (with "-o version=2") . The images created can be of a fixed (predefined) size, given on the command line, or sized automatically. Permission bits are taken from the source directory tree but may be overridden using an mtree file. . This utility does not currently support Large Files (2 GiB or more). debian/copyright0000644000000000000000000001031211344572714011126 0ustar This package was debianised by Thorsten Glaser on Thu, 23 Jul 2009 17:03:29 +0000. $MirOS: contrib/hosted/tg/deb/makefs/debian/copyright,v 1.4 2010/03/07 00:39:16 tg Exp $ It was downloaded from: https://www.mirbsd.org/MirOS/dist/mir/makefs/makefs-20100306.tar.gz Licence: NetBSD® makefs is compiled from a collection of source files under several licences (2-clause, 3-clause and 4-clause BSD) by various authors, contributors and copyright owners. Below is a reproduction of the terms used, with equivalent versions collapsed into a single representation. The exact copyright holders are not mentioned, because not every committer has added himself to the list. The source code has been touched by developers from these projects, sometimes under projects such as DARPA and GSoC: • The MirOS Project • The OpenBSD Project • The NetBSD Project • Wasabi Systems • The University of California All or some portions of this file are derived from material licensed to the University of California by American Telephone and Telegraph Co. or Unix System Laboratories, Inc. and are reproduced herein with the permission of UNIX System Laboratories, Inc. 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 for the NetBSD Project by Wasabi Systems, Inc. 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. The cd9660 creation code holds a slightly different wording: This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys, Alan Perez-Rathke and Ram Vedam. 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. THIS SOFTWARE IS PROVIDED BY DANIEL WATT, WALTER DEIGNAN, RYAN GABRYS, ALAN PEREZ-RATHKE AND RAM VEDAM ``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 DANIEL WATT, WALTER DEIGNAN, RYAN GABRYS, ALAN PEREZ-RATHKE AND RAM VEDAM 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. debian/rules0000755000000000000000000000605011747541177010265 0ustar #!/usr/bin/make -f # $MirOS: contrib/hosted/tg/deb/makefs/debian/rules,v 1.14 2012/04/30 16:48:39 tg Exp $ shellescape='$(subst ','\'',$(1))' shellexport=$(1)=$(call shellescape,${$(1)}) DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) CC?= gcc EXTRA_CFLAGS+= -Wall -Wformat EXTRA_CPPFLAGS+= -include /usr/include/bsd/bsd.h EXTRA_CPPFLAGS+= -idirafter /usr/include/bsd EXTRA_LDFLAGS= -Wl,--as-needed # not yet (needs to be checked upstream) EXTRA_CFLAGS+= -Wno-unused-but-set-variable EXTRA_CFLAGS+= -Wno-unused-result ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk)) # dpkg-dev (>= 1.16.1~) DEB_CFLAGS_MAINT_APPEND=${EXTRA_CFLAGS} DEB_CPPFLAGS_MAINT_APPEND=${EXTRA_CPPFLAGS} DEB_LDFLAGS_MAINT_APPEND=${EXTRA_LDFLAGS} DEB_BUILD_MAINT_OPTIONS=hardening=+all include /usr/share/dpkg/buildflags.mk else # old-fashioned way to determine build flags CFLAGS= -O$(if $(findstring noopt,${DEB_BUILD_OPTIONS}),0,2) -g CFLAGS+= ${EXTRA_CFLAGS} CPPFLAGS+= ${EXTRA_CPPFLAGS} LDFLAGS+= ${EXTRA_LDFLAGS} endif # should be in libbsd DEFS+= -D'__IDSTRING(x,y)=static const char x[] __attribute__((used)) = y' DEFS+= -D'__KERNEL_RCSID(x,y)=__IDSTRING(kernelrcsid_ \#\# x,y)' DEFS+= -D'__dead=__attribute__((noreturn))' DEFS+= -D'_DIAGASSERT(x)=' # is in libbsd, but not all versions: Debian #547399 ifeq ($(shell fgrep -ch __RCSID \ /usr/include/bsd/cdefs.h /usr/include/bsd/sys/cdefs.h \ 2>/dev/null),0) DEFS+= -D'__RCSID(x)=__IDSTRING(rcsid,x)' endif DEFS+= -D'bswap16=__bswap_16' DEFS+= -D'bswap32=__bswap_32' DEFS+= -D'bswap64=__bswap_64' DEFS+= -DHAVE_STRUCT_STATVFS_F_IOSIZE=0 DEFS+= -DHAVE_STRUCT_STAT_ST_MTIMENSEC=0 DEFS+= -DHAVE_STRUCT_STAT_ST_FLAGS=0 DEFS+= -DHAVE_STRUCT_STAT_ST_GEN=0 PMAKE_FLAGS:= BSDSRCDIR="$$_topdir/builddir" PMAKE_FLAGS+= DEBIAN=Yes # disable -Werror for package build (comment this out if developing) PMAKE_FLAGS+= NOGCCERROR=Yes build build-arch: builddir/.build_stamp build-indep: builddir/.build_stamp: dh_testdir -rm -rf builddir mkdir builddir cp -r src/* builddir/ ifeq (${DEB_HOST_ARCH_OS},hurd) mkdir -p builddir/usr.sbin/makefs/sys :>builddir/usr.sbin/makefs/sys/mount.h endif # pmake in Debian is pretty buggy +_topdir=$$(pwd); cd builddir/usr.sbin/makefs; \ for opts in '-flto=jobserver' ''; do \ set -x; \ $(foreach i,CC CFLAGS LDFLAGS,$(call shellexport,$i)); \ CPPFLAGS=$(call shellescape,${CPPFLAGS} ${DEFS}); \ CFLAGS="$$CFLAGS $$opts"; \ LDFLAGS="$$CFLAGS $$LDFLAGS"; \ export LC_ALL=C CC CFLAGS CPPFLAGS LDFLAGS; \ pmake ${PMAKE_FLAGS} makefs || continue; \ test -x makefs && exit 0; \ done; echo >&2 Compiling failed.; exit 1 @:>$@ clean: dh_testdir -rm -rf builddir dh_clean binary-indep: binary-arch: build-arch dh_testdir dh_testroot if test -x "$$(which dh_prep)"; then dh_prep; else dh_clean -k; fi dh_installchangelogs dh_installdocs dh_install dh_installman dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: binary binary-arch binary-indep build build-arch build-indep clean debian/source/0000755000000000000000000000000011747542311010473 5ustar debian/source/format0000644000000000000000000000001411747537164011713 0ustar 3.0 (quilt) debian/manpages0000644000000000000000000000017211232135337010704 0ustar # $MirOS: contrib/hosted/tg/deb/makefs/debian/manpages,v 1.1 2009/07/23 19:32:23 tg Exp $ #- src/usr.sbin/makefs/makefs.8