/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-09-26 04:54:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080926045435-0thnnqops1kzclag
* debian/mandos-client.postinst: Change home directory to
                                 "/nonexistent".
* debian/mandos.postinst: - '' -

* plugin-runner.c (main): Bug fix: Block signals while modifying
                          "plugin_list".

* plugins.d/usplash.c (usplash_write): New function.
  (main): Use "usplash_write" to write "INPUTQUIET" command.  Also
          write "TIMEOUT 0" before it, and write "TIMEOUT 15" and
          "PULSATE" if starting a new usplash process.  Kill old
          usplash before forking.  Bug fix: do setuid(geteuid()) to
          preserve genuine rootness.  Better interrupted/error logic
          overall.

* debian/mandos-client.lintian-overrides: Ignore setuid
                                          "plugins.d/usplash".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
55
55
# DocBook-to-man post-processing to fix a '\n' escape bug
56
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
57
57
 
58
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
 
58
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
59
        plugins.d/usplash plugins.d/splashy
59
60
PROGS=plugin-runner $(PLUGINS)
60
61
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
61
62
        plugins.d/mandos-client.8mandos \
141
142
install: install-server install-client-nokey
142
143
 
143
144
install-server: doc
144
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
145
 
                $(MANDIR)/man8 $(DESTDIR)/etc/init.d \
146
 
                $(DESTDIR)/etc/default $(PREFIX)/sbin
 
145
        install --directory $(CONFDIR)
147
146
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
148
147
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
149
148
                mandos.conf
153
152
                $(DESTDIR)/etc/init.d/mandos
154
153
        install --mode=u=rw,go=r default-mandos \
155
154
                $(DESTDIR)/etc/default/mandos
156
 
        update-rc.d mandos defaults
 
155
        if [ -z $(DESTDIR) ]; then \
 
156
                update-rc.d mandos defaults 25 15;\
 
157
        fi
157
158
        gzip --best --to-stdout mandos.8 \
158
159
                > $(MANDIR)/man8/mandos.8.gz
159
160
        gzip --best --to-stdout mandos.conf.5 \
162
163
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
163
164
 
164
165
install-client-nokey: all doc
165
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
166
 
                $(MANDIR)/man8 $(PREFIX)/sbin \
167
 
                $(INITRAMFSTOOLS)/hooks \
168
 
                $(INITRAMFSTOOLS)/conf-hooks.d \
169
 
                $(INITRAMFSTOOLS)/scripts/local-top
170
 
        install --directory --mode=u=rwx $(KEYDIR)
171
 
        install --directory --mode=u=rwx \
 
166
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
167
        install --directory --mode=u=rwx $(KEYDIR) \
172
168
                $(PREFIX)/lib/mandos/plugins.d
173
169
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
174
170
                install --mode=u=rwx \
175
 
                        --directory "$(CONFDIR)/plugins.d" && \
176
 
                install --mode=u=rw,go=r etc-plugins.d-README \
177
 
                        $(CONFDIR)/plugins.d/README ; \
 
171
                        --directory "$(CONFDIR)/plugins.d"; \
178
172
        fi
179
173
        install --mode=u=rwx,go=rx \
180
174
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
186
180
        install --mode=u=rwxs,go=rx \
187
181
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
188
182
                plugins.d/mandos-client
189
 
        install --mode=u=rwx,go=rx \
 
183
        install --mode=u=rwxs,go=rx \
190
184
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
191
185
                plugins.d/usplash
 
186
        install --mode=u=rwxs,go=rx \
 
187
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
188
                plugins.d/splashy
192
189
        install initramfs-tools-hook \
193
190
                $(INITRAMFSTOOLS)/hooks/mandos
194
 
        install initramfs-tools-hook-conf \
 
191
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
195
192
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
196
193
        install initramfs-tools-script \
197
194
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
231
228
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
232
229
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
233
230
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
231
                $(PREFIX)/lib/mandos/plugins.d/splashy \
234
232
                $(INITRAMFSTOOLS)/hooks/mandos \
235
233
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
236
234
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \