bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
1 |
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \ |
2 |
-Wswitch-default -Wswitch-enum -Wunused-parameter \ |
|
304
by Teddy Hogeborn
Four new interrelated features: |
3 |
-Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \ |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
4 |
-Wunsafe-loop-optimizations -Wpointer-arith \ |
5 |
-Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \ |
|
6 |
-Wconversion -Wstrict-prototypes -Wold-style-definition \ |
|
177
by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a |
7 |
-Wpacked -Wnested-externs -Winline -Wvolatile-register-var |
8 |
# -Wunreachable-code
|
|
9 |
#DEBUG=-ggdb3
|
|
28
by Teddy Hogeborn
* server.conf: New file. |
10 |
# For info about _FORTIFY_SOURCE, see
|
389
by Teddy Hogeborn
* plugins.d/splashy.c: Use exit codes from <sysexits.h>. |
11 |
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
|
12 |
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
|
|
237.2.31
by Teddy Hogeborn
* Makefile: Don't use PIE if BROKEN_PIE is set. |
13 |
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC |
14 |
LINK_FORTIFY_LD=-z relro -z now |
|
15 |
LINK_FORTIFY= |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
16 |
|
17 |
# If BROKEN_PIE is set, do not build with -pie
|
|
237.2.31
by Teddy Hogeborn
* Makefile: Don't use PIE if BROKEN_PIE is set. |
18 |
ifndef BROKEN_PIE
|
19 |
FORTIFY += -fPIE |
|
20 |
LINK_FORTIFY += -pie |
|
21 |
endif
|
|
24.1.90
by Björn Påhlsson
fixed two bugs: |
22 |
#COVERAGE=--coverage
|
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
23 |
OPTIMIZE=-Os |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
24 |
LANGUAGE=-std=gnu99 |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
25 |
htmldir=man |
237.2.32
by Teddy Hogeborn
* Makefile (version): Changed to "1.0.14". |
26 |
version=1.0.14 |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
27 |
SED=sed |
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
28 |
|
29 |
## Use these settings for a traditional /usr/local install
|
|
30 |
# PREFIX=$(DESTDIR)/usr/local
|
|
177
by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a |
31 |
# CONFDIR=$(DESTDIR)/etc/mandos
|
32 |
# KEYDIR=$(DESTDIR)/etc/mandos/keys
|
|
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
33 |
# MANDIR=$(PREFIX)/man
|
177
by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a |
34 |
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
|
35 |
##
|
|
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
36 |
|
177
by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a |
37 |
## These settings are for a package-type install
|
96
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR). |
38 |
PREFIX=$(DESTDIR)/usr |
39 |
CONFDIR=$(DESTDIR)/etc/mandos |
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
40 |
KEYDIR=$(DESTDIR)/etc/keys/mandos |
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
41 |
MANDIR=$(PREFIX)/share/man |
42 |
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools |
|
177
by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a |
43 |
##
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
44 |
|
345
by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS): Use "pkg-config" instead of |
45 |
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls) |
46 |
GNUTLS_LIBS=$(shell pkg-config --libs gnutls) |
|
81
by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS, |
47 |
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core) |
48 |
AVAHI_LIBS=$(shell pkg-config --libs avahi-core) |
|
317
by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags. |
49 |
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS) |
50 |
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \ |
|
51 |
getconf LFS_LDFLAGS) |
|
81
by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS, |
52 |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
53 |
# Do not change these two
|
81
by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS, |
54 |
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \ |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
55 |
$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \ |
56 |
-DVERSION='"$(version)"' |
|
257.1.1
by Mooie
Updated Makefile to use -fPIC. |
57 |
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag)) |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
58 |
|
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
59 |
# Commands to format a DocBook <refentry> document into a manual page
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
60 |
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \ |
62
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Do not generate AUTHORS section. |
61 |
--param man.charmap.use.subset 0 \ |
62 |
--param make.year.ranges 1 \ |
|
63 |
--param make.single.year.ranges 1 \ |
|
64 |
--param man.output.quietly 1 \ |
|
84
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do |
65 |
--param man.authors.section.enabled 0 \ |
91
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related |
66 |
/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \ |
67 |
$(notdir $<); \ |
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
68 |
$(MANPOST) $(notdir $@)) |
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
69 |
# DocBook-to-man post-processing to fix a '\n' escape bug
|
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
70 |
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g' |
24.1.25
by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml". |
71 |
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
72 |
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \ |
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
73 |
--param make.year.ranges 1 \ |
74 |
--param make.single.year.ranges 1 \ |
|
75 |
--param man.output.quietly 1 \ |
|
76 |
--param man.authors.section.enabled 0 \ |
|
77 |
--param citerefentry.link 1 \ |
|
78 |
--output $@ \ |
|
79 |
/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \ |
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
80 |
$<; $(HTMLPOST) $@) |
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
81 |
# Fix citerefentry links
|
235
by Teddy Hogeborn
* INSTALL: Fixed typo. |
82 |
HTMLPOST=$(SED) --in-place \ |
83 |
--expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g' |
|
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
84 |
|
205
by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client, |
85 |
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \ |
425
by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin. |
86 |
plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \ |
87 |
plugins.d/plymouth
|
|
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
88 |
CPROGS=plugin-runner $(PLUGINS) |
24.1.121
by Björn Påhlsson
mandos-ctl: Added support for all client calls |
89 |
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS) |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
90 |
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \ |
171
by Teddy Hogeborn
Renamed "password-request" to "mandos-client". |
91 |
plugins.d/mandos-client.8mandos \ |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
92 |
plugins.d/password-prompt.8mandos mandos.conf.5 \ |
225
by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and |
93 |
plugins.d/usplash.8mandos plugins.d/splashy.8mandos \ |
226
by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos". |
94 |
plugins.d/askpass-fifo.8mandos mandos-clients.conf.5 |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
95 |
|
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
96 |
htmldocs=$(addsuffix .xhtml,$(DOCS)) |
97 |
||
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
98 |
objects=$(addsuffix .o,$(CPROGS)) |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
99 |
|
233
by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm". |
100 |
all: $(PROGS) mandos.lsm |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
101 |
|
102 |
doc: $(DOCS) |
|
24.1.25
by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml". |
103 |
|
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
104 |
html: $(htmldocs) |
105 |
||
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
106 |
%.5: %.xml common.ent legalnotice.xml |
107 |
$(DOCBOOKTOMAN) |
|
108 |
%.5.xhtml: %.xml common.ent legalnotice.xml |
|
109 |
$(DOCBOOKTOHTML) |
|
110 |
||
111 |
%.8: %.xml common.ent legalnotice.xml |
|
112 |
$(DOCBOOKTOMAN) |
|
113 |
%.8.xhtml: %.xml common.ent legalnotice.xml |
|
114 |
$(DOCBOOKTOHTML) |
|
115 |
||
116 |
%.8mandos: %.xml common.ent legalnotice.xml |
|
117 |
$(DOCBOOKTOMAN) |
|
118 |
%.8mandos.xhtml: %.xml common.ent legalnotice.xml |
|
119 |
$(DOCBOOKTOHTML) |
|
120 |
||
121 |
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \ |
|
122 |
legalnotice.xml |
|
123 |
$(DOCBOOKTOMAN) |
|
124 |
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \ |
|
125 |
overview.xml legalnotice.xml |
|
126 |
$(DOCBOOKTOHTML) |
|
127 |
||
128 |
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \ |
|
129 |
legalnotice.xml |
|
130 |
$(DOCBOOKTOMAN) |
|
131 |
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \ |
|
132 |
legalnotice.xml |
|
133 |
$(DOCBOOKTOHTML) |
|
134 |
||
135 |
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \ |
|
136 |
legalnotice.xml |
|
137 |
$(DOCBOOKTOMAN) |
|
138 |
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \ |
|
139 |
legalnotice.xml |
|
140 |
$(DOCBOOKTOHTML) |
|
141 |
||
142 |
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \ |
|
143 |
legalnotice.xml |
|
144 |
$(DOCBOOKTOMAN) |
|
145 |
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \ |
|
146 |
overview.xml legalnotice.xml |
|
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
147 |
$(DOCBOOKTOHTML) |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
148 |
|
171
by Teddy Hogeborn
Renamed "password-request" to "mandos-client". |
149 |
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \ |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
150 |
common.ent \ |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
151 |
mandos-options.xml \ |
152 |
overview.xml legalnotice.xml |
|
91
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related |
153 |
$(DOCBOOKTOMAN) |
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
154 |
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \ |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
155 |
common.ent \ |
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
156 |
mandos-options.xml \ |
157 |
overview.xml legalnotice.xml |
|
158 |
$(DOCBOOKTOHTML) |
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
159 |
|
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
160 |
# Update all these files with version number $(version)
|
161 |
common.ent: Makefile |
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
162 |
$(strip $(SED) --in-place \ |
318
by Teddy Hogeborn
* Makefile (common.ent): Update "version" entity correctly. |
163 |
--expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \ |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
164 |
$@) |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
165 |
|
166 |
mandos: Makefile |
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
167 |
$(strip $(SED) --in-place \ |
235
by Teddy Hogeborn
* INSTALL: Fixed typo. |
168 |
--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \ |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
169 |
$@) |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
170 |
|
171 |
mandos-keygen: Makefile |
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
172 |
$(strip $(SED) --in-place \ |
235
by Teddy Hogeborn
* INSTALL: Fixed typo. |
173 |
--expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \ |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
174 |
$@) |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
175 |
|
24.1.121
by Björn Påhlsson
mandos-ctl: Added support for all client calls |
176 |
mandos-ctl: Makefile |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
177 |
$(strip $(SED) --in-place \ |
240
by Teddy Hogeborn
Merge "mandos-list" from belorn. |
178 |
--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \ |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
179 |
$@) |
240
by Teddy Hogeborn
Merge "mandos-list" from belorn. |
180 |
|
233
by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm". |
181 |
mandos.lsm: Makefile |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
182 |
$(strip $(SED) --in-place \ |
235
by Teddy Hogeborn
* INSTALL: Fixed typo. |
183 |
--expression='s/^\(Version:\).*/\1\t$(version)/' \ |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
184 |
$@) |
185 |
$(strip $(SED) --in-place \ |
|
235
by Teddy Hogeborn
* INSTALL: Fixed typo. |
186 |
--expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \ |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
187 |
$@) |
188 |
$(strip $(SED) --in-place \ |
|
255
by Teddy Hogeborn
* Makefile (mandos.lsm): Also update file name using version number. |
189 |
--expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \ |
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
190 |
$@) |
233
by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm". |
191 |
|
398
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos, |
192 |
plugins.d/mandos-client: plugins.d/mandos-client.c |
193 |
$(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\ |
|
194 |
) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@ |
|
81
by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS, |
195 |
|
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
196 |
.PHONY : all doc html clean distclean run-client run-server install \ |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
197 |
install-server install-client uninstall uninstall-server \ |
198 |
uninstall-client purge purge-server purge-client |
|
47
by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed. |
199 |
|
1
by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN |
200 |
clean: |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
201 |
-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core |
47
by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed. |
202 |
|
203 |
distclean: clean |
|
204 |
mostlyclean: clean |
|
205 |
maintainer-clean: clean |
|
104
by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir". |
206 |
-rm --force --recursive keydir confdir |
47
by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed. |
207 |
|
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
208 |
check: all |
47
by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed. |
209 |
./mandos --check |
210 |
||
141
by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf". |
211 |
# Run the client with a local config and key
|
159
by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files. |
212 |
run-client: all keydir/seckey.txt keydir/pubkey.txt |
237.3.1
by teddy at bsnet
* Makefile (run-server, run-client): Add notices about harmless error |
213 |
@echo "###################################################################" |
214 |
@echo "# The following error messages are harmless and can be safely #" |
|
215 |
@echo "# ignored. The messages are caused by not running as root, but #" |
|
216 |
@echo "# you should NOT run \"make run-client\" as root unless you also #" |
|
217 |
@echo "# unpacked and compiled Mandos as root, which is NOT recommended. #" |
|
218 |
@echo "# From plugin-runner: setuid: Operation not permitted #" |
|
219 |
@echo "# From askpass-fifo: mkfifo: Permission denied #" |
|
220 |
@echo "# From mandos-client: setuid: Operation not permitted #" |
|
221 |
@echo "# seteuid: Operation not permitted #" |
|
222 |
@echo "# klogctl: Operation not permitted #" |
|
223 |
@echo "###################################################################" |
|
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
224 |
./plugin-runner --plugin-dir=plugins.d \ |
141
by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf". |
225 |
--config-file=plugin-runner.conf \ |
260
by Teddy Hogeborn
* Makefile (run-client): Pass $(CLIENTARGS) to plugin-runner. |
226 |
--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \ |
227 |
$(CLIENTARGS) |
|
47
by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed. |
228 |
|
104
by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir". |
229 |
# Used by run-client
|
230 |
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen |
|
231 |
install --directory keydir |
|
232 |
./mandos-keygen --dir keydir --force |
|
233 |
||
234 |
# Run the server with a local config
|
|
235 |
run-server: confdir/mandos.conf confdir/clients.conf |
|
237.3.1
by teddy at bsnet
* Makefile (run-server, run-client): Add notices about harmless error |
236 |
@echo "#################################################################" |
426
by Teddy Hogeborn
* Makefile (run-server): Remove warning about now-eliminated error. |
237 |
@echo "# NOTE: Please IGNORE the error about \"Could not open file #" |
238 |
@echo "# u'/var/run/mandos.pid'\" - it is harmless and is caused by #" |
|
239 |
@echo "# the server not running as root. Do NOT run \"make run-server\" #" |
|
240 |
@echo "# server as root if you didn't also unpack and compile it thus. #" |
|
237.3.1
by teddy at bsnet
* Makefile (run-server, run-client): Add notices about harmless error |
241 |
@echo "#################################################################" |
292
by Teddy Hogeborn
* Makefile (run-server): Use "--no-dbus" unconditionally. |
242 |
./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS) |
104
by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir". |
243 |
|
244 |
# Used by run-server
|
|
245 |
confdir/mandos.conf: mandos.conf |
|
246 |
install --directory confdir |
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
247 |
install --mode=u=rw,go=r $^ $@ |
104
by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir". |
248 |
confdir/clients.conf: clients.conf keydir/seckey.txt |
249 |
install --directory confdir |
|
166
by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw". |
250 |
install --mode=u=rw $< $@ |
104
by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir". |
251 |
# Add a client password
|
252 |
./mandos-keygen --dir keydir --password >> $@ |
|
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
253 |
|
182
by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey". |
254 |
install: install-server install-client-nokey |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
255 |
|
235
by Teddy Hogeborn
* INSTALL: Fixed typo. |
256 |
install-html: html |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
257 |
install --directory $(htmldir) |
258 |
install --mode=u=rw,go=r --target-directory=$(htmldir) \ |
|
259 |
$(htmldocs) |
|
216
by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages. |
260 |
|
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
261 |
install-server: doc |
185
by Teddy Hogeborn
* .bzr-builddeb/default.conf: New. |
262 |
install --directory $(CONFDIR) |
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
263 |
install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos |
162
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables. |
264 |
install --mode=u=rw,go=r --target-directory=$(CONFDIR) \ |
265 |
mandos.conf
|
|
166
by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw". |
266 |
install --mode=u=rw --target-directory=$(CONFDIR) \ |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
267 |
clients.conf
|
420.1.1
by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as |
268 |
install --mode=u=rw,go=r dbus-mandos.conf \ |
269 |
$(DESTDIR)/etc/dbus-1/system.d/mandos.conf |
|
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
270 |
install --mode=u=rwx,go=rx init.d-mandos \ |
271 |
$(DESTDIR)/etc/init.d/mandos |
|
272 |
install --mode=u=rw,go=r default-mandos \ |
|
273 |
$(DESTDIR)/etc/default/mandos |
|
200
by Teddy Hogeborn
* Makefile: Put the init script before avahi-daemon. |
274 |
if [ -z $(DESTDIR) ]; then \
|
275 |
update-rc.d mandos defaults 25 15;\
|
|
276 |
fi
|
|
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
277 |
gzip --best --to-stdout mandos.8 \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
278 |
> $(MANDIR)/man8/mandos.8.gz |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
279 |
gzip --best --to-stdout mandos.conf.5 \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
280 |
> $(MANDIR)/man5/mandos.conf.5.gz |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
281 |
gzip --best --to-stdout mandos-clients.conf.5 \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
282 |
> $(MANDIR)/man5/mandos-clients.conf.5.gz |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
283 |
|
182
by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey". |
284 |
install-client-nokey: all doc |
185
by Teddy Hogeborn
* .bzr-builddeb/default.conf: New. |
285 |
install --directory $(PREFIX)/lib/mandos $(CONFDIR) |
286 |
install --directory --mode=u=rwx $(KEYDIR) \ |
|
162
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables. |
287 |
$(PREFIX)/lib/mandos/plugins.d |
170
by Teddy Hogeborn
* Makefile (install-client): Add "/etc/plugins.d/README". |
288 |
if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
|
166
by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw". |
289 |
install --mode=u=rwx \
|
199
by Teddy Hogeborn
* Makefile: Bug fix: fix syntax error. |
290 |
--directory "$(CONFDIR)/plugins.d"; \
|
166
by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw". |
291 |
fi
|
162
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables. |
292 |
install --mode=u=rwx,go=rx \ |
293 |
--target-directory=$(PREFIX)/lib/mandos plugin-runner |
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
294 |
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
295 |
mandos-keygen
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
296 |
install --mode=u=rwx,go=rx \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
297 |
--target-directory=$(PREFIX)/lib/mandos/plugins.d \ |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
298 |
plugins.d/password-prompt
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
299 |
install --mode=u=rwxs,go=rx \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
300 |
--target-directory=$(PREFIX)/lib/mandos/plugins.d \ |
171
by Teddy Hogeborn
Renamed "password-request" to "mandos-client". |
301 |
plugins.d/mandos-client
|
208
by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/usplash". |
302 |
install --mode=u=rwxs,go=rx \ |
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
303 |
--target-directory=$(PREFIX)/lib/mandos/plugins.d \ |
304 |
plugins.d/usplash
|
|
205
by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client, |
305 |
install --mode=u=rwxs,go=rx \ |
306 |
--target-directory=$(PREFIX)/lib/mandos/plugins.d \ |
|
307 |
plugins.d/splashy
|
|
214
by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo". |
308 |
install --mode=u=rwxs,go=rx \ |
309 |
--target-directory=$(PREFIX)/lib/mandos/plugins.d \ |
|
310 |
plugins.d/askpass-fifo
|
|
425
by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin. |
311 |
install --mode=u=rwxs,go=rx \ |
312 |
--target-directory=$(PREFIX)/lib/mandos/plugins.d \ |
|
313 |
plugins.d/plymouth
|
|
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
314 |
install initramfs-tools-hook \ |
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
315 |
$(INITRAMFSTOOLS)/hooks/mandos |
185
by Teddy Hogeborn
* .bzr-builddeb/default.conf: New. |
316 |
install --mode=u=rw,go=r initramfs-tools-hook-conf \ |
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
317 |
$(INITRAMFSTOOLS)/conf-hooks.d/mandos |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
318 |
install initramfs-tools-script \ |
302
by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from |
319 |
$(INITRAMFSTOOLS)/scripts/init-premount/mandos |
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
320 |
install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR) |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
321 |
gzip --best --to-stdout mandos-keygen.8 \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
322 |
> $(MANDIR)/man8/mandos-keygen.8.gz |
323 |
gzip --best --to-stdout plugin-runner.8mandos \ |
|
324 |
> $(MANDIR)/man8/plugin-runner.8mandos.gz |
|
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
325 |
gzip --best --to-stdout plugins.d/password-prompt.8mandos \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
326 |
> $(MANDIR)/man8/password-prompt.8mandos.gz |
171
by Teddy Hogeborn
Renamed "password-request" to "mandos-client". |
327 |
gzip --best --to-stdout plugins.d/mandos-client.8mandos \ |
328 |
> $(MANDIR)/man8/mandos-client.8mandos.gz |
|
225
by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and |
329 |
gzip --best --to-stdout plugins.d/usplash.8mandos \ |
330 |
> $(MANDIR)/man8/usplash.8mandos.gz |
|
331 |
gzip --best --to-stdout plugins.d/splashy.8mandos \ |
|
332 |
> $(MANDIR)/man8/splashy.8mandos.gz |
|
226
by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos". |
333 |
gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \ |
334 |
> $(MANDIR)/man8/askpass-fifo.8mandos.gz |
|
182
by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey". |
335 |
|
336 |
install-client: install-client-nokey |
|
166
by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw". |
337 |
# Post-installation stuff
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
338 |
-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)" |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
339 |
update-initramfs -k all -u |
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
340 |
echo "Now run mandos-keygen --password --dir $(KEYDIR)" |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
341 |
|
342 |
uninstall: uninstall-server uninstall-client |
|
343 |
||
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
344 |
uninstall-server: |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
345 |
-rm --force $(PREFIX)/sbin/mandos \ |
346 |
$(MANDIR)/man8/mandos.8.gz \ |
|
347 |
$(MANDIR)/man5/mandos.conf.5.gz \ |
|
348 |
$(MANDIR)/man5/mandos-clients.conf.5.gz |
|
162
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables. |
349 |
update-rc.d -f mandos remove |
163
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed. |
350 |
-rmdir $(CONFDIR) |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
351 |
|
352 |
uninstall-client: |
|
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
353 |
# Refuse to uninstall client if /etc/crypttab is explicitly configured
|
354 |
# to use it.
|
|
355 |
! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \ |
|
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
356 |
$(DESTDIR)/etc/crypttab |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
357 |
-rm --force $(PREFIX)/sbin/mandos-keygen \ |
358 |
$(PREFIX)/lib/mandos/plugin-runner \ |
|
359 |
$(PREFIX)/lib/mandos/plugins.d/password-prompt \ |
|
171
by Teddy Hogeborn
Renamed "password-request" to "mandos-client". |
360 |
$(PREFIX)/lib/mandos/plugins.d/mandos-client \ |
166
by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw". |
361 |
$(PREFIX)/lib/mandos/plugins.d/usplash \ |
205
by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client, |
362 |
$(PREFIX)/lib/mandos/plugins.d/splashy \ |
226
by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos". |
363 |
$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \ |
425
by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin. |
364 |
$(PREFIX)/lib/mandos/plugins.d/plymouth \ |
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
365 |
$(INITRAMFSTOOLS)/hooks/mandos \ |
366 |
$(INITRAMFSTOOLS)/conf-hooks.d/mandos \ |
|
302
by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from |
367 |
$(INITRAMFSTOOLS)/scripts/init-premount/mandos \ |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
368 |
$(MANDIR)/man8/plugin-runner.8mandos.gz \ |
369 |
$(MANDIR)/man8/mandos-keygen.8.gz \ |
|
370 |
$(MANDIR)/man8/password-prompt.8mandos.gz \ |
|
225
by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and |
371 |
$(MANDIR)/man8/usplash.8mandos.gz \ |
372 |
$(MANDIR)/man8/splashy.8mandos.gz \ |
|
226
by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos". |
373 |
$(MANDIR)/man8/askpass-fifo.8mandos.gz \ |
171
by Teddy Hogeborn
Renamed "password-request" to "mandos-client". |
374 |
$(MANDIR)/man8/mandos-client.8mandos.gz |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
375 |
-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \ |
166
by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw". |
376 |
$(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR) |
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
377 |
update-initramfs -k all -u |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
378 |
|
379 |
purge: purge-server purge-client |
|
380 |
||
381 |
purge-server: uninstall-server |
|
162
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables. |
382 |
-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \ |
420.1.1
by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as |
383 |
$(DESTDIR)/etc/dbus-1/system.d/mandos.conf |
175
by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from |
384 |
$(DESTDIR)/etc/default/mandos \ |
385 |
$(DESTDIR)/etc/init.d/mandos \ |
|
386 |
$(DESTDIR)/var/run/mandos.pid |
|
74
by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New. |
387 |
-rmdir $(CONFDIR) |
67
by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on |
388 |
|
389 |
purge-client: uninstall-client |
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
390 |
-shred --remove $(KEYDIR)/seckey.txt |
161
by Teddy Hogeborn
* Makefile (purge-client): Also remove "plugin-runner.conf". |
391 |
-rm --force $(CONFDIR)/plugin-runner.conf \ |
392 |
$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt |
|
160
by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout. |
393 |
-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR) |