/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2019-08-03 12:27:14 UTC
  • mto: This revision was merged to the branch mainline in revision 386.
  • Revision ID: teddy@recompile.se-20190803122714-efudxsyomr1k0zbt
dracut-module/password-agent.c: Use O_NOCTTY

Whenever a file is opened using open(), use the O_NOCTTY flag, just to
be safe.

* dracut-module/password-agent.c (test_start_mandos_client_execv): Use
  O_NOCTTY.
  (test_wait_for_mandos_client_exit_failure): - '' -
  (test_wait_for_mandos_client_exit_killed): - '' -
  (test_read_mandos_client_output_readerror): - '' -
  (test_read_inotify_event_readerror): - '' -
  (test_connect_question_socket_bad_epoll): - '' -
  (test_send_password_to_socket_bad_epoll): - '' -
  (assert_add_existing_questions_to_devnull): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
41
41
#COVERAGE=--coverage
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
44
 
FEATURES:=-D_FILE_OFFSET_BITS=64
45
44
htmldir:=man
46
 
version:=1.8.9
 
45
version:=1.8.5
47
46
SED:=sed
48
47
PKG_CONFIG?=pkg-config
49
48
 
89
88
                        --variable=systemdsystemunitdir)
90
89
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
90
                        --variable=tmpfilesdir)
92
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
93
 
                        --variable=sysusersdir)
94
91
 
95
92
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
96
93
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
105
102
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
106
103
 
107
104
# Do not change these two
108
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
109
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
105
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
106
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
110
107
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
111
108
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
112
109
 
282
279
                $@)
283
280
 
284
281
# Need to add the GnuTLS, Avahi and GPGME libraries
285
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
286
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
287
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
288
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
 
282
plugins.d/mandos-client: plugins.d/mandos-client.c
 
283
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
284
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
285
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
286
                ) $(LDLIBS) -o $@
289
287
 
290
288
# Need to add the libnl-route library
291
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
292
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
 
289
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
290
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
291
                ) $(LOADLIBES) $(LDLIBS) -o $@
293
292
 
294
293
# Need to add the GLib and pthread libraries
295
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
296
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
294
dracut-module/password-agent: dracut-module/password-agent.c
 
295
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
 
296
                ) $(LOADLIBES) $(LDLIBS) -o $@
297
297
 
298
298
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
299
        check run-client run-server install install-html \
389
389
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
390
390
                        $(TMPFILES)/mandos.conf; \
391
391
        fi
392
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
393
 
                        -a -d "$(SYSUSERS)" ]; then \
394
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
395
 
                        $(SYSUSERS)/mandos.conf; \
396
 
        fi
397
392
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
398
393
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
399
394
                mandos-ctl
433
428
        install --directory --mode=u=rwx $(KEYDIR) \
434
429
                $(LIBDIR)/mandos/plugins.d \
435
430
                $(LIBDIR)/mandos/plugin-helpers
436
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
437
 
                        -a -d "$(SYSUSERS)" ]; then \
438
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
439
 
                        $(SYSUSERS)/mandos-client.conf; \
440
 
        fi
441
431
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
442
432
                install --mode=u=rwx \
443
433
                        --directory "$(CONFDIR)/plugins.d" \