--- umview-0.8.2.orig/debian/changelog +++ umview-0.8.2/debian/changelog @@ -0,0 +1,111 @@ +umview (0.8.2-3) unstable; urgency=medium + + * Revert to debhelper's compat level 10 + + -- Andrea Capriotti Fri, 18 Sep 2020 17:55:10 +0200 + +umview (0.8.2-2) unstable; urgency=medium + + * d/control: Bump debhelper's compat level to 13 (Closes: 965854) + * d/control: Standard version bumped to 4.5.0 + * d/control: Add VirtualSquare Uploader + + -- Andrea Capriotti Fri, 18 Sep 2020 13:28:22 +0200 + +umview (0.8.2-1.2) unstable; urgency=medium + + * Maintainers mailing list address updated (Closes: #899562) + * FTBFS with glibc 2.28 errors fixed (Closes: #916170) + + new include file + + -- Renzo Davoli Sat, 05 Jan 2019 10:57:20 +0100 + +umview (0.8.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: um_select.c:177: undefined reference to `__FDELT'": + apply patch from Ubuntu / Ilya Barygin: + - Fix FTBFS because of renamed macro. + (Closes: #707402) + * Build-depend on libvdeplug-dev, libvdeplug2-dev is only provided by + libvdeplug-dev. + Also taken from Ubuntu / Jeremy Bicha. + * Apply patch from Thomas Funk that removes EPOLL_NONBLOCK. + (Taken from upstream.) + * Apply patch from Roland Stigge: add architecture powerpcspe in + debian/control. (Closes: #734997) + + -- gregor herrmann Sun, 12 Oct 2014 16:25:14 +0200 + +umview (0.8.2-1) unstable; urgency=low + + * New upstream release + + Remove um_lwip module (no more needed for lwip networking) + (Closes: #663671) + + New viewfs (replaces modifshide) + * Update copyright file + + New upstream URL (Closes: #674216) + + canonicalize.c has been rewritten, removed LGPL part + * Add libcap-dev and dpkg-dev to Build-Depends + * Bump to Standards-Version 3.9.3 + + Remove .la files from libumlib-dev + + Add missing comma in Depends field + * Switch to machine-readable copyright file + * Remove empty .dirs files + + -- Ludovico Gardenghi Sun, 17 Jun 2012 01:52:55 +0200 + +umview (0.6-1) unstable; urgency=low + + [ Filippo Giunchedi ] + * Add DM-Upload-Allowed field + + [ Ludovico Gardenghi ] + * New upstream release + + Fix "FTBFS: Cannot find linux/dirent.h" (new upstream corrects the + path name and includes a .h with the needed definitions which are no + more accessible.) (Closes: #527518) + * Update standard-version to 3.8.1 (no changes needed). + * Added missing misc:Depends to libumlib-dev. + * Changed garden@acheronte.it with garden@debian.org. + * Fixed versionless license file names. + + -- Ludovico Gardenghi Sun, 14 Jun 2009 20:49:41 +0200 + +umview (0.5-2) unstable; urgency=low + + * umview must recommend libpurelibc1, not 0. + + -- Ludovico Gardenghi Mon, 23 Jun 2008 15:48:33 +0200 + +umview (0.5-1) unstable; urgency=low + + [ Ludovico Gardenghi ] + * New upstream release + + fix loading of lwipv6 (Closes: #470462) + + fix building on amd64 (Closes: #417047) + + fix wrong include (Closes: #479979) + + [ Filippo Giunchedi ] + * Move libumlib0-dev to libumlib-dev + * Update standard-versions to 3.8.0 (add Homepage and change Source-Version) + + -- Filippo Giunchedi Wed, 18 Jun 2008 22:29:59 +0200 + +umview (0.4a-2) unstable; urgency=low + + * Fix umlib0-dev dependencies + + -- Guido Trotter Tue, 13 Feb 2007 17:32:46 -0800 + +umview (0.4a-1) unstable; urgency=low + + [ Debian VSquare Team ] + * Initial release + + [ Guido Trotter ] + * Fix Build Dependencies + * The "valentine for reenzo" release + + -- Guido Trotter Tue, 13 Feb 2007 16:32:10 -0800 + --- umview-0.8.2.orig/debian/compat +++ umview-0.8.2/debian/compat @@ -0,0 +1 @@ +10 --- umview-0.8.2.orig/debian/control +++ umview-0.8.2/debian/control @@ -0,0 +1,161 @@ +Source: umview +Section: misc +Priority: optional +Maintainer: Debian VSquare Team +Uploaders: Ludovico Gardenghi , Guido Trotter , Filippo Giunchedi , Andrea Capriotti +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 10), libcap-dev, libvdeplug-dev, libfuse-dev, liblwipv6-dev, libglib2.0-dev, cdbs, dpkg-dev (>= 1.16.1~) +Homepage: http://view-os.sourceforge.net +Standards-Version: 4.5.0 + +Package: umview +Architecture: i386 amd64 powerpc powerpcspe ppc64 +Depends: libumlib0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: kernel-patch-viewos, libpurelibc1 +Suggests: umview-mod-umdevtap, umview-mod-umlwip +Description: View-OS in user space - Core and base modules + View-OS is a novel approach to the process/kernel interface. The semantics of + each system call can be assigned process by process giving the user the right + to decide which view of the system each process has to join. Each process can + "see" a different file system structure, networking resources, processor, + devices. Moreover some of the resources can be provided by the user + him/herself, thus these resource can be private to the single process and are + not known a priori by the system. Groups of processes can share the same view + but this is just an optimization to share management methods. + . + For more information, see http://wiki.virtualsquare.org + . + UMView is a user-mode implementation of View-OS. Processes are run with a + controlling daemon that captures all the system calls (at present using the + ptrace() system call) and uses dynamically loadable modules to change their + semantic. + . + This package contains the UMView controlling daemon and some modules, both + for testing and for real use. Other modules are contained in separate + packages because they depend on additional libraries. + +Package: libumlib0 +Architecture: i386 amd64 powerpc powerpcspe ppc64 +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: View-OS in user space - Support library for modules + View-OS is a novel approach to the process/kernel interface. The semantics of + each system call can be assigned process by process giving the user the right + to decide which view of the system each process has to join. Each process can + "see" a different file system structure, networking resources, processor, + devices. Moreover some of the resources can be provided by the user + him/herself, thus these resource can be private to the single process and are + not known a priori by the system. Groups of processes can share the same view + but this is just an optimization to share management methods. + . + For more information, see http://wiki.virtualsquare.org + . + UMView is a user-mode implementation of View-OS. Processes are run with a + controlling daemon that captures all the system calls (at present using the + ptrace() system call) and uses dynamically loadable modules to change their + semantic. + . + This package contains a library with common functions used by every UMView + module. + +Package: libumlib-dev +Architecture: i386 amd64 powerpc powerpcspe ppc64 +Conflicts: libumlib0-dev +Replaces: libumlib0-dev +Section: libdevel +Depends: libumlib0 (= ${binary:Version}), ${misc:Depends} +Description: View-OS in user space - Development files + View-OS is a novel approach to the process/kernel interface. The semantics of + each system call can be assigned process by process giving the user the right + to decide which view of the system each process has to join. Each process can + "see" a different file system structure, networking resources, processor, + devices. Moreover some of the resources can be provided by the user + him/herself, thus these resource can be private to the single process and are + not known a priori by the system. Groups of processes can share the same view + but this is just an optimization to share management methods. + . + For more information, see http://wiki.virtualsquare.org + . + UMView is a user-mode implementation of View-OS. Processes are run with a + controlling daemon that captures all the system calls (at present using the + ptrace() system call) and uses dynamically loadable modules to change their + semantic. + . + This package contains headers and library needed to write and compile new + UMView modules. For some simple module examples, you can take a look to the + existing modules (expecially in the um_testmodule directory of the source + tree). + +Package: umview-mod-umlwip +Architecture: i386 amd64 powerpc powerpcspe ppc64 +Depends: libumlib0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: View-OS in user space - LWIPv6 gateway module + View-OS is a novel approach to the process/kernel interface. The semantics of + each system call can be assigned process by process giving the user the right + to decide which view of the system each process has to join. Each process can + "see" a different file system structure, networking resources, processor, + devices. Moreover some of the resources can be provided by the user + him/herself, thus these resource can be private to the single process and are + not known a priori by the system. Groups of processes can share the same view + but this is just an optimization to share management methods. + . + For more information, see http://wiki.virtualsquare.org + . + UMView is a user-mode implementation of View-OS. Processes are run with a + controlling daemon that captures all the system calls (at present using the + ptrace() system call) and uses dynamically loadable modules to change their + semantic. + . + This package contains the umnewlwipv6 module, a gateway to the LWIPv6 + user-level networking library (see liblwipv6-2). It makes possible for + processes inside UMView to use virtual network interfaces that are connected + to the external world through a TUN/TAP device or a VDE switch. + +Package: umview-mod-umdevtap +Architecture: i386 amd64 powerpc powerpcspe ppc64 +Depends: libumlib0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: View-OS in user space - Virtual TUN/TAP module + View-OS is a novel approach to the process/kernel interface. The semantics of + each system call can be assigned process by process giving the user the right + to decide which view of the system each process has to join. Each process can + "see" a different file system structure, networking resources, processor, + devices. Moreover some of the resources can be provided by the user + him/herself, thus these resource can be private to the single process and are + not known a priori by the system. Groups of processes can share the same view + but this is just an optimization to share management methods. + . + For more information, see http://wiki.virtualsquare.org + . + UMView is a user-mode implementation of View-OS. Processes are run with a + controlling daemon that captures all the system calls (at present using the + ptrace() system call) and uses dynamically loadable modules to change their + semantic. + . + This package contains a sub-module for umdev. umdev is contained in the main + UMView package and allows virtualization of character and block devices. + umdevtap creates a virtual TUN/TAP interface (i.e. /dev/net/tun). On the + outer side, UMView opens a connection to a VDE switch. + +Package: umview-mod-viewfs +Architecture: i386 amd64 powerpc powerpcspe ppc64 +Depends: libumlib0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: View-OS in user space - Filesystem mangling modules + View-OS is a novel approach to the process/kernel interface. The semantics of + each system call can be assigned process by process giving the user the right + to decide which view of the system each process has to join. Each process can + "see" a different file system structure, networking resources, processor, + devices. Moreover some of the resources can be provided by the user + him/herself, thus these resource can be private to the single process and are + not known a priori by the system. Groups of processes can share the same view + but this is just an optimization to share management methods. + . + For more information, see http://wiki.virtualsquare.org + . + UMView is a user-mode implementation of View-OS. Processes are run with a + controlling daemon that captures all the system calls (at present using the + ptrace() system call) and uses dynamically loadable modules to change their + semantic. + . + This package contains (very experimental) modules that allow filesystem + namespace mangling (as hiding some portions of the filesystem, creating COW + subtrees and so on). --- umview-0.8.2.orig/debian/copyright +++ umview-0.8.2/debian/copyright @@ -0,0 +1,44 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: View-OS +Upstream-Contact: Renzo Davoli +Source: http://sourceforge.net/projects/view-os/ + +Files: * +Copyright: Copyright 2005-2012 Renzo Davoli and others. +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +Files: debian/* +Copyright: Copyright 2007-2012 Ludovico Gardenghi +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. --- umview-0.8.2.orig/debian/libumlib-dev.install +++ umview-0.8.2/debian/libumlib-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/umview/* +debian/tmp/usr/lib/lib*.a +debian/tmp/usr/lib/lib*.so --- umview-0.8.2.orig/debian/libumlib0.install +++ umview-0.8.2/debian/libumlib0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* --- umview-0.8.2.orig/debian/rules +++ umview-0.8.2/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS = --disable-python + +binary-post-install/umview:: + for package in $(CURDIR)/debian/umview-mod-*.install; do \ + cat $$package | while read file destdir; do \ + if [ -z "$$destdir" ]; then \ + stripped_file="$$(echo "$$file" | cut -d/ -f3-)" ; \ + rm -vf $(CURDIR)/debian/umview/$$stripped_file; \ + fi; \ + done; \ + done --- umview-0.8.2.orig/debian/umview-mod-umdevtap.install +++ umview-0.8.2/debian/umview-mod-umdevtap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/umview/modules/umdevtap.so --- umview-0.8.2.orig/debian/umview-mod-umlwip.install +++ umview-0.8.2/debian/umview-mod-umlwip.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/umview/modules/umnetlwipv6.so --- umview-0.8.2.orig/debian/umview-mod-viewfs.install +++ umview-0.8.2/debian/umview-mod-viewfs.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/umview/modules/viewfs.so --- umview-0.8.2.orig/debian/umview.docs +++ umview-0.8.2/debian/umview.docs @@ -0,0 +1,5 @@ +README +doc/amd64_porting.txt +doc/README.viewfs +doc/simple_tutorial +doc/umfuse-howto --- umview-0.8.2.orig/debian/umview.install +++ umview-0.8.2/debian/umview.install @@ -0,0 +1,6 @@ +debian/tmp/usr/bin/* +debian/tmp/usr/lib/umview/* +debian/tmp/usr/lib/umview/modules/* +debian/tmp/usr/share/man/man1/* +debian/tmp/usr/share/man/man2/* +debian/tmp/usr/share/man/man5/* --- umview-0.8.2.orig/debian/watch +++ umview-0.8.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/view-os/umview-(.*)\.tar\.gz --- umview-0.8.2.orig/include/libummod.h +++ umview-0.8.2/include/libummod.h @@ -41,7 +41,7 @@ #define fcntl32 fcntl #endif -int fcntl64(int fd, int cmd, long arg); +extern int fcntl64 (int __fd, int __cmd, ...); int _llseek(unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t *result, unsigned int whence); --- umview-0.8.2.orig/include/umdev.h +++ umview-0.8.2/include/umdev.h @@ -11,6 +11,7 @@ #include #include #include +#include #define IOCTLLENMASK 0x07ffffff #define IOCTL_R 0x10000000 --- umview-0.8.2.orig/um_viewfs/viewfs.c +++ umview-0.8.2/um_viewfs/viewfs.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include --- umview-0.8.2.orig/umfuse/umfuse.c +++ umview-0.8.2/umfuse/umfuse.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -377,7 +378,7 @@ static char *mountflag2options(unsigned long mountflags, void *data) { - char opts[PATH_MAX]; + char opts[PATH_MAX+1]; char *mountopts=data; opts[0]=0; --- umview-0.8.2.orig/xmview/hashtab.c +++ umview-0.8.2/xmview/hashtab.c @@ -454,7 +454,7 @@ const char *addpath; struct ht_elem *rv; if (source) { - char opts[PATH_MAX]; + char opts[PATH_MAX + 1]; opts[0]=0; if (mountflags & MS_REMOUNT) strncat(opts,"remount,",PATH_MAX); --- umview-0.8.2.orig/xmview/um_plusio.c +++ umview-0.8.2/xmview/um_plusio.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include --- umview-0.8.2.orig/xmview/um_select.c +++ umview-0.8.2/xmview/um_select.c @@ -168,13 +168,13 @@ { FD_ZERO(lfds); if (addr != umNULL) - umoven(pc,addr,(__FDELT(max)+1)*sizeof(__fd_mask),lfds); + umoven(pc,addr,(__FD_ELT(max)+1)*sizeof(__fd_mask),lfds); } static void putfdset(long addr, struct pcb* pc, int max, fd_set *lfds) { if (addr != umNULL) - ustoren(pc,addr,(__FDELT(max)+1)*sizeof(__fd_mask),lfds); + ustoren(pc,addr,(__FD_ELT(max)+1)*sizeof(__fd_mask),lfds); } static void selectpoll_signal(struct pcb *pc) @@ -464,8 +464,8 @@ if (sc_number== __NR_epoll_create1) flags = pc->sysargs[0]; #endif - /* Linux: EPOLL_CLOEXEC==O_CLOEXEC && EPOLL_NONBLOCK==O_NONBLOCK */ - flags &= (EPOLL_CLOEXEC | EPOLL_NONBLOCK); + /* Linux: EPOLL_CLOEXEC==O_CLOEXEC */ + flags &= (EPOLL_CLOEXEC); //printk("wrap_in_epoll_create %x\n",flags); pc->retval=lfd_open(NULL,-1,epoll_tag,flags,0); return SC_CALLONXIT;