Check-in [5bd9419845]
Not logged in
Overview
Comment:Made debian package ver 0.8. Removed lintian warining. Converted find_free_port to python3
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 5bd9419845a5f91b9ddcfc31b110cc84f0a3580b
User & Date: vitus on 2019-10-01 19:29:36
Other Links: manifest | tags
Context
2019-10-03
07:19
Fix some unnoticed problems introduced by python3 switch check-in: e54cffda53 user: vitus tags: trunk
2019-10-01
19:29
Made debian package ver 0.8. Removed lintian warining. Converted find_free_port to python3 check-in: 5bd9419845 user: vitus tags: trunk
2019-09-21
17:02
Fix byte/string issues in send_command check-in: df1b3337bc user: vitus tags: trunk
Changes

Modified Makefile from [ae5f6e9122] to [0027921553].

29
30
31
32
33
34
35
36

37
38
39
40
41
42
43
29
30
31
32
33
34
35

36
37
38
39
40
41
42
43







-
+







	
	[ -f $(DESTDIR)$(sysconfdir)/vws.conf ]|| $(INSTALL) -c -m 644 -o root vws.conf $(DESTDIR)$(sysconfdir)
	$(INSTALL) -c -m 644 -o root vws.1 $(DESTDIR)$(mandir)/man1
	$(INSTALL) -c -m 644 -o root find_free_port.1 $(DESTDIR)$(mandir)/man1
	$(INSTALL) -c -m 644 -o root vws.service $(DESTDIR)$(systemddir)
	$(INSTALL) -c -m 644 -o root vws.init $(DESTDIR)$(initddir)/vws

origtarball: vws find_free_port vws.init vws.service.in  Makefile vws.conf vws.mkd find_free_port.mkd .pylintrc
origtarball: vws find_free_port vws.init vws.service.in  Makefile vws.conf vws.mkd find_free_port.mkd .pylintrc README.md
	version=$$(sed -n 's/VERSION = //p' vws); \
	mkdir vws-$$version; cp $+ vws-$$version; \
	tar cjf ../vws_$$version.orig.tar.bz2 vws-$$version; \
	rm -rf vws-$$version

deb: origtarball
	debuild

Deleted debian/README.source version [7d64ff91de].

1
2
3
4
5
6
7
8
9
10










-
-
-
-
-
-
-
-
-
-
vws for Debian
--------------

<this file describes information about the source package, see Debian policy
manual section 4.14. You WILL either need to modify or delete this file>



 -- Victor Wagner <vitus@wagner.pp.ru>  Sat, 14 Jan 2017 19:48:30 +0300

Modified debian/changelog from [45bfd5630c] to [1c63e77d42].







1
2
3
4
5
6
7
1
2
3
4
5
6
7
8
9
10
11
12
13
+
+
+
+
+
+







vws (0.8-1) unstable; urgency=medium

  * Switch to python3

 -- Victor Wagner <vitus@wagner.pp.ru>  Tue, 01 Oct 2019 22:07:09 +0300

vws (0.7-1) unstable; urgency=medium

  * Make spiceuri command more robust

 -- Victor Wagner <v.wagner@postgrespro.ru>  Thu, 06 Jun 2019 18:10:04 +0300

vws (0.6-2) unstable; urgency=medium

Modified debian/control from [fe47a036d9] to [1afb1a8339].

1
2
3
4
5
6


7
8
9
10
11


12
13
14
15
16
17
18
19
20
21
1
2
3
4


5
6
7
8
9
10

11
12
13
14
15
16
17
18
19
20
21
22




-
-
+
+




-
+
+










Source: vws
Section: otherosfs
Priority: optional
Maintainer: Victor Wagner <vitus@wagner.pp.ru>
Build-Depends: debhelper (>= 9), dh-systemd, pandoc
Standards-Version: 3.9.5
Build-Depends: debhelper (>= 9.2), pandoc
Standards-Version: 3.9.8
Homepage: https://www.wagner.pp.ru/fossil/vws

Package: vws
Architecture: all
Depends: ${misc:Depends}, python,  qemu-system, bridge-utils, net-tools
Depends: ${misc:Depends}, python3,  qemu-system, bridge-utils, net-tools
Pre-Depends: adduser
Recommends: dnsmasq, virt-viewer
Description: Simple manger script for QEMU virtual machines
 Virtual Workstations (VWs) is simple and thin script layer that
 simplifies creation and use of KVM virtual machines. 
 .
 Only user-servicable parts inside.
 .
 VMs can be copied around using usial file operation, fine tuned using
 direct editing of QEMU command-line and controlled via QEMU monitor
 without interfering with easy to use wrapper scripts.

Modified debian/copyright from [e98c4c337e] to [27166e3898].

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

27
28
29
30
31
32
33
1
2
3
4
5





















6
7
8
9
10
11
12
13





-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+







Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: vws
Source: https://www.wagner.pp.ru/fossil/vws

Files: *
Copyright: 2015-2017 Victor Wagner <vitus@wagner.pp.ru>

License: GPL-3+
 This package 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 3 of the License, or
 (at your option) any later version.
 .
 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 program. If not, see <http://www.gnu.org/licenses/>
 .
 On Debian systems, the complete text of the GNU General
 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

Files: debian/*
Copyright: 2017 Victor Wagner <vitus@wagner.pp.ru>
Copyright: © 2015-2019 Victor Wagner <vitus@wagner.pp.ru>
License: GPL-3+
 This package 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 3 of the License, or
 (at your option) any later version.
 .
 This package is distributed in the hope that it will be useful,

Modified debian/files from [0ce78ac36e] to [f71c0396cf].

1
2




1
2
-
-
+
+
vws_0.7-1_all.deb otherosfs optional
vws_0.7-1_amd64.buildinfo otherosfs optional
vws_0.8-1_all.deb otherosfs optional
vws_0.8-1_amd64.buildinfo otherosfs optional

Modified debian/postinst from [0d0e831abe] to [6ef4a9be1d].

18
19
20
21
22
23
24
25

26
27
28
29
30
31
32
18
19
20
21
22
23
24

25
26
27
28
29
30
31
32







-
+







# the debian-policy package


case "$1" in
    configure)
	update-rc.d vws defaults
	dpkg-statoverride --list *qemu-bridge-helper|| dpkg-statoverride --update --add root kvm 4750 /usr/lib/qemu/qemu-bridge-helper
	id -u kvm >/dev/null 2>&1 || adduser --system --ingroup kvm --home /home/virtual/vws --no-create-home kvm
	id -u kvm >/dev/null 2>&1 || adduser --system --ingroup kvm --home /var/lib/vws kvm
    ;;

    abort-upgrade|abort-remove|abort-deconfigure)
    ;;

    *)
        echo "postinst called with unknown argument \`$1'" >&2

Modified debian/rules from [d101b6e240] to [51fff019b4].

17
18
19
20
21
22
23
24

25
26
27
28
29
30
31
17
18
19
20
21
22
23

24
25
26
27
28
29
30
31







-
+







#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
prefix=/usr
export prefix

# main packaging script based on dh7 syntax
%:
	dh $@
override_dh_build override_dh_auto_build:
override_dh_auto_build:
	make prefix=/usr
override_dh_install:
	dh_systemd_enable
	dh_installinit
override_dh_auto_install:
	make install prefix=/usr DESTDIR=`pwd`/debian/vws
#	true

Modified find_free_port from [6153a27ecd] to [3dfec6d4ec].

1
2


3
4

5
6

7
8

9
10
11

12
13
14
15
16
17
18
19
20
21

22


1
2
3

4
5

6
7

8
9
10

11
12
13
14
15
16
17
18
19
20

21
22
-
-
+
+

-
+

-
+

-
+


-
+









-
+

#!/usr/bin/python
import sys,socket,errno
#!/usr/bin/python3
import sys, socket, errno
if len(sys.argv)>1:
	port=int(sys.argv[1])
	port = int(sys.argv[1])
else:
	port=5900
	port = 5900
    
s=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
while True:
    try:
        s.bind(("",port))
        s.bind(("", port))
    except socket.error as e:
        if e.errno== errno.EADDRINUSE:
            port+=1
            continue
        else:
            raise e
    break

s.close()
print port
print(port)
    

Modified vws.conf from [c8201742a1] to [65db4dd4bd].

1
2
3


4
5
6

7
8
9
10
11
12
13
1


2
3
4
5

6
7
8
9
10
11
12
13

-
-
+
+


-
+







[directories]
SharedVMs=/home/virtual/vws/shared
AutostartVMs=/home/virtual/vws/autostart
SharedVMs=/var/lib/vws/shared
AutostartVMs=/var/lib/vws/autostart
[tools]
viewer=remote-viewer %s
bridge_list=/sbin/brigectl show
bridge_list=/sbin/brctl show
lsusb=lsusb
arp=/usr/sbin/arp
[permissions]
# User name of user which owns processes of autostart VM
# Should be member of group which is able to access KVM device.
autostart_user = kvm
# Group all shared VM belongs to. Probably should be same group which

Modified vws.init from [6cd3f030a1] to [b725c324eb].

1
2
3
4
5
6
7
8
9
10
11
12
13

14
15
16
17
18
19
20
21
22
23
1
2
3
4
5
6
7
8
9
10
11
12

13
14


15
16
17
18
19
20
21












-
+

-
-







#! /bin/sh
### BEGIN INIT INFO
# Provides:          skeleton
# Required-Start:    $remote_fs $syslog
# Required-Stop:     $remote_fs $syslog
# Default-Start:     2 3 4 5
# Default-Stop:      0 1 6
# Short-Description: Example initscript
# Description:       This file should be used to construct scripts to be
#                    placed in /etc/init.d.
### END INIT INFO

# Author: Foo Bar <foobar@baz.org>
# Author: Victor Wagner <vitus@wagner.pp.ru>
#
# Please remove the "Author" lines above and replace them
# with your own name if you copy and modify this script.

# Do NOT "set -e"

# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Description of the service"
NAME=daemonexecutablename