[Pkg-uml-commit] uml-utilities: Changes to 'debian-unstable'
Mattia Dongili
malattia at alioth.debian.org
Sat May 12 23:32:12 UTC 2012
.pc/.version | 1
.pc/applied-patches | 1
.pc/tunctl-setgroup/tunctl/tunctl.c | 113 ++++
COPYING | 340 ++++++++++++
CVS/Entries | 21
CVS/Repository | 1
CVS/Root | 1
Changelog | 32 +
Makefile | 35 +
debian/changelog | 26
debian/control | 4
debian/patches/00list | 2
debian/patches/02_fix_install_directories.dpatch | 63 --
debian/patches/03_dont_link_against_ncurses.dpatch | 19
debian/uml-utilities.init | 4
gdb/gdbinit | 61 ++
gdbbot/CVS/Entries | 2
gdbbot/CVS/Repository | 1
gdbbot/CVS/Root | 1
gdbbot/gdbbot.pl | 107 +++
honeypot/CVS/CVS/Entries | 1
honeypot/CVS/CVS/Repository | 1
honeypot/CVS/CVS/Root | 1
honeypot/CVS/Entries | 4
honeypot/CVS/Repository | 1
honeypot/CVS/Root | 1
honeypot/honeypot.pl | 42 +
honeypot/hppfs.pm | 131 ++++
honeypot/hppfslib.pm | 64 ++
humfsify/Makefile | 10
humfsify/humfsify | 427 +++++++++++++++
jail/CVS/Entries | 10
jail/CVS/Repository | 1
jail/CVS/Root | 1
jail/Makefile | 17
jail/cell.tar |binary
jail/db_out.pm | 147 +++++
jail/jail_uml.c | 81 ++
jail/jailer.pl | 301 +++++++++++
jail/playlog.pl | 132 ++++
jail/tty_log.pl | 38 +
jail/tty_log.pm | 123 ++++
jail/tty_out.pm | 107 +++
jailtest/CVS/CVS/Entries | 1
jailtest/CVS/CVS/Repository | 1
jailtest/CVS/CVS/Root | 1
jailtest/CVS/Entries | 3
jailtest/CVS/Repository | 1
jailtest/CVS/Root | 1
jailtest/Makefile | 17
jailtest/jailtest.c | 56 ++
lib/Makefile | 13
lib/rights.c | 45 +
mconsole/.cvsignore | 1
mconsole/CVS/Entries | 5
mconsole/CVS/Repository | 1
mconsole/CVS/Root | 1
mconsole/Makefile | 18
mconsole/notify.pl | 42 +
mconsole/uml_mconsole.c | 572 +++++++++++++++++++++
moo/.cvsignore | 1
moo/CVS/Entries | 8
moo/CVS/Repository | 1
moo/CVS/Root | 1
moo/Makefile | 26
moo/cow.c | 440 ++++++++++++++++
moo/cow.h | 42 +
moo/cow_sys.h | 86 +++
moo/uml_mkcow.c | 73 ++
moo/uml_moo.c | 260 +++++++++
patches/series | 1
patches/tunctl-setgroup | 103 +++
port-helper/CVS/CVS/Entries | 1
port-helper/CVS/CVS/Repository | 1
port-helper/CVS/CVS/Root | 1
port-helper/CVS/Entries | 3
port-helper/CVS/Repository | 1
port-helper/CVS/Root | 1
port-helper/Makefile | 18
port-helper/port-helper.c | 75 ++
tunctl/CVS/Entries | 3
tunctl/CVS/Repository | 1
tunctl/CVS/Root | 1
tunctl/Makefile | 17
tunctl/tunctl.c | 156 +++++
uml_net/.cvsignore | 2
uml_net/CVS/Entries | 11
uml_net/CVS/Repository | 1
uml_net/CVS/Root | 1
uml_net/Makefile | 25
uml_net/ethertap.c | 274 ++++++++++
uml_net/host.c | 251 +++++++++
uml_net/host.h | 27
uml_net/output.c | 71 ++
uml_net/output.h | 20
uml_net/slip.c | 153 +++++
uml_net/tuntap.c | 169 ++++++
uml_net/uml_net.c | 139 +++++
uml_switch/.cvsignore | 2
uml_switch/CVS/Entries | 11
uml_switch/CVS/Repository | 1
uml_switch/CVS/Root | 1
uml_switch/Makefile | 24
uml_switch/hash.c | 175 ++++++
uml_switch/hash.h | 15
uml_switch/port.c | 256 +++++++++
uml_switch/port.h | 20
uml_switch/switch.h | 10
uml_switch/tuntap.c | 42 +
uml_switch/tuntap.h | 11
uml_switch/uml_switch.c | 569 ++++++++++++++++++++
uml_util.spec | 46 +
uml_util.spec.in | 46 +
umlfs/Makefile | 19
umlfs/uml_mount.c | 36 +
umlgdb/CVS/CVS/Entries | 1
umlgdb/CVS/CVS/Repository | 1
umlgdb/CVS/CVS/Root | 1
umlgdb/CVS/Entries | 3
umlgdb/CVS/Repository | 1
umlgdb/CVS/Root | 1
umlgdb/Makefile | 8
umlgdb/umlgdb | 346 ++++++++++++
watchdog/CVS/Entries | 3
watchdog/CVS/Repository | 1
watchdog/CVS/Root | 1
watchdog/Makefile | 17
watchdog/uml_watchdog.c | 93 +++
128 files changed, 7413 insertions(+), 68 deletions(-)
New commits:
commit 4e8e8dbd799a8849a628f9e8fbc258b7c7490bbf
Author: Jakub Wilk <jwilk at debian.org>
Date: Wed Nov 2 22:41:04 2011 +0100
uml-utilities: diff for NMU version 20070815-1.3
tags 646162 + pending
thanks
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index a17964a..127bebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+uml-utilities (20070815-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't link mconsole with ncurses (closes: #646162). Thanks to Sven Joachim
+ for the bug report and the patch.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 02 Nov 2011 22:35:36 +0100
+
uml-utilities (20070815-1.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/patches/00list b/debian/patches/00list
index e69de29..34101a7 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+03_dont_link_against_ncurses.dpatch
diff --git a/debian/patches/03_dont_link_against_ncurses.dpatch b/debian/patches/03_dont_link_against_ncurses.dpatch
new file mode 100644
index 0000000..8d833e3
--- /dev/null
+++ b/debian/patches/03_dont_link_against_ncurses.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_dont_link_against_ncurses.dpatch by Sven Joachim <svenjoac at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not unnecessarily link against ncurses
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' uml-utilities-20070815~/mconsole/Makefile uml-utilities-20070815/mconsole/Makefile
+--- uml-utilities-20070815~/mconsole/Makefile 2006-02-27 21:03:01.000000000 +0100
++++ uml-utilities-20070815/mconsole/Makefile 2011-10-30 21:18:52.820631690 +0100
+@@ -1,7 +1,7 @@
+ BIN = uml_mconsole
+ OBJS = $(BIN).o
+ CFLAGS ?= -g -Wall
+-LIBS = ../lib/libuml.a -lreadline -lncurses
++LIBS = ../lib/libuml.a -lreadline
+
+ BIN_DIR ?= /usr/bin
+
commit 05cfb56916696ec1a0f73622f87371c283fcc517
Author: Jakub Wilk <jwilk at debian.org>
Date: Sun Aug 7 15:42:18 2011 +0200
uml-utilities: diff for NMU version 20070815-1.2
tags 514666 + patch
tags 514666 + pending
tags 553868 + patch
tags 553868 + pending
thanks
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index 7dfc2e1..a17964a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+uml-utilities (20070815-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-depend on libreadline-dev instead of libreadline5-dev
+ (closes: #553868). Thanks to Matthias Klose for the bug report.
+ * Remove Stefano Melchior from uploaders (closes: #514666 ). Thanks to
+ Sandro Tosi for the bug report.
+
+ -- Jakub Wilk <jwilk at debian.org> Sun, 07 Aug 2011 14:21:01 +0200
+
uml-utilities (20070815-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 35ad817..e4fdc37 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: uml-utilities
Section: otherosfs
Priority: extra
Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
-Uploaders: Stefano Melchior <stefano.melchior at openlabs.it>, Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libreadline5-dev | libreadline-dev, docbook-to-man, dpatch, libfuse-dev
+Uploaders: Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>
+Build-Depends: debhelper (>> 4.0.0), libreadline-dev, docbook-to-man, dpatch, libfuse-dev
Standards-Version: 3.7.2
Package: uml-utilities
commit ec00505640028e251cea56aab1c94d153db75da1
Author: Peter Eisentraut <petere at debian.org>
Date: Sun May 13 07:58:37 2012 +0900
Incorporate changes for NMU 20070815-1.1
NMU includes:
d5cd4e9cceaa8c7750c4cd16418f2cdcaa2db710
846928a74e39a9ca90cb832eb8f61967a5fbeb09
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index c966470..7dfc2e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+uml-utilities (20070815-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fixed dependency information in LSB header in init.d script
+ (closes: #470775)
+
+ -- Peter Eisentraut <petere at debian.org> Sat, 05 Apr 2008 14:59:53 +0200
+
uml-utilities (20070815-1) unstable; urgency=low
* New upstream version (Closes: #438457) (Closes: #393263)
commit d5cd4e9cceaa8c7750c4cd16418f2cdcaa2db710
Author: Mattia Dongili <malattia at linux.it>
Date: Sun May 13 08:21:00 2012 +0900
Always install in /lib
This removal seem to have been missed in 20070815-1.1 changelog and I
don't seem to be able to find an announcement email to the maintainers.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/patches/00list b/debian/patches/00list
index effb110..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +0,0 @@
-02_fix_install_directories.dpatch
diff --git a/debian/patches/02_fix_install_directories.dpatch b/debian/patches/02_fix_install_directories.dpatch
deleted file mode 100644
index 9dda068..0000000
--- a/debian/patches/02_fix_install_directories.dpatch
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_install_directories - Mattia Dongili <malattia at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Debian's multiarch directories
-
- at DPATCH@
-
-# Author: malattia
-# Status: none
-
---- ./Makefile~clean 2006-04-12 22:27:54.083257719 +0200
-+++ ./Makefile 2006-04-12 22:28:04.119884969 +0200
-@@ -6,11 +6,7 @@ UMLVER = $(shell date +%Y%m%d)
- TARBALL = uml_utilities_$(UMLVER).tar.bz2
- BIN_DIR = /usr/bin
-
--ifeq ($(shell uname -m),x86_64)
--LIB_DIR = /usr/lib64/uml
--else
- LIB_DIR = /usr/lib/uml
--endif
-
- CFLAGS = -g -Wall
- #CFLAGS = -g -O2 -Wall
---- ./uml_net/Makefile~clean 2006-04-13 20:36:20.910393394 +0200
-+++ ./uml_net/Makefile 2006-04-13 20:36:42.763759144 +0200
-@@ -4,8 +4,6 @@ BIN = uml_net
- CFLAGS ?= -g -Wall
- override CFLAGS += $(TUNTAP)
-
--BIN_DIR ?= /usr/bin
--
- OBJS = ethertap.o host.o output.o slip.o uml_net.o
-
- ifneq ($(TUNTAP),)
-@@ -21,5 +19,5 @@ clean :
- rm -f $(BIN) $(OBJS) *~
-
- install : $(BIN)
-- install -d $(DESTDIR)$(BIN_DIR)
-- install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
-+ install -d $(DESTDIR)$(LIB_DIR)
-+ install -s -m 04755 $(BIN) $(DESTDIR)$(LIB_DIR)
---- ./tunctl/Makefile~clean 2006-04-13 20:48:45.300914894 +0200
-+++ ./tunctl/Makefile 2006-04-13 20:49:08.218347144 +0200
-@@ -2,7 +2,7 @@ OBJS = tunctl.o
- BIN = tunctl
- CFLAGS ?= -g -Wall
-
--BIN_DIR ?= /usr/bin
-+SBIN_DIR ?= /usr/sbin
-
- all : $(BIN)
-
-@@ -13,5 +13,5 @@ clean :
- rm -f $(BIN) $(OBJS) *~
-
- install : $(BIN)
-- install -d $(DESTDIR)$(BIN_DIR)
-- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
-+ install -d $(DESTDIR)$(SBIN_DIR)
-+ install -s $(BIN) $(DESTDIR)$(SBIN_DIR)
commit 8ecc46a4e659c058d51018814fe46b7237411395
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Thu Mar 13 16:58:58 2008 +0100
uml-utilities: Problem with LSB header in init.d script
Package: uml-utilities
Version: 20070815-1
Severity: important
Tags: patch
User: initscripts-ng-devel at lists.alioth.debian.org
Usertags: incorrect-dependency
I just checked the shutdown order in unstable on a machine with
dependency based boot sequencing enabled, and discovered a problem
with the init.d scripts provided in the uml-utilities package. The
init.d script stop to late and start to early. The reason is missing
dependencies. It need to depend on $remote_fs to make sure /usr/ is
mounted if it is on NFS.
Here is a patch to solve these issues.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/uml-utilities.init b/debian/uml-utilities.init
index 1e56fa3..c1f22cd 100644
--- a/debian/uml-utilities.init
+++ b/debian/uml-utilities.init
@@ -7,8 +7,8 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Provides: uml-utilities
-# Required-Start:
-# Required-Stop:
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
### END INIT INFO
# Start LSB function logging
commit 1952b3d00612f662f9e05159a73f24b2fc81d0f7
Author: Mattia Dongili <malattia at linux.it>
Date: Sat May 12 19:57:27 2012 +0900
Import upstream sources v20070815
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..12891c0
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1 @@
+tunctl-setgroup
diff --git a/.pc/tunctl-setgroup/.timestamp b/.pc/tunctl-setgroup/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/.pc/tunctl-setgroup/tunctl/tunctl.c b/.pc/tunctl-setgroup/tunctl/tunctl.c
new file mode 100644
index 0000000..6e43906
--- /dev/null
+++ b/.pc/tunctl-setgroup/tunctl/tunctl.c
@@ -0,0 +1,113 @@
+/* Copyright 2002 Jeff Dike
+ * Licensed under the GPL
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <linux/if_tun.h>
+
+static void Usage(char *name)
+{
+ fprintf(stderr, "Create: %s [-b] [-u owner] [-t device-name] "
+ "[-f tun-clone-device]\n", name);
+ fprintf(stderr, "Delete: %s -d device-name [-f tun-clone-device]\n\n",
+ name);
+ fprintf(stderr, "The default tun clone device is /dev/net/tun - some systems"
+ " use\n/dev/misc/net/tun instead\n\n");
+ fprintf(stderr, "-b will result in brief output (just the device name)\n");
+ exit(1);
+}
+
+int main(int argc, char **argv)
+{
+ struct ifreq ifr;
+ struct passwd *pw;
+ long owner = geteuid();
+ int tap_fd, opt, delete = 0, brief = 0;
+ char *tun = "", *file = "/dev/net/tun", *name = argv[0], *end;
+
+ while((opt = getopt(argc, argv, "bd:f:t:u:")) > 0){
+ switch(opt) {
+ case 'b':
+ brief = 1;
+ break;
+ case 'd':
+ delete = 1;
+ tun = optarg;
+ break;
+ case 'f':
+ file = optarg;
+ break;
+ case 'u':
+ pw = getpwnam(optarg);
+ if(pw != NULL){
+ owner = pw->pw_uid;
+ break;
+ }
+ owner = strtol(optarg, &end, 0);
+ if(*end != '\0'){
+ fprintf(stderr, "'%s' is neither a username nor a numeric uid.\n",
+ optarg);
+ Usage(name);
+ }
+ break;
+ case 't':
+ tun = optarg;
+ break;
+ case 'h':
+ default:
+ Usage(name);
+ }
+ }
+
+ argv += optind;
+ argc -= optind;
+
+ if(argc > 0)
+ Usage(name);
+
+ if((tap_fd = open(file, O_RDWR)) < 0){
+ fprintf(stderr, "Failed to open '%s' : ", file);
+ perror("");
+ exit(1);
+ }
+
+ memset(&ifr, 0, sizeof(ifr));
+
+ ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+ strncpy(ifr.ifr_name, tun, sizeof(ifr.ifr_name) - 1);
+ if(ioctl(tap_fd, TUNSETIFF, (void *) &ifr) < 0){
+ perror("TUNSETIFF");
+ exit(1);
+ }
+
+ if(delete){
+ if(ioctl(tap_fd, TUNSETPERSIST, 0) < 0){
+ perror("TUNSETPERSIST");
+ exit(1);
+ }
+ printf("Set '%s' nonpersistent\n", ifr.ifr_name);
+ }
+ else {
+ if(ioctl(tap_fd, TUNSETPERSIST, 1) < 0){
+ perror("TUNSETPERSIST");
+ exit(1);
+ }
+ if(ioctl(tap_fd, TUNSETOWNER, owner) < 0){
+ perror("TUNSETPERSIST");
+ exit(1);
+ }
+ if(brief)
+ printf("%s\n", ifr.ifr_name);
+ else printf("Set '%s' persistent and owned by uid %ld\n", ifr.ifr_name,
+ owner);
+ }
+ return(0);
+}
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..60549be
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/CVS/Entries b/CVS/Entries
new file mode 100644
index 0000000..cc654d0
--- /dev/null
+++ b/CVS/Entries
@@ -0,0 +1,21 @@
+/COPYING/1.1/Tue Oct 9 02:22:36 2001//
+D/gdbbot////
+D/mconsole////
+D/moo////
+D/net////
+D/redhat////
+D/rpm////
+D/test////
+D/transformiix////
+D/uml_net////
+D/uml_router////
+D/umn////
+D/port-helper////
+D/jailtest////
+D/tunctl////
+D/umlgdb////
+D/watchdog////
+D/jail////
+D/honeypot////
+/Makefile/1.13/Sat Feb 8 04:01:52 2003//
+/uml_util.spec.in/1.4/Wed Jan 14 09:56:31 2004//
diff --git a/CVS/Repository b/CVS/Repository
new file mode 100644
index 0000000..ef1aab0
--- /dev/null
+++ b/CVS/Repository
@@ -0,0 +1 @@
+tools
diff --git a/CVS/Root b/CVS/Root
new file mode 100644
index 0000000..4f921bb
--- /dev/null
+++ b/CVS/Root
@@ -0,0 +1 @@
+jdike at cvs.user-mode-linux.sourceforge.net:/cvsroot/user-mode-linux
diff --git a/Changelog b/Changelog
new file mode 100644
index 0000000..dbcef91
--- /dev/null
+++ b/Changelog
@@ -0,0 +1,32 @@
+BB -
+ shebangs added where needed
+ fixed the command line handling in honeypot.pl
+ the jail Makefile installs things now
+ jail_uml handles user names as well as uids and sets its group
+ CFLAGS is now settable at the top level
+ cleanups in uml_mconsole
+ 64-bit fixes, fixing of broken 64-bit COW files, and other
+cleanups in uml_moo
+ bug fix in uml_net's handling of a SLIP interface going down
+ moved the uml_router directory to uml_switch
+ cleanups in uml_switch
+ added a spec file
+
+Me -
+ BB's tarball contained a tools-$DATE with a tools subdirectory - the
+ subdirectory had newer stuff, so I started with that.
+
+ Cleaned up the honeypot.pl changes
+
+ Spurious tab in jail/Makefile
+
+ Ignored BB's redeclaration of jailtest main - I prefer correct
+declarations even when the arguments aren't used.
+
+ Removed uml_util.spec, which is generated
+
+ Added a lib directory which contains send_fd()
+
+ Added umlfs and umlfs support to uml_mconsole
+
+From dgraves - mconsole int
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..fd00f6a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,35 @@
+TUNCTL = $(shell [ -e /usr/include/linux/if_tun.h ] && echo tunctl)
+
+SUBDIRS = lib jail jailtest humfsify mconsole moo port-helper $(TUNCTL) \
+ uml_net uml_switch watchdog umlfs
+UMLVER = $(shell date +%Y%m%d)
+TARBALL = uml_utilities_$(UMLVER).tar.bz2
+BIN_DIR = /usr/bin
+
+ifeq ($(shell uname -m),x86_64)
+LIB_DIR = /usr/lib64/uml
+else
+LIB_DIR = /usr/lib/uml
+endif
+
+CFLAGS = -g -Wall
+#CFLAGS = -g -O2 -Wall
+
+export BIN_DIR LIB_DIR CFLAGS
+
+all install:
+ set -e ; for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@; done
+
+tarball : clean spec
+ cd .. ; \
+ mv tools tools-$(UMLVER); \
+ tar cjf $(TARBALL) tools-$(UMLVER); \
+ mv tools-$(UMLVER) tools
+
+clean:
+ rm -rf *~
+ rm -f uml_util.spec
More information about the Pkg-uml-commit
mailing list