Tidied up copyright, removed superflous files

2e2b068e · Paul Cammish · c0b56546 · c0b56546 · 2e2b068e · 2e2b068e
Commit 2e2b068e authored Jun 04, 2019 by Paul Cammish
--- a/common/acme-client.zip
+++ b/common/acme-client.zip
--- a/common/debian/copyright
+++ b/common/debian/copyright
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sympl
-Source: https://github.mythic-beasts.com/sympl/sympl-debian
+Source: https://github.mythic-beasts.com/sympl/sympl_stretch


 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public
@@ -27,3 +28,89 @@ License: GPL-2+
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.

+
+Files: /usr/lib/ruby/vendor_ruby/acme.rb /usr/lib/ruby/vendor_ruby/acme/*:
+Comment: Original source: https://github.com/unixcharles/acme-client/tree/v0.6.1
+Copyright: 2015, Charles Barbier
+License: The MIT License (MIT)
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+
+Files: /usr/lib/ruby/vendor_ruby/linux/*:
+Comment: Original source: https://github.com/BytemarkHosting/netlinkrb
+Copyright: 2011, Bytemark Hosting, Written by Brian Candler <B.Candler@pobox.com>
+License: Ruby
+ This software is distributed under the same terms as Ruby itself.
+ .
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see above), or the conditions below:
+ .
+   1. You may make and give away verbatim copies of the source form of the
+      software without restriction, provided that you duplicate all of the
+      original copyright notices and associated disclaimers.
+ .
+   2. You may modify your copy of the software in any way, provided that
+      you do at least ONE of the following:
+ .
+        a) place your modifications in the Public Domain or otherwise
+           make them Freely Available, such as by posting said
+           modifications to Usenet or an equivalent medium, or by allowing
+           the author to include your modifications in the software.
+ .
+        b) use the modified software only within your corporation or
+           organization.
+ .
+        c) rename any non-standard executables so the names do not conflict
+           with standard executables, which must also be provided.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or executable
+      form, provided that you do at least ONE of the following:
+ .
+        a) distribute the executables and library files of the software,
+           together with instructions (in the manual page or equivalent)
+           on where to get the original distribution.
+ .
+        b) accompany the distribution with the machine-readable source of
+           the software.
+ .
+        c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   4. You may modify and include the part of the software into any other
+      software (possibly commercial).  But some files in the distribution
+      are not written by the author, so that they are not under this terms.
+      They are gc.c(partly), utils.c(partly), regex.[ch], fnmatch.[ch],
+      glob.c, st.[ch] and some files under the ./missing directory.  See
+      each file for the copying condition.
+ .
+   5. The scripts and library files supplied as input to or produced as
+      output from the software do not automatically fall under the
+      copyright of the software, but belong to whomever generated them,
+      and may be sold commercially, and may be aggregated with this
+      software.
+ .
+   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+      PURPOSE.
+
--- a/common/lib/linux/netlink/README
+++ b/common/lib/linux/netlink/README
+Ruby Netlink
+============
+
+This library provides an API for using a Linux Netlink socket, for doing
+things like manipulating IP interfaces and routes programmatically, and
+capturing packets from ULOG.
+
+Example
+=======
+
+    require 'linux/netlink/route'
+    ip = Linux::Netlink::Route::Socket.new
+
+    # Info about eth0 interface
+    p ip.link["eth0"]
+
+    # Addresses on eth0 interface
+    ip.addr.list(:index=>"eth0") do |addr|
+      puts addr.address
+    end
+
+See the examples/ and test/ directories for more examples.
+
+Requirements
+============
+
+ruby 1.9 (tested with ruby 1.9.2), OR ruby 1.8.7 with the ffi library.
+
+Code organisation
+=================
+
+There are separate classes for each Netlink protocol providing a high-level
+API. These all in turn use the NLSocket class, which has methods for adding
+the headers to messages and sending them over a socket. The messages
+themselves are built using class Message or RtattrMessage, which in turn are
+subclasses of CStruct, which performs the low-level packing and unpacking of
+the message bodies.
+
+      LinkHandler/
+      AddrHandler/
+      VlanHandler/
+      RouteHandler
+           |
+           v
+         Route  Firewall  NFLog  ...etc
+           |       |       |
+           +-------+-------+
+                   |
+                   v
+                NLSocket
+                   |
+                   v
+        Message / RtattrMessage
+                   |
+                   v
+                CStruct
+
+Useful reference material
+=========================
+
+* http://www.linuxjournal.com/article/7356
+* http://people.redhat.com/nhorman/papers/netlink.pdf
+* apt-get source iproute
+
+Note there are some errors in the nhorman paper. On page 8/9, it says
+
+    nlmsg_pid ... Also note that it is
+    imperative that any program receiving netlink socket messages from
+    the kernel verify that this ﬁeld is set to zero, or it is possible to expose
+    the software to unexpected inﬂuences from other non-privlidged user
+    space programs.
+
+However, what really needs to be checked is the pid in the sockaddr_nl
+structure returned by recvmsg msghdr, as shown by this code in
+lib/libnetlink.c:
+
+        struct msghdr msg = {
+                .msg_name = &nladdr,
+                .msg_namelen = sizeof(nladdr),
+                .msg_iov = &iov,
+                .msg_iovlen = 1,
+        };
+...
+                status = recvmsg(rth->fd, &msg, 0);
+...
+                                if (nladdr.nl_pid != 0 ||
+                                    h->nlmsg_pid != rth->local.nl_pid ||
+                                    h->nlmsg_seq != rth->dump) {
+
+TODO
+====
+
+* Exception hierarchy
+* More tests
+* More netlink protocols
+
+Copyright
+=========
+(C) 2011 Bytemark Hosting
+Written by Brian Candler <B.Candler@pobox.com>
+
+Distribute under the same terms as Ruby
+http://www.ruby-lang.org/en/LICENSE.txt
--- a/common/netlinkrb.zip
+++ b/common/netlinkrb.zip
--- a/core/debian/copyright
+++ b/core/debian/copyright
@@ -2,16 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sympl
 Source: https://github.mythic-beasts.com/sympl/sympl_stretch

-Files: *
-Copyright: 2019, The Sympl Project
-License: GPL-2+

-Files: debian/sympl-core.init update-motd.d/00-sympl-banner
+Files: *
 Copyright: 2019, The Sympl Project
           2008-2017, Bytemark Ltd
-License: GPL-2+
-
-
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/cron/debian/copyright
+++ b/cron/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sympl
 Source: https://github.mythic-beasts.com/sympl/sympl_stretch

+
 Files: *
 Copyright: 2019, The Sympl Project
           2008-2017, Bytemark Ltd
@@ -27,6 +28,7 @@ License: GPL-2+
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.

+
 Files: lib/ruby/1.8/symbiosis/crontab.rb:
 Comment: Original source http://www.notwork.org/~gotoken/ruby/p/crontab/crontab/crontab.rb
 Copyright: Copyright (c) 2000-1 Kentaro Goto

--- a/dns/debian/copyright
+++ b/dns/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/email/debian/copyright
+++ b/email/debian/copyright
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sympl
-Source: https://github.mythic-beasts.com/sympl/sympl_debian
+Source: https://github.mythic-beasts.com/sympl/sympl_stretch


 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/ftp/debian/copyright
+++ b/ftp/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/httpd/debian/copyright
+++ b/httpd/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/monit/debian/copyright
+++ b/monit/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public
@@ -27,3 +28,25 @@ License: GPL-2+
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.

+
+Files: /usr/lib/ruby/vendor_ruby/dbus/*:
+Comment: Original source: https://github.com/nathwill/ruby-dbus-systemd
+Copyright: Copyright (c) 2016 Nathan Williams
+License: The MIT License (MIT)
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
--- a/monit/example-output
+++ b/monit/example-output
-= Bytemark Virtual Hosting service test report ========================
-Host:  example.vm.bytemark.co.uk
-Start: Wed, 03 Sep 2008 16:03:30 +0100
-Tests to be carried out:
-
- * apache2
- * clamav-daemon
- * clamav-freshclam
- * cron
- * dovecot
- * exim4
- * ftpd
- * mysqld
- * spamassassin
- * sshd
-
-- apache2 -------------------------------------------------------------
- * Checking process
- * Process apache2 found with PID 10583
- * Process state OK -- apache2 should be running
- * Testing connection to localhost:http
-   > OPTIONS / HTTP/1.0\r\n
-   > Host: localhost\r\n
-   > \r\n
-   < HTTP/1.1 200 OK\r\n
-   < Date: Wed, 03 Sep 2008 15:03:30 GMT\r\n
-   < Server: Apache/2.2.3 (Debian) Phusion_Passenger/2.0.2 mod_ssl/2.2.3 OpenSSL/0.9.8c\r\n
-   < Allow: GET,HEAD,POST,OPTIONS,TRACE\r\n
-   < Content-Length: 0\r\n
-   < Connection: close\r\n
-   < Content-Type: text/plain; charset=UTF-8\r\n
-   < \r\n
- * Connection tested OK
-
-- clamav-daemon -------------------------------------------------------
- * Checking process
- * clamd doesn't appear to be running: No such file or directory - /var/run/clamav/clamd.pid
- * Process state OK -- clamd should not be running
-
-- clamav-freshclam ----------------------------------------------------
- * Checking process
- * freshclam doesn't appear to be running: No such file or directory - /var/run/clamav/freshclam.pid
- * Process state OK -- freshclam should not be running
-
-- cron ----------------------------------------------------------------
- * Checking process
- * Process cron found with PID 2795
- * Process state OK -- cron should be running
-
-- dovecot -------------------------------------------------------------
- * Checking process
- * Process dovecot found with PID 7756
- * Process state OK -- dovecot should be running
- * Testing connection to localhost:pop3
-   < +OK Dovecot ready.\r\n
-   > AUTH\r\n
-   < +OK\r\n
-   < PLAIN\r\n
-   < LOGIN\r\n
-   < .\r\n
-   > QUIT\r\n
-   < +OK Logging out\r\n
- * Connection tested OK
- * Testing connection to localhost:imap
-   < * OK Dovecot ready.\r\n
-   > * CAPABILITY\r\n
-   < * CAPABILITY IMAP4rev1 SASL-IR SORT THREAD=REFERENCES MULTIAPPEND UNSELECT LITERAL+ IDLE CHILDREN NAMESPACE LOGIN-REFERRALS STARTTLS AUTH=PLAIN AUTH=LOGIN\r\n
-   < * OK Capability completed.\r\n
-   > * LOGOUT\r\n
-   < * BYE Logging out\r\n
-   < * OK Logout completed.\r\n
- * Connection tested OK
-
-- exim4 ---------------------------------------------------------------
- * Checking process
- * Process exim4 found with PID 10666
- * Process state OK -- exim4 should be running
- * Testing connection to localhost:smtp
-   < 220 example.vm.bytemark.co.uk ESMTP Exim 4.63 Wed, 03 Sep 2008 16:03:31 +0100\r\n
-   > EHLO localhost\r\n
-   < 250-example.vm.bytemark.co.uk Hello localhost [127.0.0.1]\r\n
-   < 250-SIZE 52428800\r\n
-   < 250-PIPELINING\r\n
-   < 250-AUTH PLAIN LOGIN\r\n
-   < 250-STARTTLS\r\n
-   < 250 HELP\r\n
-   > QUIT\r\n
-   < 221 example.vm.bytemark.co.uk closing connection\r\n
- * Connection tested OK
-
-- ftpd ----------------------------------------------------------------
- * Checking process
- * Process inetd found with PID 6565
- * Process state OK -- inetd should be running
- * Testing connection to localhost:ftp
-   < 220---------- Welcome to Pure-FTPd [privsep] [TLS] ----------\r\n
-   < 220-You are user number 1 of 50 allowed.\r\n
-   < 220-Local time is now 16:03. Server port: 21.\r\n
-   < 220-This is a private system - No anonymous login\r\n
-   < 220-IPv6 connections are also welcome on this server.\r\n
-   < 220 You will be disconnected after 15 minutes of inactivity.\r\n
-   > NOOP\r\n
-   < 200 Zzz...\r\n
-   > QUIT\r\n
-   < 221-Goodbye. You uploaded 0 and downloaded 0 kbytes.\r\n
-   < 221 Logout.\r\n
- * Connection tested OK
-
-- mysqld --------------------------------------------------------------
- * Checking process
- * Process mysqld found with PID 2525
- * Process state OK -- mysqld should be running
- * Testing connection with a ping
-   mysqld is alive
- * Connection tested OK
-
-- spamassassin --------------------------------------------------------
- * Checking process
- * spamd doesn't appear to be running: No such file or directory - /var/run/spamd.pid
- * Process state OK -- spamd should not be running
-
-- sshd ----------------------------------------------------------------
- * Checking process
- * Process sshd found with PID 8326
- * Process state OK -- sshd should be running
- * Testing connection to localhost:ssh
-   < SSH-2.0-OpenSSH_4.3p2 Debian-9etch2\n
-   > SSH-2.0-OpenSSH-4.3p2\n
- * Connection tested OK
------------------------------------------------------------------------
-
-Finished at: Wed, 03 Sep 2008 16:03:31 +0100
-= End Service test report ==============================================
--- a/monit/ruby-dbus-systemd.zip
+++ b/monit/ruby-dbus-systemd.zip
--- a/mysql/debian/copyright
+++ b/mysql/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/phpmyadmin/debian/copyright
+++ b/phpmyadmin/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/updater/debian/copyright
+++ b/updater/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public

--- a/webmail/debian/copyright
+++ b/webmail/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.mythic-beasts.com/sympl/sympl_stretch

 Files: *
 Copyright: 2019, The Sympl Project
+           2008-2017, Bytemark Ltd
 License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public