diff options
| author | Andrei Belov <defan@nginx.com> | 2018-09-20 16:14:29 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2018-09-20 16:14:29 +0300 |
| commit | fea05e30653a4c660d538cc6915494d7145ad969 (patch) | |
| tree | e36ff5b55bc54e899a7120c16b9962e412e33cf1 /pkg | |
| parent | 510c2e15c5b55a48f15f0ba680c5e82a2db5456f (diff) | |
| download | unit-fea05e30653a4c660d538cc6915494d7145ad969.tar.gz unit-fea05e30653a4c660d538cc6915494d7145ad969.tar.bz2 | |
Packages: enabled OpenSSL support.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/deb/Makefile | 5 | ||||
| -rw-r--r-- | pkg/deb/debian/control | 3 | ||||
| -rw-r--r-- | pkg/rpm/Makefile | 7 | ||||
| -rw-r--r-- | pkg/rpm/unit.spec.in | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 54fd6475..735f283b 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -12,7 +12,7 @@ SRCDIR= unit-$(VERSION) CODENAME = $(shell lsb_release -cs) -BUILD_DEPENDS_unit = build-essential debhelper devscripts fakeroot libxml2-utils lintian lsb-release xsltproc +BUILD_DEPENDS_unit = build-essential debhelper devscripts fakeroot libxml2-utils lintian lsb-release xsltproc libssl-dev BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= @@ -93,7 +93,8 @@ CONFIGURE_ARGS=\ --control="unix:/var/run/control.unit.sock" \ --pid=/var/run/unit.pid \ --log=/var/log/unit.log \ - --tests + --tests \ + --openssl export CR=\\n diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control index 4e18f03d..e1b1bde8 100644 --- a/pkg/deb/debian/control +++ b/pkg/deb/debian/control @@ -3,7 +3,8 @@ Section: admin Priority: extra Maintainer: Andrei Belov <defan@nginx.com> Build-Depends: debhelper (>= 9), - linux-libc-dev + linux-libc-dev, + libssl-dev Standards-Version: 3.9.5 Homepage: https://unit.nginx.org diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 656eea0b..ef7f3361 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -37,9 +37,9 @@ BUILD_DEPENDS_unit += system-rpm-config endif ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) -BUILD_DEPENDS_unit += libxml2-tools libxslt1 +BUILD_DEPENDS_unit += libxml2-tools libxslt1 libopenssl-devel else -BUILD_DEPENDS_unit += libxml2 libxslt +BUILD_DEPENDS_unit += libxml2 libxslt openssl-devel endif BUILD_DEPENDS = $(BUILD_DEPENDS_unit) @@ -101,7 +101,8 @@ CONFIGURE_ARGS=\ --control="unix:/var/run/control.unit.sock" \ --pid=/var/run/unit.pid \ --log=/var/log/unit.log \ - --tests + --tests \ + --openssl export CR=\\n diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 12327449..c7586eeb 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -5,19 +5,22 @@ %if ( 0%{?rhel} == 5 || 0%{?rhel} == 6 ) Requires: initscripts >= 8.36 +BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 Requires: systemd BuildRequires: systemd-units +BuildRequires: openssl-devel %if 0%{?amzn} == 0 %define dist .el7 %endif %endif -%if 0%{?suse_version} == 1315 +%if 0%{?suse_version} >= 1315 BuildRequires: systemd Requires: systemd +BuildRequires: libopenssl-devel %endif %define CC_OPT %{optflags} -fPIC |