[Pkg-uml-commit] uml-utilities: Changes to 'debian-unstable'
Mattia Dongili
malattia at moszumanska.debian.org
Wed Jul 13 15:28:55 UTC 2016
.pc/.version | 1
.pc/applied-patches | 1
.pc/tunctl-setgroup/tunctl/tunctl.c | 113 ---------------------
debian/changelog | 9 +
debian/compat | 2
debian/control | 6 -
debian/patches/00list | 1
debian/patches/03_dont_link_against_ncurses.dpatch | 19 ---
debian/patches/dont_link_against_ncurses.patch | 14 ++
debian/patches/leave_uml_util.spec.alone.patch | 24 ++++
debian/patches/series | 2
debian/postinst | 4
debian/rules | 24 +---
debian/source/format | 1
debian/uml-utilities.if-pre-up.d | 6 -
15 files changed, 63 insertions(+), 164 deletions(-)
New commits:
commit 19774e5a01c75cbc553771f8f50e9403508d88fd
Author: Mattia Dongili <malattia at linux.it>
Date: Wed Jul 13 08:25:38 2016 -0700
Misc lintian fixes
I: uml-utilities: package-contains-empty-directory usr/lib/uml/
W: uml-utilities source: dh-clean-k-is-deprecated
W: uml-utilities source: debhelper-but-no-misc-depends uml-utilities
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/control b/debian/control
index c69b067..46f3f92 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
Package: uml-utilities
Architecture: linux-any
-Depends: adduser, ${shlibs:Depends}, lsb-base (>= 3.0-10)
+Depends: adduser, ${shlibs:Depends}, lsb-base (>= 3.0-10), ${misc:Depends}
Suggests: user-mode-linux
Description: User-mode Linux (utility programs)
User-mode Linux is a port of the Linux kernel to its own system call
diff --git a/debian/rules b/debian/rules
index db41d89..6d30bb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ build: configure-stamp build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
build-stamp:
+ dh_prep
dh_testdir
ifeq "$(DEB_BUILD_ARCH)" "arm"
@@ -45,12 +46,10 @@ clean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs usr/sbin usr/lib/uml \
- etc/network/if-up.d etc/network/if-pre-up.d
$(MAKE) install DESTDIR=$(tmp)
+ dh_installdirs etc/network/if-up.d etc/network/if-pre-up.d
install -m 755 debian/uml-utilities.if-up.d $(tmp)/etc/network/if-up.d/uml-utilities
install -m 755 debian/uml-utilities.if-pre-up.d $(tmp)/etc/network/if-pre-up.d/uml-utilities
commit 010df5b20f2be0fb7e357f9086dea0a873dca809
Author: Mattia Dongili <malattia at linux.it>
Date: Wed Jul 13 07:53:54 2016 -0700
Switch to dpkg-source 3.0 (quilt) format
As a side effect, orig.tar.gz had to be repackaged to remove garbage
like a .pc directory that confuses dpkg-source in the new format.
While at that, Sourceforge is down and I can't check whether the
upstream tarball was broken or our version of it had the extra garbage.
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index 07f7ed7..28fd770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-uml-utilities (20070815-3) UNRELEASED; urgency=medium
+uml-utilities (20070815.1-1) UNRELEASED; urgency=medium
* Bump compat level to latest. (Closes: #817708)
* Stop setting permissions on /dev/net/tun. (Closes: #516691)
+ * Switch to dpkg-source 3.0 (quilt) format, repackaged orig.tgz to remove
+ garbage like a .pc directory that confuses dpkg-source.
-- Mattia Dongili <malattia at debian.org> Tue, 12 Jul 2016 07:33:48 -0700
diff --git a/debian/control b/debian/control
index 4139457..c69b067 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: otherosfs
Priority: extra
Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
Uploaders: Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>
-Build-Depends: debhelper (>> 9.0.0), libreadline-dev, docbook-to-man, dpatch, libfuse-dev
+Build-Depends: debhelper (>> 9.0.0), libreadline-dev, docbook-to-man, libfuse-dev
Standards-Version: 3.9.8
Package: uml-utilities
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 34101a7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 8d833e3..0000000
--- a/debian/patches/03_dont_link_against_ncurses.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /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
-
diff --git a/debian/patches/dont_link_against_ncurses.patch b/debian/patches/dont_link_against_ncurses.patch
new file mode 100644
index 0000000..f4ee027
--- /dev/null
+++ b/debian/patches/dont_link_against_ncurses.patch
@@ -0,0 +1,14 @@
+Author: Sven Joachim <svenjoac at gmx.de>
+Description: Do not unnecessarily link against ncurses
+
+--- uml-utilities-20070815.orig/mconsole/Makefile
++++ uml-utilities-20070815/mconsole/Makefile
+@@ -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
+
diff --git a/debian/patches/leave_uml_util.spec.alone.patch b/debian/patches/leave_uml_util.spec.alone.patch
new file mode 100644
index 0000000..d90e397
--- /dev/null
+++ b/debian/patches/leave_uml_util.spec.alone.patch
@@ -0,0 +1,24 @@
+Author: Mattia Dongili <malattia at debian.org>
+Description: upstream make file removes the spec file on cleaning and that causes grief.
+
+Index: uml-utilities/Makefile
+===================================================================
+--- uml-utilities.orig/Makefile
++++ uml-utilities/Makefile
+@@ -20,7 +20,7 @@ export BIN_DIR LIB_DIR CFLAGS
+ all install:
+ set -e ; for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@; done
+
+-tarball : clean spec
++tarball : clean
+ cd .. ; \
+ mv tools tools-$(UMLVER); \
+ tar cjf $(TARBALL) tools-$(UMLVER); \
+@@ -28,7 +28,6 @@ tarball : clean spec
+
+ clean:
+ rm -rf *~
+- rm -f uml_util.spec
+ set -e ; for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@; done
+
+ spec:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3766b3d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+leave_uml_util.spec.alone.patch
+dont_link_against_ncurses.patch
diff --git a/debian/rules b/debian/rules
index cfb142e..db41d89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,18 +10,8 @@ export DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
tmp:=$(CURDIR)/debian/uml-utilities
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- touch $@
-
-unpatch:
- dpatch deapply-all
- rm -rf debian/patched
- rm -f patch-stamp
-
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
touch configure-stamp
@@ -42,8 +32,7 @@ endif
touch build-stamp
-clean: clean-unpatched
-clean-unpatched: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
commit bb52e6ddca1ea596b56a6b5f0b08c1c187c9d1c0
Author: Mattia Dongili <malattia at linux.it>
Date: Tue Jul 12 08:17:46 2016 -0700
Remove quilt files that should not be version controlled
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index 12891c0..0000000
--- a/.pc/applied-patches
+++ /dev/null
@@ -1 +0,0 @@
-tunctl-setgroup
diff --git a/.pc/tunctl-setgroup/.timestamp b/.pc/tunctl-setgroup/.timestamp
deleted file mode 100644
index e69de29..0000000
diff --git a/.pc/tunctl-setgroup/tunctl/tunctl.c b/.pc/tunctl-setgroup/tunctl/tunctl.c
deleted file mode 100644
index 6e43906..0000000
--- a/.pc/tunctl-setgroup/tunctl/tunctl.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 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);
-}
commit 72d67ed840a64ea88601d49c84a8de745437b6be
Author: Mattia Dongili <malattia at linux.it>
Date: Tue Jul 12 07:59:16 2016 -0700
Add recommended debian/rules targets
Lintian says:
W: uml-utilities source: debian-rules-missing-recommended-target build-indep
W: uml-utilities source: debian-rules-missing-recommended-target build-arch
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/rules b/debian/rules
index 11ab847..cfb142e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,9 @@ configure-stamp: patch-stamp
dh_testdir
touch configure-stamp
-build: configure-stamp build-stamp
+build: configure-stamp build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp:
dh_testdir
commit 3bb18f8450683c99bfb684ac75beb66c571da840
Author: Mattia Dongili <malattia at linux.it>
Date: Tue Jul 12 07:37:09 2016 -0700
Set /nonexistent home directory for uml-net
Lintian says:
E: uml-utilities: maintainer-script-should-not-use-adduser-system-without-home
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/postinst b/debian/postinst
index 91d221a..2669829 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -26,9 +26,9 @@ case "$1" in
if ! getent passwd uml-net >/dev/null; then
if getent group uml-net >/dev/null; then
# earlier versions only created a group
- adduser --quiet --system --ingroup uml-net --no-create-home uml-net
+ adduser --quiet --system --ingroup uml-net --no-create-home --home /nonexistent uml-net
else
- adduser --quiet --system --group --no-create-home uml-net
+ adduser --quiet --system --group --no-create-home --home /nonexistent uml-net
fi
fi
commit b85d498db809a9a26fe848e021b5fbafa74d6692
Author: Mattia Dongili <malattia at linux.it>
Date: Tue Jul 12 07:35:00 2016 -0700
Stop setting permissions on /dev/net/tun. (Closes: #516691)
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index a820f2c..07f7ed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-uml-utilities (20070815-2) UNRELEASED; urgency=medium
+uml-utilities (20070815-3) UNRELEASED; urgency=medium
* Bump compat level to latest. (Closes: #817708)
+ * Stop setting permissions on /dev/net/tun. (Closes: #516691)
- -- Mattia Dongili <malattia at debian.org> Tue, 12 Jul 2016 07:24:36 -0700
+ -- Mattia Dongili <malattia at debian.org> Tue, 12 Jul 2016 07:33:48 -0700
uml-utilities (20070815-1.4) unstable; urgency=low
diff --git a/debian/uml-utilities.if-pre-up.d b/debian/uml-utilities.if-pre-up.d
index 6b7276a..643dc23 100644
--- a/debian/uml-utilities.if-pre-up.d
+++ b/debian/uml-utilities.if-pre-up.d
@@ -4,9 +4,3 @@ test -x /usr/sbin/tunctl || exit 0
test -n "${IF_TUNCTL_USER}" || exit 0
/usr/sbin/tunctl -u "${IF_TUNCTL_USER}" -t "${IFACE}"
-
-#
-# why the hell does this need to be done?
-#
-chown root:uml-net /dev/net/tun
-chmod 660 /dev/net/tun
commit e9f00ccbe41f1cab50b0d06c0e0b4df8048ed25b
Author: Mattia Dongili <malattia at linux.it>
Date: Tue Jul 12 07:25:42 2016 -0700
Bump compat level and standards version to latest. (Closes: #817708)
Signed-off-by: Mattia Dongili <malattia at linux.it>
diff --git a/debian/changelog b/debian/changelog
index 5ecf0a6..a820f2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+uml-utilities (20070815-2) UNRELEASED; urgency=medium
+
+ * Bump compat level to latest. (Closes: #817708)
+
+ -- Mattia Dongili <malattia at debian.org> Tue, 12 Jul 2016 07:24:36 -0700
+
uml-utilities (20070815-1.4) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 84d8ef6..4139457 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: otherosfs
Priority: extra
Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
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
+Build-Depends: debhelper (>> 9.0.0), libreadline-dev, docbook-to-man, dpatch, libfuse-dev
+Standards-Version: 3.9.8
Package: uml-utilities
Architecture: linux-any
More information about the Pkg-uml-commit
mailing list