diff options
| author | Yves-Alexis Perez <corsac@corsac.net> | 2012-07-01 13:17:12 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@corsac.net> | 2012-07-01 13:17:12 +0200 |
| commit | 32e938b2b8264f50317fe5e52c9fd15dbb7f2b30 (patch) | |
| tree | 61a08299ef10ea8f5b3c00eabcd1d8e197d1e047 /debian | |
| parent | 0375399284bb7da6c6cfa9657ca1069a04869e25 (diff) | |
| download | vyos-strongswan-32e938b2b8264f50317fe5e52c9fd15dbb7f2b30.tar.gz vyos-strongswan-32e938b2b8264f50317fe5e52c9fd15dbb7f2b30.zip | |
correctly handle logcheck rules install
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/libstrongswan.logcheck.ignore.paranoid (renamed from debian/logcheck.ignore.paranoid) | 0 | ||||
| -rw-r--r-- | debian/libstrongswan.logcheck.ignore.server (renamed from debian/logcheck.ignore.server) | 0 | ||||
| -rw-r--r-- | debian/libstrongswan.logcheck.ignore.workstation | 25 | ||||
| -rw-r--r-- | debian/libstrongswan.logcheck.violations.ignore (renamed from debian/logcheck.violations.ignore) | 0 | ||||
| -rwxr-xr-x | debian/rules | 6 |
6 files changed, 29 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 14461488c..b8d67cf0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ strongswan (4.6.4-5) UNRELEASED; urgency=low * debian/control: - and finally libcap-dev linux-any too... + * debian/rules: + - stop installing logcheck rules manually. + * Handle logcheck files from dh_installlogcheck and thus name them correctly + so they are not installed in the wrong package. closes: #679745 -- Yves-Alexis Perez <corsac@debian.org> Sat, 30 Jun 2012 21:53:28 +0200 diff --git a/debian/logcheck.ignore.paranoid b/debian/libstrongswan.logcheck.ignore.paranoid index ca6c97dde..ca6c97dde 100644 --- a/debian/logcheck.ignore.paranoid +++ b/debian/libstrongswan.logcheck.ignore.paranoid diff --git a/debian/logcheck.ignore.server b/debian/libstrongswan.logcheck.ignore.server index 7ab04c524..7ab04c524 100644 --- a/debian/logcheck.ignore.server +++ b/debian/libstrongswan.logcheck.ignore.server diff --git a/debian/libstrongswan.logcheck.ignore.workstation b/debian/libstrongswan.logcheck.ignore.workstation new file mode 100644 index 000000000..7ab04c524 --- /dev/null +++ b/debian/libstrongswan.logcheck.ignore.workstation @@ -0,0 +1,25 @@ +ipsec_setup: KLIPS debug \`none\' +ipsec_setup: Stopping FreeS/WAN IPsec\.\.\. +ipsec_setup: stop ordered +ipsec_setup: doing cleanup anywan... +ipsec_setup: \.\.\.FreeS/WAN IPsec stopped +ipsec_setup: Starting FreeS/WAN IPsec +ipsec_setup: \.\.\.FreeS/WAN IPsec started +ipsec_plutorun: .*: initiate +pluto.*: deleting state +pluto.*: forgetting secrets +pluto.*: shutting down +pluto.*: \| +pluto.*: .* bytes loaded +pluto.*: including X\.509 patch +pluto.*: Loading my X\.509 certificate +pluto.*: Starting pluto +pluto.*: added connection description +pluto.*: adding interface +pluto.*: listening for IKE messages +pluto.*: loading secrets +pluto.*: .* SA established +pluto.*: .* SA expired +pluto.*: replacing stale .* SA +pluto.*: initiating Quick Mode +pluto.*: regenerating DH private secret diff --git a/debian/logcheck.violations.ignore b/debian/libstrongswan.logcheck.violations.ignore index 1a190fc28..1a190fc28 100644 --- a/debian/logcheck.violations.ignore +++ b/debian/libstrongswan.logcheck.violations.ignore diff --git a/debian/rules b/debian/rules index 5e25a8502..373264e9e 100755 --- a/debian/rules +++ b/debian/rules @@ -84,12 +84,6 @@ endif rm -rf $(CURDIR)/debian/openswan/var/lock rm -rf $(CURDIR)/debian/openswan/var/run - # the logcheck ignore files - install -D --mode=0600 $(CURDIR)/debian/logcheck.ignore.paranoid $(CURDIR)/debian/libstrongswan/etc/logcheck/ignore.d.paranoid/strongswan - install -D --mode=0600 $(CURDIR)/debian/logcheck.ignore.server $(CURDIR)/debian/libstrongswan/etc/logcheck/ignore.d.server/strongswan - install -D --mode=0600 $(CURDIR)/debian/logcheck.ignore.server $(CURDIR)/debian/libstrongswan/etc/logcheck/ignore.d.workstation/strongswan - install -D --mode=0600 $(CURDIR)/debian/logcheck.violations.ignore $(CURDIR)/debian/libstrongswan/etc/logcheck/violations.ignore.d/strongswan - # more lintian cleanups find $(CURDIR)/debian/*strongswan*/ -name ".cvsignore" | xargs --no-run-if-empty rm -f find $(CURDIR)/debian/*strongswan*/ -name "/.svn/" | xargs --no-run-if-empty rm -rf |