=== modified file 'README' --- README 2011-09-18 14:28:47 +0000 +++ README 2011-10-05 16:00:56 +0000 @@ -1,4 +1,4 @@ -Please see: http://www.fukt.bsnet.se/mandos/man/intro.8mandos +Please see: http://www.recompile.se/mandos/man/intro.8mandos This information previously in this file has been moved to the intro(8mandos) manual page. Go to the above URL, or run this command: === modified file 'debian/control' --- debian/control 2011-09-18 15:03:26 +0000 +++ debian/control 2011-10-05 16:00:56 +0000 @@ -1,16 +1,16 @@ Source: mandos Section: admin Priority: extra -Maintainer: Mandos Maintainers -Uploaders: Teddy Hogeborn , - Björn Påhlsson +Maintainer: Mandos Maintainers +Uploaders: Teddy Hogeborn , + Björn Påhlsson Build-Depends: debhelper (>= 7), docbook-xml, docbook-xsl, libavahi-core-dev, libgpgme11-dev, libgnutls-dev, xsltproc, pkg-config Standards-Version: 3.9.1 -Vcs-Bzr: http://ftp.fukt.bsnet.se/pub/mandos/trunk -Vcs-Browser: http://bzr.fukt.bsnet.se/loggerhead/mandos/trunk/files -Homepage: http://www.fukt.bsnet.se/mandos +Vcs-Bzr: http://ftp.recompile.se/pub/mandos/trunk +Vcs-Browser: http://bzr.recompile.se/loggerhead/mandos/trunk/files +Homepage: http://www.recompile.se/mandos Package: mandos Architecture: all === modified file 'debian/copyright' --- debian/copyright 2011-02-27 17:26:35 +0000 +++ debian/copyright 2011-10-05 16:00:56 +0000 @@ -1,8 +1,8 @@ Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=233 Upstream-Name: Mandos -Upstream-Maintainer: Mandos Maintainers -Upstream-Source: +Upstream-Maintainer: Mandos Maintainers +Upstream-Source: Files: * Copyright: Copyright © 2008-2011 Teddy Hogeborn === modified file 'debian/mandos-client.README.Debian' --- debian/mandos-client.README.Debian 2010-09-27 17:53:53 +0000 +++ debian/mandos-client.README.Debian 2011-10-05 16:00:56 +0000 @@ -1,25 +1,3 @@ -* Choose the Client Network Interface - - Please make sure that the correct network interface is specified in - the DEVICE setting in the "/etc/initramfs-tools/initramfs.conf" - file. If the setting is empty, the interface will be autodetected - at boot time, which may not be correct. *If* the DEVICE setting is - changed, it will be necessary to update the initrd image by running - the command - - update-initramfs -k all -u - - The device can be overridden at boot time on the Linux kernel - command line using the sixth colon-separated field of the "ip=" - option; for exact syntax, read the documentation in the file - "/usr/share/doc/linux-doc-*/Documentation/filesystems/nfsroot.txt", - available in the "linux-doc-*" package. - - Note that since this network interface is used in the initial RAM - disk environment, the network interface *must* exist at that stage. - Thus, the interface can *not* be a pseudo-interface such as "br0" or - "tun0"; instead, a real interface (such as "eth0") must be used. - * Adding a Client Password to the Server The server must be given a password to give back to the client on @@ -46,6 +24,34 @@ it, and output it to standard output. There it can be verified to be the correct password, before rebooting. +* Emergency Escape + + If it ever should be necessary, the Mandos client can be temporarily + prevented from running at startup by passing the parameter + "mandos=off" to the kernel. + +* Specifying a Client Network Interface + + At boot time the network interface to use will by default be + automatically detected. If should result in an incorrect interface, + edit the DEVICE setting in the "/etc/initramfs-tools/initramfs.conf" + file. (The default setting is empty, meaning to autodetect the + interface.) *If* the DEVICE setting is changed, it will be + necessary to update the initrd image by running the command + + update-initramfs -k all -u + + The device can be overridden at boot time on the Linux kernel + command line using the sixth colon-separated field of the "ip=" + option; for exact syntax, read the documentation in the file + "/usr/share/doc/linux-doc-*/Documentation/filesystems/nfsroot.txt", + available in the "linux-doc-*" package. + + Note that since this network interface is used in the initial RAM + disk environment, the network interface *must* exist at that stage. + Thus, the interface can *not* be a pseudo-interface such as "br0" or + "tun0"; instead, only real interface (such as "eth0") can be used. + * User-Supplied Plugins Any plugins found in "/etc/mandos/plugins.d" will override and add @@ -62,19 +68,14 @@ Mandos client will be the new default way for getting a password for the root file system when booting. -* Emergency Escape - - If it ever should be necessary, the Mandos client can be temporarily - prevented from running at startup by passing the parameter - "mandos=off" to the kernel. - * Non-local Connection (Not Using ZeroConf) If the "ip=" kernel command line option is used to specify a complete IP address and device name, as noted above, it then becomes possible to specify a specific IP address and port to connect to, instead of using ZeroConf. The syntax for doing this is - "mandos=connect::". + "mandos=connect::" on the kernel command + line. For very advanced users, it it possible to specify simply "mandos=connect" on the kernel command line to make the system only @@ -83,4 +84,4 @@ work, "--options-for=mandos-client:--connect=
:" needs to be manually added to the file "/etc/mandos/plugin-runner.conf". - -- Teddy Hogeborn , Mon, 27 Sep 2010 19:53:21 +0200 + -- Teddy Hogeborn , Wed, 5 Oct 2011 17:50:22 +0200 === modified file 'debian/mandos.README.Debian' --- debian/mandos.README.Debian 2009-09-08 06:28:20 +0000 +++ debian/mandos.README.Debian 2011-10-05 16:00:56 +0000 @@ -1,10 +1,10 @@ The Mandos server is useless without at least one configured client in /etc/mandos/clients.conf. To create one, install the "mandos-client" -package on a client computer, and run the command +package on a client computer, and, on the client, run the command # mandos-keygen --password -there to get a config file stanza. Append the output of that command -to the file "/etc/mandos/clients.conf" on the Mandos server. +to get a config file stanza. Append the output of that command to the +file "/etc/mandos/clients.conf" on the Mandos server computer. - -- Teddy Hogeborn , Tue, 8 Sep 2009 06:57:45 +0200 + -- Teddy Hogeborn , Wed, 5 Oct 2011 17:51:22 +0200 === modified file 'debian/watch' --- debian/watch 2010-09-15 17:17:46 +0000 +++ debian/watch 2011-10-05 16:00:56 +0000 @@ -1,2 +1,2 @@ version=3 -ftp://ftp.fukt.bsnet.se/pub/mandos/mandos[-_]([^\s]+?)(?:\.orig)?\.tar\.(?:gz|bz2|7z|xz) +ftp://ftp.recompile.se/pub/mandos/mandos[-_]([^\s]+?)(?:\.orig)?\.tar\.(?:gz|bz2|7z|xz) === modified file 'init.d-mandos' --- init.d-mandos 2009-09-16 23:28:39 +0000 +++ init.d-mandos 2011-10-05 16:00:56 +0000 @@ -9,8 +9,8 @@ # Description: Gives encrypted passwords to Mandos clients ### END INIT INFO -# Author: Teddy Hogeborn -# Author: Björn Påhlsson +# Author: Teddy Hogeborn +# Author: Björn Påhlsson # # Please remove the "Author" lines above and replace them # with your own name if you copy and modify this script. === modified file 'intro.xml' --- intro.xml 2011-08-08 21:12:37 +0000 +++ intro.xml 2011-10-05 16:00:56 +0000 @@ -1,7 +1,7 @@ + %common; ]> @@ -18,14 +18,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
@@ -392,7 +392,7 @@ - Mandos + Mandos === modified file 'mandos' --- mandos 2011-10-03 14:58:41 +0000 +++ mandos 2011-10-05 16:00:56 +0000 @@ -28,7 +28,7 @@ # along with this program. If not, see # . # -# Contact the authors at . +# Contact the authors at . # from __future__ import (division, absolute_import, print_function, === modified file 'mandos-clients.conf.xml' --- mandos-clients.conf.xml 2011-09-26 19:34:23 +0000 +++ mandos-clients.conf.xml 2011-10-05 16:00:56 +0000 @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ /etc/mandos/clients.conf"> - + %common; ]> @@ -20,14 +20,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'mandos-ctl' --- mandos-ctl 2011-10-02 19:18:24 +0000 +++ mandos-ctl 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact the authors at . +# Contact the authors at . # from __future__ import (division, absolute_import, print_function, === modified file 'mandos-ctl.xml' --- mandos-ctl.xml 2011-09-18 14:28:47 +0000 +++ mandos-ctl.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'mandos-keygen' --- mandos-keygen 2011-08-17 22:27:13 +0000 +++ mandos-keygen 2011-10-05 16:00:56 +0000 @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact the authors at . +# Contact the authors at . # VERSION="1.3.1" === modified file 'mandos-keygen.xml' --- mandos-keygen.xml 2011-08-08 21:12:37 +0000 +++ mandos-keygen.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'mandos-monitor' --- mandos-monitor 2011-10-02 19:18:24 +0000 +++ mandos-monitor 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact the authors at . +# Contact the authors at . # from __future__ import (division, absolute_import, print_function, === modified file 'mandos-monitor.xml' --- mandos-monitor.xml 2011-08-08 21:12:37 +0000 +++ mandos-monitor.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'mandos.conf.xml' --- mandos.conf.xml 2011-08-08 21:12:37 +0000 +++ mandos.conf.xml 2011-10-05 16:00:56 +0000 @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ /etc/mandos/mandos.conf"> - + %common; ]> @@ -20,14 +20,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'mandos.lsm' --- mandos.lsm 2011-07-27 17:58:27 +0000 +++ mandos.lsm 2011-10-05 16:00:56 +0000 @@ -7,13 +7,13 @@ unattended reboots. Keywords: boot, encryption, luks, cryptsetup, network, openpgp, tls, dm-crypt -Author: teddy@fukt.bsnet.se (Teddy Hogeborn), - belorn@fukt.bsnet.se (Björn Påhlsson) -Maintained-by: teddy@fukt.bsnet.se (Teddy Hogeborn), - belorn@fukt.bsnet.se (Björn Påhlsson) -Primary-site: http://www.fukt.bsnet.se/mandos +Author: teddy@recompile.se (Teddy Hogeborn), + belorn@recompile.se (Björn Påhlsson) +Maintained-by: teddy@recompile.se (Teddy Hogeborn), + belorn@recompile.se (Björn Påhlsson) +Primary-site: http://www.recompile.se/mandos 136K mandos_1.3.1.orig.tar.gz -Alternate-site: ftp://ftp.fukt.bsnet.se/pub/mandos +Alternate-site: ftp://ftp.recompile.se/pub/mandos 136K mandos_1.3.1.orig.tar.gz Platforms: Requires GCC, GNU libC, Avahi, GnuPG, Python 2.6, and various other libraries. While made for Debian GNU/Linux, it is === modified file 'mandos.xml' --- mandos.xml 2011-09-18 14:28:47 +0000 +++ mandos.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'plugin-runner.c' --- plugin-runner.c 2011-07-16 00:29:19 +0000 +++ plugin-runner.c 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ * along with this program. If not, see * . * - * Contact the authors at . + * Contact the authors at . */ #define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(), @@ -79,7 +79,7 @@ #define AFILE "/conf/conf.d/mandos/plugin-runner.conf" const char *argp_program_version = "plugin-runner " VERSION; -const char *argp_program_bug_address = ""; +const char *argp_program_bug_address = ""; typedef struct plugin{ char *name; /* can be NULL or any plugin name */ === modified file 'plugin-runner.xml' --- plugin-runner.xml 2011-08-08 21:12:37 +0000 +++ plugin-runner.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'plugins.d/askpass-fifo.c' --- plugins.d/askpass-fifo.c 2011-07-13 02:24:39 +0000 +++ plugins.d/askpass-fifo.c 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ * along with this program. If not, see * . * - * Contact the authors at . + * Contact the authors at . */ #define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */ === modified file 'plugins.d/askpass-fifo.xml' --- plugins.d/askpass-fifo.xml 2011-08-08 21:12:37 +0000 +++ plugins.d/askpass-fifo.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'plugins.d/mandos-client.c' --- plugins.d/mandos-client.c 2011-08-07 14:49:02 +0000 +++ plugins.d/mandos-client.c 2011-10-05 16:00:56 +0000 @@ -26,7 +26,7 @@ * along with this program. If not, see * . * - * Contact the authors at . + * Contact the authors at . */ /* Needed by GPGME, specifically gpgme_data_seek() */ @@ -127,7 +127,7 @@ bool debug = false; static const char mandos_protocol_version[] = "1"; const char *argp_program_version = "mandos-client " VERSION; -const char *argp_program_bug_address = ""; +const char *argp_program_bug_address = ""; static const char sys_class_net[] = "/sys/class/net"; char *connect_to = NULL; === modified file 'plugins.d/mandos-client.xml' --- plugins.d/mandos-client.xml 2011-08-08 21:12:37 +0000 +++ plugins.d/mandos-client.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'plugins.d/password-prompt.c' --- plugins.d/password-prompt.c 2011-07-27 17:58:27 +0000 +++ plugins.d/password-prompt.c 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ * along with this program. If not, see * . * - * Contact the authors at . + * Contact the authors at . */ #define _GNU_SOURCE /* getline(), asprintf() */ @@ -67,7 +67,7 @@ int signal_received; bool debug = false; const char *argp_program_version = "password-prompt " VERSION; -const char *argp_program_bug_address = ""; +const char *argp_program_bug_address = ""; /* Needed for conflict resolution */ const char plymouth_name[] = "plymouthd"; === modified file 'plugins.d/password-prompt.xml' --- plugins.d/password-prompt.xml 2011-08-08 21:12:37 +0000 +++ plugins.d/password-prompt.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'plugins.d/plymouth.c' --- plugins.d/plymouth.c 2011-10-02 13:47:52 +0000 +++ plugins.d/plymouth.c 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ * along with this program. If not, see * . * - * Contact the authors at . + * Contact the authors at . */ #define _GNU_SOURCE /* asprintf(), TEMP_FAILURE_RETRY() */ === modified file 'plugins.d/plymouth.xml' --- plugins.d/plymouth.xml 2011-08-08 21:12:37 +0000 +++ plugins.d/plymouth.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'plugins.d/splashy.c' --- plugins.d/splashy.c 2011-07-13 02:24:39 +0000 +++ plugins.d/splashy.c 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ * along with this program. If not, see * . * - * Contact the authors at . + * Contact the authors at . */ #define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */ === modified file 'plugins.d/splashy.xml' --- plugins.d/splashy.xml 2011-08-08 21:12:37 +0000 +++ plugins.d/splashy.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se
=== modified file 'plugins.d/usplash.c' --- plugins.d/usplash.c 2011-07-13 02:24:39 +0000 +++ plugins.d/usplash.c 2011-10-05 16:00:56 +0000 @@ -19,7 +19,7 @@ * along with this program. If not, see * . * - * Contact the authors at . + * Contact the authors at . */ #define _GNU_SOURCE /* asprintf(), TEMP_FAILURE_RETRY() */ === modified file 'plugins.d/usplash.xml' --- plugins.d/usplash.xml 2011-08-08 21:12:37 +0000 +++ plugins.d/usplash.xml 2011-10-05 16:00:56 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -19,14 +19,14 @@ Björn Påhlsson
- belorn@fukt.bsnet.se + belorn@recompile.se
Teddy Hogeborn
- teddy@fukt.bsnet.se + teddy@recompile.se