updated to 1.1.0

- Update to upstream 1.0.1 release

.gitignore

@@ -227,27 +227,3 @@
 /ocserv-1.0.1.tar.xz
 /ocserv-1.1.0.tar.xz
 /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-1.1.7.tar.xz
-/ocserv-1.1.7.tar.xz.sig
-/ocserv-1.2.0.tar.xz
-/ocserv-1.2.0.tar.xz.sig
-/ocserv-1.2.1.tar.xz
-/ocserv-1.2.1.tar.xz.sig
-/ocserv-1.2.2.tar.xz
-/ocserv-1.2.2.tar.xz.sig
-/ocserv-1.2.4.tar.xz
-/ocserv-1.2.4.tar.xz.sig
-/ocserv-1.3.0.tar.xz
-/ocserv-1.3.0.tar.xz.sig
-/ocserv-1.4.0.tar.xz
-/ocserv-1.4.0.tar.xz.sig

.packit.yaml

@@ -1,26 +0,0 @@
-upstream_project_url: https://gitlab.com/openconnect/ocserv
-issue_repository: https://gitlab.com/openconnect/ocserv
-copy_upstream_release_description: true
-downstream_package_name: ocserv
-
-jobs:
-- job: pull_from_upstream
-  trigger: release
-  dist_git_branches:
-    - fedora-all
-    - epel-8
-    - epel-9
-
-- job: koji_build
-  trigger: commit
-  dist_git_branches:
-    - fedora-all
-    - epel-8
-    - epel-9
-
-- job: bodhi_update
-  trigger: commit
-  dist_git_branches:
-    - fedora-branched # rawhide updates are created automatically
-    - epel-8
-    - epel-9

README.packit

@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 1.13.0.post1.dev2+g84134016c.

ocserv-genkey

@@ -1,25 +1,9 @@
 #!/bin/sh
-#default key type:rsa
-KEY_TYPE="rsa"
-
-#check key type 'rsa', 'rsa-pss', 'dsa', 'ecdsa', 'ed25519, 'ed448', 'x25519', and 'x448'
-if [ $# -gt 0 ]; then
-    case "$1" in
-        rsa|rsa-pss|dsa|ecdsa|ed25519|ed448|x25519|x448)
-            KEY_TYPE="$1"
-            ;;
-        *)
-            echo "Usage: $0 [rsa|rsa-pss|dsa|ecdsa|ed25519|ed448|x25519|x448]"
-            echo "Default key type: rsa"
-            exit 1
-            ;;
-    esac
-fi
 
 #generate CA certificate/key
 if test ! -f /etc/pki/ocserv/private/ca.key;then
 mkdir -p /etc/pki/ocserv/private
-certtool --generate-privkey --key-type=$KEY_TYPE --outfile /etc/pki/ocserv/private/ca.key >/dev/null 2>&1
+certtool --generate-privkey --outfile /etc/pki/ocserv/private/ca.key >/dev/null 2>&1
 echo "cn=`hostname -f` CA" >/etc/pki/ocserv/ca.tmpl
 echo "expiration_days=-1" >>/etc/pki/ocserv/ca.tmpl
 echo "serial=1" >>/etc/pki/ocserv/ca.tmpl
@@ -33,7 +17,7 @@ fi
 
 #generate server certificate/key
 if test ! -f /etc/pki/ocserv/private/server.key;then
-certtool --generate-privkey --key-type=$KEY_TYPE --outfile /etc/pki/ocserv/private/server.key >/dev/null 2>&1
+certtool --generate-privkey --outfile /etc/pki/ocserv/private/server.key >/dev/null 2>&1
 echo "cn=`hostname -f`" >/etc/pki/ocserv/server.tmpl
 echo "serial=2" >>/etc/pki/ocserv/server.tmpl
 echo "expiration_days=-1" >>/etc/pki/ocserv/server.tmpl

ocserv.conf

@@ -34,7 +34,7 @@
 # and all configuration will be read from radius. That also includes the
 # Acct-Interim-Interval, and Session-Timeout values.
 #
-# See doc/README-radius.md for the supported radius configuration attributes.
+# See doc/README-radius.md for the supported radius configuration atributes.
 #
 # gssapi[keytab=/etc/key.tab,require-local-user-map=true,tgt-freshness-time=900]
 #  The gssapi option allows one to use authentication methods supported by GSSAPI,
@@ -72,29 +72,31 @@ auth = "pam"
 # Only one accounting method can be specified.
 #acct = "radius[config=/etc/radiusclient/radiusclient.conf]"
 
-# Use listen-host to limit to specific IPs or to the IPs of a provided
+# Use listen-host to limit to specific IPs or to the IPs of a provided 
 # hostname.
 #listen-host = [IP|HOSTNAME]
 
-# Use udp-listen-host to limit udp to specific IPs or to the IPs of a provided
-# hostname. if not set, listen-host will be used
-#udp-listen-host = [IP|HOSTNAME]
-
 # When the server has a dynamic DNS address (that may change),
 # should set that to true to ask the client to resolve again on
 # reconnects.
 #listen-host-is-dyndns = true
 
-# move the listen socket within the specified network namespace
-# listen-netns = "foo"
+# Use udp-listen-host to limit udp to specific IPs or to the IPs of a provided
+# hostname. if not set, listen-host will be used
+#udp-listen-host = [IP|HOSTNAME]
 
 # TCP and UDP port number
 tcp-port = 443
 udp-port = 443
 
-# The user the worker processes will be run as. This should be a dedicated
-# unprivileged user (e.g., 'ocserv') and no other services should run as this
-# user.
+# 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
 run-as-group = ocserv
 
@@ -152,10 +154,7 @@ server-key = /etc/pki/ocserv/private/server.key
 # is set.
 #ca-cert = /etc/ocserv/ca.pem
 
-# The number of sub-processes to use for the security module (authentication)
-# processes. Typically this should not be set as the number of processes
-# is determined automatically by the initially set maximum number of clients.
-#sec-mod-scale = 4
+
 
 
 ### All configuration options below this line are reloaded on a SIGHUP.
@@ -174,17 +173,13 @@ server-key = /etc/pki/ocserv/private/server.key
 # Note however, that process isolation is restricted to the specific libc versions
 # the isolation was tested at. If you get random failures on worker processes, try
 # disabling that option and report the failures you, along with system and debugging
-# information at: https://gitlab.com/openconnect/ocserv/issues
+# information at: https://gitlab.com/ocserv/ocserv/issues
 isolate-workers = true
 
-# A banner to be displayed on clients after connection
+# A banner to be displayed on clients
 #banner = "Welcome"
 
-# A banner to be displayed on clients before connection
-#pre-login-banner = "Welcome"
-
-# Limit the number of clients. Unset or set to zero if unknown. In
-# that case the maximum value is ~8k clients.
+# Limit the number of clients. Unset or set to zero for unlimited.
 #max-clients = 1024
 max-clients = 16
 
@@ -200,11 +195,9 @@ max-same-clients = 2
 # is recommended as it is more efficient in parsing.
 #listen-proxy-proto = true
 
-# Rate limit the number of incoming connections to one every X milliseconds
-# (X is the provided value), as the secmod backlog grows. This
-# makes the server more resilient (and prevents connection failures) on
-# multiple concurrent connections. Set to zero for no limit.
-rate-limit-ms = 100
+# Limit the number of client connections to one every X milliseconds 
+# (X is the provided value). Set to zero for no limit.
+#rate-limit-ms = 100
 
 # Stats report time. The number of seconds after which each
 # worker process will report its usage statistics (number of
@@ -246,10 +239,6 @@ switch-to-tcp-timeout = 25
 # MTU discovery (DPD must be enabled)
 try-mtu-discovery = false
 
-# To enable load-balancer connection draining, set server-drain-ms to a value
-# higher than your load-balancer health probe interval.
-#server-drain-ms = 15000
-
 # If you have a certificate from a CA that provides an OCSP
 # service you may provide a fresh OCSP status response within
 # the TLS handshake. That will prevent the client from connecting
@@ -301,13 +290,16 @@ cert-user-oid = 0.9.2342.19200300.100.1.1
 # difference with AES_128_CBC_SHA1 (the default for anyconnect clients)
 # in your system.
 
-# Note that in Fedora gnutls follows crypto policies so insecure options
+# Note that in RHEL gnutls follows crypto policies so insecure options
 # are disabled within it.
-tls-priorities = "NORMAL:%SERVER_PRECEDENCE"
+tls-priorities = "@SYSTEM:%SERVER_PRECEDENCE"
 
 # That option requires the established DTLS channel to use the same
-# cipher as the primary TLS channel.Note also, that this option implies
-# that the dtls-legacy option is false; this option cannot be enforced
+# cipher as the primary TLS channel. This cannot be combined with
+# listen-clear-file since the ciphersuite information is not available
+# in that configuration. Note also, that this option implies that
+# dtls-legacy option is false; this option cannot be enforced
+# in the legacy/compat protocol.
 #match-tls-dtls-ciphers = true
 
 # The time (in seconds) that a client is allowed to stay connected prior
@@ -336,9 +328,11 @@ min-reauth-time = 300
 # that get a score over that configured number are banned for
 # min-reauth-time seconds. By default a wrong password attempt is 10 points,
 # a KKDCP POST is 1 point, and a connection is 1 point. Note that
-# due to different processes being involved the count of points
-# will not be real-time precise. Local subnet IPs are exempt to allow
-# services that check for process health.
+# due to difference processes being involved the count of points
+# will not be real-time precise.
+#
+# Score banning cannot be reliably used when receiving proxied connections
+# locally from an HTTP server (i.e., when listen-clear-file is used).
 #
 # Set to zero to disable.
 max-ban-score = 80
@@ -388,8 +382,7 @@ rekey-method = ssl
 # Script to call when a client connects and obtains an IP.
 # The following parameters are passed on the environment.
 # REASON, VHOST, USERNAME, GROUPNAME, DEVICE, IP_REAL (the real IP of the client),
-# REMOTE_HOSTNAME (the remotely advertised hostname), IP_REAL_LOCAL
-# (the local interface IP the client connected), IP_LOCAL
+# IP_REAL_LOCAL (the local interface IP the client connected), IP_LOCAL
 # (the local IP in the P-t-P connection), IP_REMOTE (the VPN IP of the client),
 # IPV6_LOCAL (the IPv6 local address if there are both IPv4 and IPv6
 # assigned), IPV6_REMOTE (the IPv6 remote address), IPV6_PREFIX, and
@@ -408,12 +401,6 @@ rekey-method = ssl
 #connect-script = /usr/bin/ocserv-script
 #disconnect-script = /usr/bin/ocserv-script
 
-# This script is to be called when the client's advertised hostname becomes
-# available. It will contain REASON with "host-update" value and the
-# variable REMOTE_HOSTNAME in addition to the connect variables.
-
-#host-update-script = /usr/bin/myhostnamescript
-
 # UTMP
 # Register the connected clients to utmp. This will allow viewing
 # the connected clients using the command 'who'.
@@ -426,20 +413,6 @@ use-occtl = true
 # PID file. It can be overridden in the command line.
 pid-file = /var/run/ocserv.pid
 
-# Log Level. Ocserv sends the logging messages to standard error
-# as well as the system log. The log level can be overridden in the
-# command line with the -d option. All messages at the configured
-# level and lower will be displayed.
-# Supported levels (default 0):
-#   0 default (Same as basic)
-#   1 basic
-#   2 info
-#   3 debug
-#   4 http
-#   8 sensitive
-#   9 TLS
-log-level = 3
-
 # Set the protocol-defined priority (SO_PRIORITY) for packets to
 # be sent. That is a number from 0 to 6 with 0 being the lowest
 # priority. Alternatively this can be used to set the IP Type-
@@ -462,8 +435,7 @@ device = vpns
 # same for the same user when possible.
 predictable-ips = true
 
-# The default domain to be advertised. Multiple domains (functional on
-# openconnect clients) can be provided in a space separated list.
+# The default domain to be advertised
 default-domain = example.com
 
 # The pool of addresses that leases will be given from. If the leases
@@ -590,10 +562,10 @@ no-route = 192.168.5.0/255.255.255.0
 # per group. Each file name on these directories must match the username
 # or the groupname.
 # The options allowed in the configuration files are dns, nbns,
-#  ipv?-network, ipv4-netmask, rx/tx-data-per-sec, iroute, route, no-route,
-#  explicit-ipv4, explicit-ipv6, net-priority, deny-roaming, no-udp,
+#  ipv?-network, ipv4-netmask, rx/tx-per-sec, iroute, route, no-route,
+#  explicit-ipv4, explicit-ipv6, net-priority, deny-roaming, no-udp, 
 #  keepalive, dpd, mobile-dpd, max-same-clients, tunnel-all-dns,
-#  restrict-user-to-routes, cgroup, stats-report-time,
+#  restrict-user-to-routes, user-profile, cgroup, stats-report-time,
 #  mtu, idle-timeout, mobile-idle-timeout, restrict-user-to-ports,
 #  split-dns and session-timeout.
 #
@@ -657,13 +629,10 @@ no-route = 192.168.5.0/255.255.255.0
 # </AnyConnectProfile>
 #
 # Other fields may be used by some of the CISCO clients.
-# This file must be accessible from inside the worker's chroot.
-# Note that:
-#  (1) enabling this option is not recommended as it will allow the
-#      worker processes to open arbitrary files (when isolate-workers is
-#      set to true).
-#  (2) This option cannot be set per-user or per-group; only the global
-#      version is being sent to client.
+# This file must be accessible from inside the worker's chroot. 
+# Note that enabling this option is not recommended as it will allow
+# the worker processes to open arbitrary files (when isolate-workers is
+# set to true).
 #user-profile = profile.xml
 
 #
@@ -689,35 +658,6 @@ cisco-client-compat = true
 # by the dtls-psk protocol supported by openconnect 7.08+.
 dtls-legacy = true
 
-# This option will enable the settings needed for Cisco SVC IPPhone clients
-# to connect. It implies dtls-legacy = true and tls-priorities is changed to
-# only the ciphers the device supports.
-cisco-svc-client-compat = false
-
-# This option will enable the X-CSTP-Client-Bypass-Protocol (disabled by default).
-# If the server has not configured an IPv6 or IPv4 address pool, enabling this option
-# will instruct the client to bypass the server for that IP protocol. The option is
-# currently only understood by Anyconnect clients.
-client-bypass-protocol = false
-
-# The following options are related to server camouflage (hidden service)
-
-# This option allows you to enable the camouflage feature of ocserv that makes it look
-# like a web server to unauthorized parties.
-# With "camouflage" enabled, connection to the VPN can be established only if the client provided a specific
-# "secret string" in the connection URL, e.g. "https://example.com/?mysecretkey",
-# otherwise the server will return HTTP error for all requests.
-camouflage = false
-
-# The URL prefix that should be set on the client (after '?' sign) to pass through the camouflage check,
-# e.g. in case of 'mysecretkey', the server URL on the client should be like "https://example.com/?mysecretkey".
-camouflage_secret = "mysecretkey"
-
-# Defines the realm (browser prompt) for HTTP authentication.
-# If no realm is set, the server will return 404 Not found error instead of 401 Unauthorized.
-# Better change it from the default value to avoid fingerprinting.
-camouflage_realm = "Restricted Content"
-
 #Advanced options
 
 # Option to allow sending arbitrary custom headers to the client after
@@ -730,8 +670,8 @@ camouflage_realm = "Restricted Content"
 
 
 
-# An example virtual host with different authentication methods serviced
-# by this server.
+## An example virtual host with different authentication methods serviced
+## by this server.
 
 #[vhost:www.example.com]
 #auth = "certificate"
@@ -748,18 +688,3 @@ camouflage_realm = "Restricted Content"
 #ipv4-netmask = 255.255.255.0
 
 #cert-user-oid = 0.9.2342.19200300.100.1.1
-
-# HTTP headers
-included-http-headers = Strict-Transport-Security: max-age=31536000 ; includeSubDomains
-included-http-headers = X-Frame-Options: deny
-included-http-headers = X-Content-Type-Options: nosniff
-included-http-headers = Content-Security-Policy: default-src 'none'
-included-http-headers = X-Permitted-Cross-Domain-Policies: none
-included-http-headers = Referrer-Policy: no-referrer
-included-http-headers = Clear-Site-Data: "cache","cookies","storage"
-included-http-headers = Cross-Origin-Embedder-Policy: require-corp
-included-http-headers = Cross-Origin-Opener-Policy: same-origin
-included-http-headers = Cross-Origin-Resource-Policy: same-origin
-included-http-headers = X-XSS-Protection: 0
-included-http-headers = Pragma: no-cache
-included-http-headers = Cache-control: no-store, no-cache

ocserv.spec

@@ -1,5 +1,6 @@
-Version:	1.4.0
-Release: %autorelease
+# This spec file has been automatically updated
+Version:	1.1.0
+Release: 1%{?dist}
 %global _hardened_build 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -18,6 +19,12 @@ Release: %autorelease
 %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
@@ -25,10 +32,10 @@ Summary:	OpenConnect SSL VPN server
 
 # For a breakdown of the licensing, see PACKAGE-LICENSING 
 # To simplify licenses LGPLv2+ files have been promoted to GPLv2+.
-License:	GPL-2.0-or-later AND BSD-3-Clause AND MIT AND CC0-1.0
-URL:		https://ocserv.openconnect-vpn.net/
-Source0:	https://www.infradead.org/ocserv/download/%{name}-%{version}.tar.xz
-Source1:	https://www.infradead.org/ocserv/download/%{name}-%{version}.tar.xz.sig
+License:	GPLv2+ and BSD and MIT and CC0
+URL:		http://www.infradead.org/ocserv/
+Source0:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
+Source1:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
 Source2:	gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
 Source3:	ocserv.conf
 Source4:	ocserv.service
@@ -42,27 +49,38 @@ Source11:	ocserv.init
 # Taken from upstream:
 # http://git.infradead.org/ocserv.git/commitdiff/7d70006a2dbddf783213f1856374bacc74217e09
 
-BuildRequires: make
-BuildRequires: libxcrypt-devel
 BuildRequires:	gcc
 %if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:	gnutls30-devel
 %else
 BuildRequires:	gnutls-devel
 %endif
-BuildRequires:	pam-devel, iproute, ipcalc, openconnect, gnutls-utils
+BuildRequires:	pam-devel
+BuildRequires:	iproute
+BuildRequires:	openconnect
 
 %if (0%{?use_local_protobuf} == 0)
 BuildRequires:	protobuf-c-devel
 %endif
 
-BuildRequires:	libnl3-devel, krb5-devel, libtasn1-devel, gperf, libtalloc-devel
-BuildRequires:	libev-devel, llhttp-devel, radcli-devel, lz4-devel, readline-devel
-BuildRequires:	automake, autoconf
+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
 %endif
+BuildRequires:	automake, autoconf
+BuildRequires:	radcli-devel
+BuildRequires:	lz4-devel
+BuildRequires:	readline-devel
 %if %{use_geoip}
 BuildRequires:	GeoIP-devel
 %else
@@ -74,11 +92,7 @@ BuildRequires:	systemd
 BuildRequires:	systemd-devel
 BuildRequires:	liboath-devel
 BuildRequires:	uid_wrapper
-# Disable socket_wrapper on certain architectures because it
-# introduces new syscalls that the worker cannot handle.
-%ifnarch aarch64 %{ix86} %{arm}
 BuildRequires:	socket_wrapper
-%endif
 BuildRequires:	gnupg2
 
 %if 0%{?rhel} && 0%{?rhel} >= 7
@@ -95,12 +109,13 @@ BuildRequires:	libseccomp-devel
 
 # no rubygem in epel7
 %if 0%{?fedora}
-BuildRequires:	rubygem-ronn-ng
+BuildRequires:	rubygem(ronn)
 %endif
 
-Recommends:		gnutls-utils
-Recommends:		iproute
-Recommends:		pam
+Requires:		gnutls-utils
+Requires:		iproute
+Requires:		pam
+Requires(pre):		shadow-utils
 %if %{use_systemd}
 Requires(post):		systemd
 Requires(preun):	systemd
@@ -129,23 +144,25 @@ 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: 
+# http://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00062.html
+sed -i 's/either version 3 of the License/either version 2 of the License/g' build-aux/snippet/*
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 echo "int main() { return 77; }" > tests/valid-hostname.c
 %endif
 
-# Create a sysusers.d config file
-cat >ocserv.sysusers.conf <<EOF
-u ocserv - 'ocserv' %{_localstatedir}/lib/ocserv -
-EOF
-
 %build
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
@@ -158,7 +175,6 @@ autoreconf -fvi
 %endif
 
 %configure \
-        --without-pcl-lib \
 %if %{use_systemd}
 	--enable-systemd \
 %else
@@ -167,21 +183,28 @@ 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
+getent passwd ocserv &>/dev/null || \
+	/usr/sbin/useradd -r -g ocserv -s /sbin/nologin -c ocserv \
+		-d %{_localstatedir}/lib/ocserv ocserv
 mkdir -p %{_sysconfdir}/pki/ocserv/public
 mkdir -p -m 700 %{_sysconfdir}/pki/ocserv/private
 mkdir -p %{_sysconfdir}/pki/ocserv/cacerts
 
 %check
-make check %{?_smp_mflags} VERBOSE=1
+make check %{?_smp_mflags} XFAIL_TESTS=test-sighup-key-change
 
 %if %{use_systemd}
 %post
@@ -191,7 +214,7 @@ make check %{?_smp_mflags} VERBOSE=1
 %systemd_preun ocserv.service
 
 %postun
-%systemd_postun_with_restart ocserv.service
+%systemd_postun ocserv.service
 %endif
 
 %install
@@ -226,8 +249,6 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 
 %make_install
 
-install -m0644 -D ocserv.sysusers.conf %{buildroot}%{_sysusersdir}/ocserv.conf
-
 %files
 %defattr(-,root,root,-)
 
@@ -238,7 +259,7 @@ install -m0644 -D ocserv.sysusers.conf %{buildroot}%{_sysusersdir}/ocserv.conf
 %config(noreplace) %{_sysconfdir}/pam.d/ocserv
 %config(noreplace) %{_localstatedir}/lib/ocserv/profile.xml
 
-%doc AUTHORS ChangeLog NEWS COPYING README.md PACKAGE-LICENSING doc/README-radius.md
+%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*
@@ -247,7 +268,7 @@ install -m0644 -D ocserv.sysusers.conf %{buildroot}%{_sysusersdir}/ocserv.conf
 
 %{_bindir}/ocpasswd
 %{_bindir}/occtl
-%{_libexecdir}/ocserv-fw
+%{_bindir}/ocserv-fw
 %{_bindir}/ocserv-script
 %{_sbindir}/ocserv
 %{_sbindir}/ocserv-worker
@@ -258,7 +279,290 @@ install -m0644 -D ocserv.sysusers.conf %{buildroot}%{_sysusersdir}/ocserv.conf
 %else
 %{_initrddir}/%{name}
 %endif
-%{_sysusersdir}/ocserv.conf
 
 %changelog
-%autochangelog
+* Tue Jun 16 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.0-1
+- Update to upstream 1.1.0 release (introduces ocserv-worker)
+
+* Thu Apr 09 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.0.1-1
+- Update to upstream 1.0.1 release
+
+* Fri Mar 20 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.0.0-1
+- Update to upstream 1.0.0 release
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Dec 28 2019 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 0.12.6-1
+- Update to upstream 0.12.6 release
+
+* Wed Oct 16 2019 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.5-1
+- Update to upstream 0.12.5 release
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 03 2019 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.4-1
+- Update to upstream 0.12.4 release
+
+* Tue Mar 12 2019 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.3-1
+- Update to upstream 0.12.3 release
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.12.2-4
+- Rebuild for readline 8.0
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 0.12.2-2
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Thu Jan 10 2019 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.2-1
+- Update to upstream 0.12.2 release
+
+* Tue Jul 24 2018 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.1-3
+- Added gcc as build-dependency
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat May 12 2018 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.1-1
+- Update to upstream 0.12.1 release
+
+* Mon Apr 23 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.12.0-1
+- Update to upstream 0.12.0 release
+
+* Thu Apr 12 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.11-2
+- Update to upstream 0.11.11 release
+- include crypt.h to use crypt()
+
+* Mon Mar 05 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.11-1
+- Update to upstream 0.11.11 release
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 0.11.10-2
+- Rebuilt for switch to libxcrypt
+
+* Mon Jan 08 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.10-1
+- Update to upstream 0.11.10 release
+
+* Tue Nov 21 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.9-3
+- Update to upstream 0.11.9 release
+
+* Thu Nov 16 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.9-2
+- Do not enable libwrap
+
+* Tue Oct 10 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.9-1
+- Update to upstream 0.11.9 release
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed May 03 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.8-1
+- Update to upstream 0.11.8 release
+
+* Mon Feb 13 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.7-1
+- Update to upstream 0.11.7 release
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.11.6-3
+- Rebuild for readline 7.x
+
+* Tue Nov 15 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.6-2
+- Removed gpgkeys from sources
+
+* Tue Nov 15 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.6-1
+- New upstream release
+
+* Wed Sep 14 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.4-3
+- Added getrandom to the list of allowed syscalls (#1375851)
+
+* Thu Sep  8 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.4-2
+- Rebuild to address http-parser breakage (#1374081)
+
+* Fri Aug  5 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.4-1
+- New upstream release
+
+* Thu Jun 16 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.3-1
+- New upstream release
+
+* Tue Apr 26 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.2-1
+- New upstream release
+- Added automatic verification of signature during build
+
+* Mon Mar 21 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.1-1
+- new upstream release
+
+* Fri Feb 19 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.0-1
+- new upstream release
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 11 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.11-1
+- new upstream release
+
+* Mon Nov 30 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.10-1
+- new upstream release
+
+* Thu Oct  8 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.9-1
+- new upstream release (#1269479)
+
+* Thu Sep 17 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.8-2
+- compile ocserv using radcli
+
+* Mon Sep  7 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.8-1
+- new upstream release (#1260327)
+
+* Fri Aug  7 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.7-1
+- new upstream release (#1251305)
+
+* Thu Jul  9 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.6-2
+- corrected JSON output
+
+* Thu Jul  2 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.6-1
+- new upstream release (#1238499)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 25 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.5-1
+- new upstream release (#1215326)
+
+* Mon Apr 27 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.4-1
+- new upstream release
+
+* Mon Mar 30 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.2-1
+- new upstream release
+
+* Mon Mar 16 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.1-1
+- new upstream release
+
+* Wed Mar 11 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.0-1
+- new upstream release
+
+* Wed Feb 18 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.9.2-1
+- new upstream release
+- enabled lz4 compression
+
+* Mon Feb 16 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.9.1-2
+- aarch64 (and ARMv7) now has seccomp support
+
+* Mon Feb 16 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.9.1-1
+- new upstream release
+
+* Thu Jan 29 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.9.0-2
+- only enable seccomp in x86-64. It seems to be broken in x86:
+  http://sourceforge.net/p/libseccomp/mailman/message/33275762/
+
+* Thu Jan 22 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.9.0-1
+- new upstream release
+
+* Fri Jan  9 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.9-4
+- enable PIE
+
+* Tue Jan  6 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.9-3
+- Comply with system-wide crypto policies (#1179332)
+
+* Mon Jan  5 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.9-2
+- ocserv.service: depend on network-online.target (#1178760)
+- enable seccomp (on platforms it is available)
+
+* Thu Dec 11 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.9-1
+- New upstream release
+
+* Wed Nov 26 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.8-1
+- New upstream release
+
+* Mon Oct 27 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.7-1
+- New upstream release
+
+* Tue Sep 09 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.4-2
+- Ship a default ocserv-script, which will put connecting clients
+  into the internal firewall zone.
+
+* Thu Aug 28 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.4-1
+- New upstream release
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Aug 08 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.2-3
+- Rebuilt
+
+* Tue Aug 05 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.2-2
+- Rebuilt for new protobuf-c
+
+* Mon Jul 28 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.2-1
+- New upstream release
+
+* Mon Jun 30 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.1-1
+- New upstream release
+
+* Fri Jun 06 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.0-2
+- Generate certificates and private keys before the first run
+- Corrected chroot path
+
+* Mon Jun 02 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.0-1
+- New upstream release
+
+* Mon May 26 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.0pre0-1
+- New upstream release
+
+* Fri May 09 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.5-1
+- New upstream release
+
+* Fri May 02 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.4-1
+- New upstream release
+
+* Thu Apr 10 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.3-1
+- New upstream release
+
+* Fri Mar 14 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.2-1
+- New upstream release
+
+* Mon Feb 17 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.1-2
+- new upstream release
+
+* Wed Jan 29 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.0-2
+- Generated certificates no longer carry an expiration date.
+
+* Mon Jan 27 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.0-1
+- Updated to latest upstream version (0.3.0).
+- Certificates and private keys are auto-generated.
+
+* Mon Dec 16 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.3-1
+- Updated to latest upstream version (0.2.3).
+- Corrected the chroot directory in config file.
+
+* Fri Dec  6 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.1-6
+- Added exception for the bundling of CCAN components.
+
+* Wed Nov 13 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.1-5
+- Updated the way PACKAGE-LICENSING is handled.
+
+* Tue Nov 12 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.1-4
+- Replaced gnulib's GPLv3+ license with GPLv2+. According to 
+  http://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00062.html
+  it was a gnulib bug.
+- Reduced the number of applicable licenses by upgrading LGPLv2+ 
+  components to GPLv2+.
+- Added PACKAGE-LICENSING.
+
+* Mon Nov 11 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.1-3
+- Updated spec to add http-parser and pcllib as dependencies.
+- Bundled library files are removed.
+- Updated license information.
+
+* Fri Nov  8 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.1-2
+- Updated spec to account improvements suggested by Alec Leamas.
+
+* Thu Nov  7 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.1-1
+- Initial version of the package

sources

@@ -1,2 +1,2 @@
-SHA512 (ocserv-1.4.0.tar.xz) = cef771c6ee43925d743b7a21fed1cd7d54c10e39c0966fbc7062df9b7691c9a3a73c1c4589382592668f81809edea0fe0b947c7ddf86a6cdc1a144cf059526b0
-SHA512 (ocserv-1.4.0.tar.xz.sig) = a73ce14e8e355f747e40241056c2bb734d6dae4e1d6aed0f24aaa6d1a469f6d86a077af4a38e6376846fd5520ee33c7be8ce7b3830bcb0faa5e32b12ed7483cd
+SHA512 (ocserv-1.1.0.tar.xz) = 10a589ccf28bf9568e602fc26d9133c78a840205f1a777d62cb52b680221bdaa8c231c37a95587b3494437dafc649b40f71be05a4868646c48efb3d873615861
+SHA512 (ocserv-1.1.0.tar.xz.sig) = 29c4082fa34327663ce6bcd29102c2eba088d79049e6637fabd048c8310fa9ff27853f06ef696c19ef66c146ce9e6e455cecc0261676a6ed343de731142f2022