/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 debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2014-03-06 02:26:04 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 311.
  • Revision ID: teddy@recompile.se-20140306022604-4uc43taz25cflgi3
Bug fix: Free all memory and give better messages when memory is full.

* plugin-runner.c (add_to_char_array): Bug fix: If realloc fails, do
                                       not change old array pointer.
  (add_environment): Bug fix: If realloc fails, do not change old
                     environment pointer.  Also rename "e" to "envdef"
                     for clarity.
  (main): Bug fix: If realloc fails, do not change old pointers.  Also
          wrap "#pragma GCC" with "#ifdef ___GNUC___".
* plugins.d/mandos-client.c (incbuffer): Bug fix: if realloc fails,
                                         free old buffer.
  (run_network_hooks): Moved variables "directory" and "ret" to their
                       innermost possible scope.
  (take_down_interface): Moved variables "sd", "ret_errno", and
                         "ret_setflags" to their innermost possible
                         scope.
  (main): Removed variable "interfaces_hooks_size".  Also, if argz_add
          fails when adding all found interfaces, the error message
          will now be correct.  Also print error message if, after
          having taken up an interface, argz_add fails to add
          interface to list of interfaces to be taken down.
* plugins.d/mandos-client.xml (OPTIONS): Explain better what "none"
                                         means as argument to
                                         "--interface" by negating
                                         sense.
* plugins.d/password-prompt.c (fprintf_plus): Removed (unused).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
1
1
#!/usr/bin/make -f
2
 
 
3
 
ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
4
 
    MAKEFLAGS += OPTIMIZE=-O0
5
 
endif
6
 
 
7
 
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
8
 
    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
9
 
    MAKEFLAGS += -j$(NUMJOBS)
10
 
endif
11
 
 
12
 
PKG_CONFIG?=pkg-config
13
 
 
14
2
%:
15
3
        dh $@
16
4
 
17
 
override_dh_installdirs-indep:
18
 
        dh_installdirs
19
 
        dh_installdirs $(patsubst /%,%,$(shell $(PKG_CONFIG) \
20
 
                systemd --variable=systemdsystemunitdir)) \
21
 
                $(patsubst /%,%,$(shell $(PKG_CONFIG) \
22
 
                systemd --variable=tmpfilesdir)) \
23
 
                $(patsubst /%,%,$(shell $(PKG_CONFIG) \
24
 
                systemd --variable=sysusersdir))
25
 
 
26
 
override_dh_installdirs-arch:
27
 
        dh_installdirs
28
 
        dh_installdirs $(patsubst /%,%,$(shell $(PKG_CONFIG) \
29
 
                systemd --variable=sysusersdir))
30
 
 
31
5
override_dh_auto_build-arch:
32
6
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
33
7
 
45
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
46
20
                install-client-nokey
47
21
 
48
 
override_dh_fixperms-arch:
 
22
override_dh_fixperms:
49
23
        dh_fixperms --exclude etc/keys/mandos \
 
24
                --exclude etc/mandos/clients.conf \
50
25
                --exclude etc/mandos/plugins.d \
51
 
                --exclude etc/mandos/plugin-helpers \
52
 
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugins.d \
53
 
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugin-helpers \
54
 
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d/
 
26
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
 
27
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
55
28
        chmod --recursive g-w -- \
56
29
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
57
 
 
58
 
override_dh_fixperms-indep:
59
 
        dh_fixperms --exclude etc/mandos/clients.conf
60
 
 
61
 
override_dh_auto_test-arch: ;
62
 
 
63
 
#bpo## dpkg-shlibdeps sees the "libgnutls28-dev (>= 3.6.6) |
64
 
#bpo## libgnutls28-dev (<< 3.6.0)," in the build-dependencies not as two
65
 
#bpo## alternatives, but as an absolute dependency on libgnutls30 >= 3.6.6.
66
 
#bpo## So we have to do this ugly hack to hide this build dependency if we
67
 
#bpo## compiled with libgnutls30 << 3.6.0.
68
 
#bpo#override_dh_shlibdeps-arch:
69
 
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
70
 
#bpo#           --show libgnutls30); \
71
 
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
72
 
#bpo#           && { cp --archive debian/control debian/control.orig; sed --in-place --expression='s/libgnutls28-dev (>= 3\.6\.6) |//' debian/control; }
73
 
#bpo#   dh_shlibdeps
74
 
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
75
 
#bpo#           --show libgnutls30); \
76
 
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
77
 
#bpo#           && mv debian/control.orig debian/control