disable socket_wrapper on archs where it causes problems

This is needed for certain tests

.gitignore

@@ -229,11 +229,3 @@
 /ocserv-1.1.0.tar.xz.sig
 /ocserv-1.1.1.tar.xz
 /ocserv-1.1.1.tar.xz.sig
-/ocserv-1.1.2.tar.xz
-/ocserv-1.1.2.tar.xz.sig
-/ocserv-1.1.3.tar.xz
-/ocserv-1.1.3.tar.xz.sig
-/ocserv-1.1.4.tar.xz
-/ocserv-1.1.4.tar.xz.sig
-/ocserv-1.1.6.tar.xz.sig
-/ocserv-1.1.6.tar.xz

ocserv.conf

@@ -89,6 +89,12 @@ auth = "pam"
 tcp-port = 443
 udp-port = 443
 
+# Accept connections using a socket file. It accepts HTTP
+# connections (i.e., without SSL/TLS unlike its TCP counterpart),
+# and uses it as the primary channel. That option cannot be
+# combined with certificate authentication.
+#listen-clear-file = /var/run/ocserv-conn.socket
+
 # The user the worker processes will be run as. It should be
 # unique (no other services run as this user).
 run-as-user = ocserv

ocserv.spec

@@ -1,5 +1,5 @@
-Version:	1.1.6
-Release: 3%{?dist}
+Version:	1.1.1
+Release: 1%{?dist}
 %global _hardened_build 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -18,6 +18,12 @@ Release: 3%{?dist}
 %define use_geoip 1
 %endif
 
+%if 0%{?rhel} && 0%{?rhel} == 8
+%define use_http_parser 0
+%else
+%define use_http_parser 1
+%endif
+
 %define use_local_protobuf 0
 
 Name:		ocserv
@@ -42,7 +48,6 @@ Source11:	ocserv.init
 # Taken from upstream:
 # http://git.infradead.org/ocserv.git/commitdiff/7d70006a2dbddf783213f1856374bacc74217e09
 
-BuildRequires: make
 BuildRequires:	gcc
 %if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:	gnutls30-devel
@@ -62,9 +67,12 @@ BuildRequires:	libnl3-devel
 BuildRequires:	krb5-devel
 BuildRequires:	libtasn1-devel
 BuildRequires:	gperf
+BuildRequires:	pcllib-devel
 BuildRequires:	libtalloc-devel
 BuildRequires:	libev-devel
+%if %{use_http_parser}
 BuildRequires:	http-parser-devel
+%endif
 
 %if %{use_libwrap}
 BuildRequires:	tcp_wrappers-devel
@@ -105,7 +113,7 @@ BuildRequires:	libseccomp-devel
 
 # no rubygem in epel7
 %if 0%{?fedora}
-BuildRequires:	rubygem-ronn-ng
+BuildRequires:	rubygem(ronn)
 %endif
 
 Recommends:		gnutls-utils
@@ -140,12 +148,15 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} || gpgv2 --keyring %{SOURCE10}
 
 %autosetup -p1
 
+%if %{use_http_parser}
 rm -f src/http-parser/http_parser.c src/http-parser/http_parser.h
+%endif
 %if (0%{?use_local_protobuf} == 0)
 rm -rf src/protobuf/protobuf-c/
 touch src/*.proto
 %endif
 rm -rf src/ccan/talloc
+rm -f src/pcl/*.c src/pcl/*.h
 sed -i 's|/etc/ocserv.conf|/etc/ocserv/ocserv.conf|g' src/config.c
 sed -i 's/run-as-group = nogroup/run-as-group = nobody/g' tests/data/*.config
 # GPLv3 in headers is a gnulib bug: 
@@ -168,7 +179,6 @@ autoreconf -fvi
 %endif
 
 %configure \
-        --without-pcl-lib \
 %if %{use_systemd}
 	--enable-systemd \
 %else
@@ -177,13 +187,16 @@ autoreconf -fvi
 %if %{use_local_protobuf}
 	--without-protobuf \
 %endif
+%if ! %{use_http_parser}
+	--without-http-parser \
+%endif
 %if %{use_libwrap}
 	--with-libwrap
 %else
 	--without-libwrap
 %endif
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %pre
 getent group ocserv &>/dev/null || groupadd -r ocserv
@@ -250,7 +263,7 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/ocserv
 %config(noreplace) %{_localstatedir}/lib/ocserv/profile.xml
 
-%doc AUTHORS ChangeLog NEWS COPYING LICENSE README.md PACKAGE-LICENSING
+%doc AUTHORS ChangeLog NEWS COPYING LICENSE README.md TODO PACKAGE-LICENSING
 %doc src/ccan/licenses/CC0 src/ccan/licenses/LGPL-2.1 src/ccan/licenses/BSD-MIT
 
 %{_mandir}/man8/ocserv.8*
@@ -272,60 +285,7 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %endif
 
 %changelog
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Feb 17 2022 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.6-1
-- Updated to 1.1.6
-
-* Thu Feb 10 2022 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.4-3
-- Update seccomp rules to allow the futex syscall
-- Workaround incompatible API change in GnuTLS 3.7.3.
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Nov 13 2021 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.4-1
-- Update to upstream 1.1.4 release
-
-* Sat Nov 06 2021 Adrian Reber <adrian@lisas.de> - 1.1.3-4
-- Rebuilt for protobuf 3.19.0
-
-* Tue Oct 26 2021 Adrian Reber <adrian@lisas.de> - 1.1.3-3
-- Rebuilt for protobuf 3.18.1
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jun  2 2021 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.3-1
-- Updated to latest release
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 08:31:24 CET 2021 Adrian Reber <adrian@lisas.de> - 1.1.2-2
-- Rebuilt for protobuf 3.14
-
-* Sun Dec  6 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.2-1
-- Update to upstream 1.1.2 release
-
-* Mon Nov 23 2020 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.1.1-5
-- Rebuilt for ronn successor
-
-* Wed Nov 11 2020 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.1.1-4
-- Rebuilt for radcli 1.3.0
-
-* Thu Oct 29 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.1-3
-- Rebuild without pcllib dependency
-- Enhanced seccomp filters for tests to run in all architectures
-
-* Thu Sep 24 2020 Adrian Reber <adrian@lisas.de> - 1.1.1-2
-- Rebuilt for protobuf 3.13
-
-* Mon Sep 21 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.1-1
+* Thu Sep 21 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.1-1
 - Update to upstream 1.1.1 release
 - Set default priorities to NORMAL as using @SYSTEM is no longer necessary
   to follow crypto policies.

sources

@@ -1,2 +1,2 @@
-SHA512 (ocserv-1.1.6.tar.xz.sig) = 2a87768ad63d40053732fa011bbeb3532c9673296b9be299bf8f7d8dd3dd35571eee96c0b4fa9bf5a30633b4c844337ab3d562d6ea2b6ad8efca084eb5e6f502
-SHA512 (ocserv-1.1.6.tar.xz) = d1c5e5cf0e84aab168ed51516534df8b2968194dd1421f33563c61b3e47d5d79ebe9e6ffbf7cbcc9ff1242fae05151024f70ef586d063bec0b3eec00050bfdfa
+SHA512 (ocserv-1.1.1.tar.xz) = 1173416f0d32f9faf98e539c8e73316a50ac93b519d1ade19374a3df865d10d975e13ac53e0c5a5e77c80f3605d7a810287b18b85b798887d227389761b54220
+SHA512 (ocserv-1.1.1.tar.xz.sig) = 9fe0f3e2ea4daaf1d053c2cdc87d38dc8256feb11c16f93e7e677500457914a82e659901f77f6ec4ca175fceeec74e3f8d001412c969c18dcf486545bac83393