[Pkg-swan-devel] [strongswan] 01/01: Use After=network.target

[Romain Francoise]

This is an automated email from the git hooks/post-receive script.

rfrancoise pushed a commit to branch master
in repository strongswan.

commit 1e90ef71efd5f3e487b48cd20e0eff94dbe6b822
Author: Romain Francoise <rfrancoise at debian.org>
Date:   Sat Jul 26 17:56:25 2014 +0200

    Use After=network.target
    
    Primarily because otherwise the network may go down before charon gets
    the opportunity to send deletes on exit, and it matches what the old
    init script did.
    
    Note that in Debian, network.target apparently runs after ifup so the
    network is in most cases really up, so we don't need
    network-online.target. (And charon uses rtnetlink to get notified of
    changes anyway.)
---
 debian/changelog                        | 6 ++++--
 debian/patches/03_systemd-service.patch | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7eff668..951a814 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,13 +3,15 @@ strongswan (5.2.0-2) UNRELEASED; urgency=medium
   * Add systemd integration:
     + Install upstream systemd service file in strongswan-starter.
     + Alias strongswan.service to ipsec.service to match the sysv init script.
-    + Drop After=syslog.target, as syslog is socket-activated nowadays.
+    + Drop After=syslog.target (as syslog is socket-activated nowadays), but
+      add After=network.target to ensure that charon gets the chance to send
+      deletes on exit.
     + Add ExecReload for reload action, since the starter script has one.
     + Add --with-systemdsystemunitdir to configure options.
     + Add build-dep on dh-systemd, and use systemd dh addon.
   * Remove debian/patches/03_include-stdint.patch.
 
- -- Romain Francoise <rfrancoise at debian.org>  Sat, 26 Jul 2014 10:46:04 +0200
+ -- Romain Francoise <rfrancoise at debian.org>  Sat, 26 Jul 2014 17:54:05 +0200
 
 strongswan (5.2.0-1) unstable; urgency=medium
 
diff --git a/debian/patches/03_systemd-service.patch b/debian/patches/03_systemd-service.patch
index bcf5812..d118590 100644
--- a/debian/patches/03_systemd-service.patch
+++ b/debian/patches/03_systemd-service.patch
@@ -1,9 +1,10 @@
 --- a/init/systemd/strongswan.service.in
 +++ b/init/systemd/strongswan.service.in
-@@ -1,10 +1,11 @@
+@@ -1,10 +1,12 @@
  [Unit]
  Description=strongSwan IPsec
 -After=syslog.target
++After=network.target
  
  [Service]
  ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git