Control: tags 707402 + pending Control: tags 734997 + pending Dear maintainer,
I've prepared an NMU for umview (versioned as 0.8.2-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Chavela Vargas: La Churrasca
diff -u umview-0.8.2/debian/control umview-0.8.2/debian/control --- umview-0.8.2/debian/control +++ umview-0.8.2/debian/control @@ -4,14 +4,14 @@ Maintainer: Debian VSquare Team <pkg-vsquare-de...@lists.alioth.debian.org> Uploaders: Ludovico Gardenghi <gar...@debian.org>, Guido Trotter <ultrot...@debian.org>, Filippo Giunchedi <fili...@debian.org> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 5), libcap-dev, libvdeplug2-dev, libfuse-dev, liblwipv6-dev, libglib2.0-dev, cdbs, dpkg-dev (>= 1.16.1~) +Build-Depends: debhelper (>= 5), libcap-dev, libvdeplug-dev, libfuse-dev, liblwipv6-dev, libglib2.0-dev, cdbs, dpkg-dev (>= 1.16.1~) Vcs-Svn: svn://svn.debian.org/pkg-vsquare/umview/trunk Vcs-Browser: http://svn.debian.org/wsvn/pkg-vsquare/umview/trunk/ Homepage: http://view-os.sourceforge.net Standards-Version: 3.9.3 Package: umview -Architecture: i386 amd64 powerpc ppc64 +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 @@ -37,7 +37,7 @@ packages because they depend on additional libraries. Package: libumlib0 -Architecture: i386 amd64 powerpc ppc64 +Architecture: i386 amd64 powerpc powerpcspe ppc64 Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: View-OS in user space - Support library for modules @@ -61,7 +61,7 @@ module. Package: libumlib-dev -Architecture: i386 amd64 powerpc ppc64 +Architecture: i386 amd64 powerpc powerpcspe ppc64 Conflicts: libumlib0-dev Replaces: libumlib0-dev Section: libdevel @@ -89,7 +89,7 @@ tree). Package: umview-mod-umlwip -Architecture: i386 amd64 powerpc ppc64 +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 @@ -114,7 +114,7 @@ to the external world through a TUN/TAP device or a VDE switch. Package: umview-mod-umdevtap -Architecture: i386 amd64 powerpc ppc64 +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 @@ -139,7 +139,7 @@ outer side, UMView opens a connection to a VDE switch. Package: umview-mod-viewfs -Architecture: i386 amd64 powerpc ppc64 +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 diff -u umview-0.8.2/debian/changelog umview-0.8.2/debian/changelog --- umview-0.8.2/debian/changelog +++ umview-0.8.2/debian/changelog @@ -1,3 +1,20 @@ +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 <gre...@debian.org> Sun, 12 Oct 2014 16:25:14 +0200 + umview (0.8.2-1) unstable; urgency=low * New upstream release only in patch2: unchanged: --- 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;
signature.asc
Description: Digital Signature