[Pkg-uml-commit] uml-utilities: Changes to 'debian-unstable'
Mattia Dongili
malattia at moszumanska.debian.org
Thu Jul 14 06:35:14 UTC 2016
debian/changelog | 14 +++++---
debian/patches/add_tun_mode_to_tunctl.patch | 48 ++++++++++++++++++++++++++++
debian/patches/series | 1
debian/postinst | 6 +--
debian/postrm | 4 +-
debian/uml-utilities.init | 5 ++
6 files changed, 68 insertions(+), 10 deletions(-)
New commits:
commit a638f97835150025002c97fd10c2fd1ec5614a90
Author: Mattia Dongili <malattia at linux.it>
Date: Wed Jul 13 23:31:09 2016 -0700
Upload to unstable
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index c18ef10..f0f30b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-uml-utilities (20070815.1-1) UNRELEASED; urgency=low
+uml-utilities (20070815.1-1) unstable; urgency=low
* Bump compat level to latest. (Closes: #817708)
* Stop setting permissions on /dev/net/tun. (Closes: #516691, #760425)
commit 4034de94440b0456930b1ca90041ebbec355f6b7
Author: Mattia Dongili <malattia at linux.it>
Date: Wed Jul 13 23:24:06 2016 -0700
Fix path and permission of uml_net in dpkg-statoverride.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index 7db8758..c18ef10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-uml-utilities (20070815.1-1) unstable; urgency=low
+uml-utilities (20070815.1-1) UNRELEASED; urgency=low
* Bump compat level to latest. (Closes: #817708)
* Stop setting permissions on /dev/net/tun. (Closes: #516691, #760425)
@@ -8,6 +8,8 @@ uml-utilities (20070815.1-1) unstable; urgency=low
<petere at debian.org>. (Closes: #646879)
* Added support to open TUN devices in TUN mode instead of just TAP. Thanks
to Nathaniel Wesley Filardo <nwf at cs.jhu.edu>. (Closes: #462922)
+ * Fix path and permission of uml_net in dpkg-statoverride.
+ (Closes: #501046)
-- Mattia Dongili <malattia at debian.org> Wed, 13 Jul 2016 23:03:09 -0700
diff --git a/debian/postinst b/debian/postinst
index 2669829..372d07a 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -32,9 +32,9 @@ case "$1" in
fi
fi
- if ! dpkg-statoverride --list /usr/lib/uml/uml_net >/dev/null; then
- dpkg-statoverride --update --add root uml-net 04750 \
- /usr/lib/uml/uml_net
+ if ! dpkg-statoverride --list /usr/bin/uml_net >/dev/null; then
+ dpkg-statoverride --update --add root uml-net 04754 \
+ /usr/bin/uml_net
fi
;;
diff --git a/debian/postrm b/debian/postrm
index 00d0752..e5656d5 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -20,8 +20,8 @@ set -e
case "$1" in
purge|remove|abort-install)
- if dpkg-statoverride --list /usr/lib/uml/uml_net >/dev/null; then
- dpkg-statoverride --remove /usr/lib/uml/uml_net
+ if dpkg-statoverride --list /usr/bin/uml_net >/dev/null; then
+ dpkg-statoverride --remove /usr/bin/uml_net
fi
;;
commit 539fba1293169c26bb7fd5151668db94d4723aad
Author: Mattia Dongili <malattia at linux.it>
Date: Wed Jul 13 23:21:12 2016 -0700
Added support to open TUN devices in TUN mode instead of just TAP.
Thanks to Nathaniel Wesley Filardo <nwf at cs.jhu.edu>.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index 732ab61..7db8758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-uml-utilities (20070815.1-2) UNRELEASED; urgency=medium
+uml-utilities (20070815.1-1) unstable; urgency=low
* Bump compat level to latest. (Closes: #817708)
* Stop setting permissions on /dev/net/tun. (Closes: #516691, #760425)
@@ -6,8 +6,10 @@ uml-utilities (20070815.1-2) UNRELEASED; urgency=medium
garbage like a .pc directory that confuses dpkg-source.
* Added support for "status" action to init script. Thanks Peter Eisentraut
<petere at debian.org>. (Closes: #646879)
+ * Added support to open TUN devices in TUN mode instead of just TAP. Thanks
+ to Nathaniel Wesley Filardo <nwf at cs.jhu.edu>. (Closes: #462922)
- -- Mattia Dongili <malattia at debian.org> Wed, 13 Jul 2016 22:49:08 -0700
+ -- Mattia Dongili <malattia at debian.org> Wed, 13 Jul 2016 23:03:09 -0700
uml-utilities (20070815-1.4) unstable; urgency=low
diff --git a/debian/patches/add_tun_mode_to_tunctl.patch b/debian/patches/add_tun_mode_to_tunctl.patch
new file mode 100644
index 0000000..bfa4dfd
--- /dev/null
+++ b/debian/patches/add_tun_mode_to_tunctl.patch
@@ -0,0 +1,48 @@
+Author: nwf
+Description: Allow creation of IFF_TUN devices
+
+Index: uml-utilities/tunctl/tunctl.c
+===================================================================
+--- uml-utilities.orig/tunctl/tunctl.c
++++ uml-utilities/tunctl/tunctl.c
+@@ -28,6 +28,7 @@ static void Usage(char *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");
++ fprintf(stderr, "-3 will open the interface in TUN mode, not TAP mode.\n");
+ exit(1);
+ }
+
+@@ -38,10 +39,10 @@ int main(int argc, char **argv)
+ struct group *gr;
+ uid_t owner = -1;
+ gid_t group = -1;
+- int tap_fd, opt, delete = 0, brief = 0;
++ int tap_fd, opt, delete = 0, brief = 0, tun_mode = 0;
+ char *tun = "", *file = "/dev/net/tun", *name = argv[0], *end;
+
+- while((opt = getopt(argc, argv, "bd:f:t:u:g:")) > 0){
++ while((opt = getopt(argc, argv, "3bd:f:t:u:g:")) > 0){
+ switch(opt) {
+ case 'b':
+ brief = 1;
+@@ -83,6 +84,9 @@ int main(int argc, char **argv)
+ case 't':
+ tun = optarg;
+ break;
++ case '3':
++ tun_mode = 1;
++ break;
+ case 'h':
+ default:
+ Usage(name);
+@@ -102,8 +106,7 @@ int main(int argc, char **argv)
+ }
+
+ memset(&ifr, 0, sizeof(ifr));
+-
+- ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
++ ifr.ifr_flags = (tun_mode ? IFF_TUN : 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");
diff --git a/debian/patches/series b/debian/patches/series
index 3766b3d..b657488 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
leave_uml_util.spec.alone.patch
dont_link_against_ncurses.patch
+add_tun_mode_to_tunctl.patch
commit 77429daf8f5475d44d528c59faeea2158fae2e9d
Author: Mattia Dongili <malattia at linux.it>
Date: Wed Jul 13 22:55:56 2016 -0700
Added support for "status" action to init script.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index a9f3b3f..732ab61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-uml-utilities (20070815.1-1) UNRELEASED; urgency=medium
+uml-utilities (20070815.1-2) UNRELEASED; urgency=medium
* Bump compat level to latest. (Closes: #817708)
* Stop setting permissions on /dev/net/tun. (Closes: #516691, #760425)
* Switch to dpkg-source 3.0 (quilt) format, repackaged orig.tgz to remove
garbage like a .pc directory that confuses dpkg-source.
+ * Added support for "status" action to init script. Thanks Peter Eisentraut
+ <petere at debian.org>. (Closes: #646879)
- -- Mattia Dongili <malattia at debian.org> Tue, 12 Jul 2016 07:33:48 -0700
+ -- Mattia Dongili <malattia at debian.org> Wed, 13 Jul 2016 22:49:08 -0700
uml-utilities (20070815-1.4) unstable; urgency=low
diff --git a/debian/uml-utilities.init b/debian/uml-utilities.init
index c1f22cd..2bf12e5 100644
--- a/debian/uml-utilities.init
+++ b/debian/uml-utilities.init
@@ -82,10 +82,13 @@ case "$1" in
$0 stop
$0 start
;;
+ status)
+ status_of_proc "$DAEMON" "$NAME"
+ ;;
*)
N=/etc/init.d/$NAME
# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
exit 1
;;
esac
commit ac342e1195b23e747f5eab14aa2965daad417bfd
Author: Mattia Dongili <malattia at linux.it>
Date: Wed Jul 13 22:47:24 2016 -0700
Close one more /dev/net/tun permission related bug
We now let udev set the right permissions.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index 28fd770..a9f3b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
uml-utilities (20070815.1-1) UNRELEASED; urgency=medium
* Bump compat level to latest. (Closes: #817708)
- * Stop setting permissions on /dev/net/tun. (Closes: #516691)
+ * Stop setting permissions on /dev/net/tun. (Closes: #516691, #760425)
* Switch to dpkg-source 3.0 (quilt) format, repackaged orig.tgz to remove
garbage like a .pc directory that confuses dpkg-source.
More information about the Pkg-uml-commit
mailing list