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

  • Committer: Teddy Hogeborn
  • Date: 2014-03-06 02:26:04 UTC
  • 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
 
# Sample debian/rules that uses debhelper.
3
 
#
4
 
# This file was originally written by Joey Hess and Craig Small.
5
 
# As a special exception, when this file is copied by dh-make into a
6
 
# dh-make output file, you may use that output file without restriction.
7
 
# This special exception was added by Craig Small in version 0.37 of dh-make.
8
 
#
9
 
# Modified to make a template file for a multi-binary package with separated
10
 
# build-arch and build-indep targets  by Bill Allombert 2001
11
 
 
12
 
# Uncomment this to turn on verbose mode.
13
 
#export DH_VERBOSE=1
14
 
 
15
 
# This has to be exported to make some magic below work.
16
 
export DH_OPTIONS
17
 
 
18
 
configure: configure-stamp
19
 
configure-stamp:
20
 
        dh_testdir
21
 
        touch configure-stamp
22
 
 
23
 
build: build-arch build-indep
24
 
 
25
 
build-arch: build-arch-stamp
26
 
build-arch-stamp: configure-stamp
27
 
        dh_auto_build -- all doc
28
 
        touch $@
29
 
 
30
 
build-indep: build-indep-stamp
31
 
build-indep-stamp: configure-stamp
32
 
        dh_auto_build -- doc
33
 
        touch $@
34
 
 
35
 
clean:
36
 
        dh_testdir
37
 
        dh_testroot
38
 
        rm -f build-arch-stamp build-indep-stamp configure-stamp
39
 
        dh_auto_clean
40
 
        dh_clean
41
 
 
42
 
install: install-indep install-arch
43
 
install-indep:
44
 
        dh_testdir
45
 
        dh_testroot
46
 
        dh_prep
47
 
        dh_installdirs --indep
 
2
%:
 
3
        dh $@
 
4
 
 
5
override_dh_auto_build-arch:
 
6
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
 
7
 
 
8
override_dh_auto_build-indep:
 
9
        LC_ALL=en_US.utf8 dh_auto_build -- doc
 
10
 
 
11
override_dh_installinit-indep:
 
12
        dh_installinit --onlyscripts \
 
13
                --update-rcd-params="defaults 25 15"
 
14
 
 
15
override_dh_auto_install-indep:
48
16
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
49
 
        dh_lintian
50
 
        dh_installinit --onlyscripts --no-start \
51
 
                --update-rcd-params="defaults 25 15"
52
 
        dh_install --indep
53
 
 
54
 
install-arch:
55
 
        dh_testdir
56
 
        dh_testroot
57
 
        dh_prep
58
 
        dh_installdirs --same-arch
59
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client install-client-nokey
60
 
        dh_lintian
61
 
        dh_install --same-arch
62
 
 
63
 
binary-common:
64
 
        dh_testdir
65
 
        dh_testroot
66
 
        dh_installchangelogs
67
 
        dh_installdocs
68
 
        dh_link
69
 
        dh_strip
70
 
        dh_compress
 
17
 
 
18
override_dh_auto_install-arch:
 
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
 
20
                install-client-nokey
 
21
 
 
22
override_dh_fixperms:
71
23
        dh_fixperms --exclude etc/keys/mandos \
72
24
                --exclude etc/mandos/clients.conf \
73
25
                --exclude etc/mandos/plugins.d \
74
 
                --exclude usr/lib/mandos/plugins.d
75
 
        dh_installdeb
76
 
        dh_shlibdeps
77
 
        dh_gencontrol
78
 
        dh_md5sums
79
 
        dh_builddeb
80
 
 
81
 
# Build architecture independant packages using the common target.
82
 
binary-indep: build-indep install-indep
83
 
        $(MAKE) -f debian/rules DH_OPTIONS=--indep binary-common
84
 
 
85
 
# Build architecture dependant packages using the common target.
86
 
binary-arch: build-arch install-arch
87
 
        $(MAKE) -f debian/rules DH_OPTIONS=--same-arch binary-common
88
 
 
89
 
binary: binary-arch binary-indep
90
 
 
91
 
.PHONY: build clean binary-indep binary-arch binary install \
92
 
                install-indep install-arch configure
 
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
 
28
        chmod --recursive g-w -- \
 
29
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"