Skip to content

Commit

Permalink
Add support for openSUSE
Browse files Browse the repository at this point in the history
  • Loading branch information
fepitre committed Jun 29, 2021
1 parent c636c53 commit 250ca3b
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 5 deletions.
2 changes: 2 additions & 0 deletions agent/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ else ifeq ($(os), Ubuntu)
install -D -m 0644 qrexec.pam.debian $(DESTDIR)/etc/pam.d/qrexec
else ifeq ($(os), Arch)
install -D -m 0644 qrexec.pam.archlinux $(DESTDIR)/etc/pam.d/qrexec
else ifeq ($(os), openSUSE)
install -D -m 0644 qrexec.pam.opensuse $(DESTDIR)/etc/pam.d/qrexec
else
install -D -m 0644 qrexec.pam $(DESTDIR)/etc/pam.d/qrexec
endif
Expand Down
7 changes: 7 additions & 0 deletions agent/qrexec.pam.opensuse
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#%PAM-1.0
auth sufficient pam_rootok.so
auth substack common-auth
account sufficient pam_succeed_if.so uid = 0 use_uid quiet
account include common-auth
password include common-auth
session include common-auth
4 changes: 4 additions & 0 deletions rpm_spec/qubes-qrexec-vm.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ BuildRequires: qubes-core-qrexec-devel
BuildRequires: lsb-core-noarch
BuildRequires: systemd-devel

%if 0%{?suse_version} > 0
Requires: %{python3_default}
%else
Requires: python%{python3_pkgversion}
%endif
Requires: qubes-core-qrexec = %{version}-%{release}

Provides: qubes-core-agent-qrexec = 4.1.0-1
Expand Down
24 changes: 19 additions & 5 deletions rpm_spec/qubes-qrexec.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,30 @@ License: GPL
URL: http://www.qubes-os.org

BuildRequires: gcc
BuildRequires: qubes-libvchan-devel

%if 0%{?suse_version} > 0
BuildRequires: sphinx
BuildRequires: python3
BuildRequires: %{python3_default}-pydbus
# for building documentation
BuildRequires: %{python3_default}-Sphinx
BuildRequires: %{python3_default}-recommonmark

Requires: %{python3_default}
Requires: %{python3_default}-gbulb
%else
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-dbus
# for building documentation
BuildRequires: python%{python3_pkgversion}-sphinx
BuildRequires: python%{python3_pkgversion}-recommonmark
BuildRequires: qubes-libvchan-devel
BuildRequires: python%{python3_pkgversion}-rpm-macros

Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-gbulb
Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-gbulb
%endif

Conflicts: qubes-utils-libs < 4.1.0
Conflicts: qubes-core-agent-qrexec < 4.1.0
Conflicts: qubes-core-dom0 < 4.1.10
Expand Down Expand Up @@ -79,7 +93,7 @@ Development header and files for qubes-qrexec
%build
%{?set_build_flags}
make all-base PYTHON=%{__python3}
make -C doc PYTHON=python3 SPHINXBUILD=sphinx-build-3 man
make -C doc PYTHON=python3 SPHINXBUILD=sphinx-build-%{python3_version} man

%install
make install-base \
Expand All @@ -93,7 +107,7 @@ make install-base \

make -C doc \
DESTDIR=$RPM_BUILD_ROOT \
SPHINXBUILD=sphinx-build-3 \
SPHINXBUILD=sphinx-build-%{python3_version} \
install

%clean
Expand Down

0 comments on commit 250ca3b

Please sign in to comment.