diff options
| author | Romain Francoise <rfrancoise@debian.org> | 2014-07-26 10:57:18 +0200 |
|---|---|---|
| committer | Romain Francoise <rfrancoise@debian.org> | 2014-07-26 10:57:18 +0200 |
| commit | 6e408eb31340230d4c57da34aeab640098c78d1a (patch) | |
| tree | 079e71013865f537e1c100deb6dae288af2377e4 | |
| parent | d5dc988a10f44a08f0b85e85d23abbd84c06a927 (diff) | |
| download | vyos-strongswan-6e408eb31340230d4c57da34aeab640098c78d1a.tar.gz vyos-strongswan-6e408eb31340230d4c57da34aeab640098c78d1a.zip | |
Don't rely on pkg-config based systemd detection
Build-depending on systemd to get the pkg-config detection to work would
obviously fail on !linux archs, so just hardcode the location of systemd
system units instead…
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | debian/rules | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index adbc5ddb8..7eff6689d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,11 @@ strongswan (5.2.0-2) UNRELEASED; urgency=medium + Alias strongswan.service to ipsec.service to match the sysv init script. + Drop After=syslog.target, as syslog is socket-activated nowadays. + Add ExecReload for reload action, since the starter script has one. - + On linux-any, add build-dep on systemd to ensure that the pkg-config - metadata file can be found. + + 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@debian.org> Fri, 25 Jul 2014 22:51:04 +0200 + -- Romain Francoise <rfrancoise@debian.org> Sat, 26 Jul 2014 10:46:04 +0200 strongswan (5.2.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index ddf690548..934db0f37 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.2), libtool, libgmp3-dev, libfcgi-dev, clearsilver-dev, libgcrypt20-dev | libgcrypt11-dev, libxml2-dev, libsqlite3-dev, network-manager-dev (>= 0.7) [linux-any], libnm-glib-vpn-dev (>= 0.7) [linux-any], libnm-util-dev (>= 0.7) [linux-any], - gperf, libcap-dev [linux-any], dh-autoreconf, pkg-config, - systemd [linux-any], dh-systemd (>= 1.5) + gperf, libcap-dev [linux-any], dh-autoreconf, pkg-config, dh-systemd (>= 1.5) Homepage: http://www.strongswan.org Package: strongswan diff --git a/debian/rules b/debian/rules index 8af4d3d30..447250857 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \ + --with-systemdsystemunitdir=/lib/systemd/system \ --enable-ldap --enable-curl \ --enable-pkcs11 \ --enable-mediation --enable-medsrv --enable-medcli \ |