Rebuild for the latest http-parser ABI breakage

- Update to upstream 0.12.4 release

.gitignore

@@ -168,72 +168,5 @@
 /ocserv.service
 /ocserv.conf
 /gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
-/ocserv-0.12.3.tar.xz.sig
-/ocserv-0.12.3.tar.xz
-/ocserv.init
-/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
-/ocserv-script
-/ocserv-genkey
-/PACKAGE-LICENSING
-/ocserv-pamd.conf
-/ocserv.service
-/ocserv.conf
-/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
 /ocserv-0.12.4.tar.xz.sig
 /ocserv-0.12.4.tar.xz
-/ocserv.init
-/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
-/ocserv-script
-/ocserv-genkey
-/PACKAGE-LICENSING
-/ocserv-pamd.conf
-/ocserv.service
-/ocserv.conf
-/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
-/ocserv-0.12.5.tar.xz.sig
-/ocserv-0.12.5.tar.xz
-/ocserv.init
-/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
-/ocserv-script
-/ocserv-genkey
-/PACKAGE-LICENSING
-/ocserv-pamd.conf
-/ocserv.service
-/ocserv.conf
-/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
-/ocserv-0.12.6.tar.xz.sig
-/ocserv-0.12.6.tar.xz
-/ocserv.init
-/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
-/ocserv-script
-/ocserv-genkey
-/PACKAGE-LICENSING
-/ocserv-pamd.conf
-/ocserv.service
-/ocserv.conf
-/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
-/ocserv-1.0.0.tar.xz.sig
-/ocserv-1.0.0.tar.xz
-/ocserv.init
-/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
-/ocserv-script
-/ocserv-genkey
-/PACKAGE-LICENSING
-/ocserv-pamd.conf
-/ocserv.service
-/ocserv.conf
-/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
-/ocserv-1.0.1.tar.xz.sig
-/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.conf

@@ -1,5 +1,5 @@
 ### The following directives do not change with server reload.
-
+#
 # User authentication method. To require multiple methods to be
 # used for the user to login, add multiple auth directives. The values
 # in the 'auth' directive are AND composed (if multiple all must
@@ -7,7 +7,7 @@
 # Available options: certificate, plain, pam, radius, gssapi.
 # Note that authentication methods utilizing passwords cannot be
 # combined (e.g., the plain, pam or radius methods).
-
+#
 # certificate:
 #  This indicates that all connecting users must present a certificate.
 #  The username and user group will be then extracted from it (see
@@ -24,20 +24,18 @@
 # entries of the following format.
 # "username:groupname1,groupname2:encoded-password"
 # One entry must be listed per line, and 'ocpasswd' should be used
-# to generate password entries. The 'otp' suboption allows one to specify
+# to generate password entries. The 'otp' suboption allows to specify
 # an oath password file to be used for one time passwords; the format of
-# the file is described in https://github.com/archiecobbs/mod-authn-otp/wiki/UsersFile
+# the file is described in https://code.google.com/p/mod-authn-otp/wiki/UsersFile
 #
-# radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true,nas-identifier=name]:
+# radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true,nas-identifier=name,override-interim-updates=false]:
 #  The radius option requires specifying freeradius-client configuration
-# file. If the groupconfig option is set, then config-per-user/group will be overridden,
+# file. If the groupconfig option is set, then config-per-user will be overriden,
-# and all configuration will be read from radius. That also includes the
+# and all configuration will be read from radius. The 'override-interim-updates' if set to
-# Acct-Interim-Interval, and Session-Timeout values.
+# true will ignore Acct-Interim-Interval from the server and 'stats-report-time' will be considered.
-#
-# 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,
+#  The gssapi option allows to use authentication methods supported by GSSAPI,
 # such as Kerberos tickets with ocserv. It should be best used as an alternative
 # to PAM (i.e., have pam in auth and gssapi in enable-auth), to allow users with
 # tickets and without tickets to login. The default value for require-local-user-map
@@ -81,14 +79,16 @@ auth = "pam"
 # reconnects.
 #listen-host-is-dyndns = true
 
-# 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
 
+# 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
@@ -106,50 +106,6 @@ socket-file = ocserv.sock
 # The default server directory. Does not require any devices present.
 chroot-dir = /var/lib/ocserv
 
-# The key and the certificates of the server
-# The key may be a file, or any URL supported by GnuTLS (e.g., 
-# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
-# or pkcs11:object=my-vpn-key;object-type=private)
-#
-# The server-cert file may contain a single certificate, or
-# a sorted certificate chain.
-# There may be multiple server-cert and server-key directives,
-# but each key should correspond to the preceding certificate.
-# The certificate files will be reloaded when changed allowing for in-place
-# certificate renewal (they are checked and reloaded periodically;
-# a SIGHUP signal to main server will force reload).
-
-server-cert = /etc/pki/ocserv/public/server.crt
-server-key = /etc/pki/ocserv/private/server.key
-
-# Diffie-Hellman parameters. Only needed if for old (pre 3.6.0
-# versions of GnuTLS for supporting DHE ciphersuites.
-# Can be generated using:
-# certtool --generate-dh-params --outfile /etc/ocserv/dh.pem
-#dh-params = /etc/ocserv/dh.pem
-
-# In case PKCS #11, TPM or encrypted keys are used the PINs should be available
-# in files. The srk-pin-file is applicable to TPM keys only, and is the 
-# storage root key.
-#pin-file = /etc/ocserv/pin.txt
-#srk-pin-file = /etc/ocserv/srkpin.txt
-
-# The password or PIN needed to unlock the key in server-key file.
-# Only needed if the file is encrypted or a PKCS #11 object. This
-# is an alternative method to pin-file.
-#key-pin = 1234
-
-# The SRK PIN for TPM.
-# This is an alternative method to srk-pin-file.
-#srk-pin = 1234
-
-# The Certificate Authority that will be used to verify
-# client certificates (public keys) if certificate authentication
-# is set.
-#ca-cert = /etc/ocserv/ca.pem
-
-
-
 
 ### All configuration options below this line are reloaded on a SIGHUP.
 ### The options above, will remain unchanged. Note however, that the 
@@ -170,12 +126,9 @@ server-key = /etc/pki/ocserv/private/server.key
 # 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 for unlimited.
 #max-clients = 1024
 max-clients = 16
@@ -184,19 +137,9 @@ max-clients = 16
 # multiple times). Unset or set to zero for unlimited.
 max-same-clients = 2
 
-# When the server receives connections from a proxy, like haproxy
+# Limit the number of client connections to one every X milliseconds 
-# which supports the proxy protocol, set this to obtain the correct
+# (X is the provided value). Set to zero for no limit.
-# client addresses. The proxy protocol would then be expected in
+#rate-limit-ms = 100
-# the TCP or UNIX socket (not the UDP one). Although both v1
-# and v2 versions of proxy protocol are supported, the v2 version
-# 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
 
 # Stats report time. The number of seconds after which each
 # worker process will report its usage statistics (number of
@@ -204,12 +147,6 @@ rate-limit-ms = 100
 # radius is in use.
 #stats-report-time = 360
 
-# Stats reset time. The period of time statistics kept by main/sec-mod
-# processes will be reset. These are the statistics shown by cmd
-# 'occtl show stats'. For daily: 86400, weekly: 604800
-# This is unrelated to stats-report-time.
-server-stats-reset-time = 604800
-
 # Keepalive in seconds
 keepalive = 32400
 
@@ -224,7 +161,7 @@ dpd = 90
 # be higher to prevent such clients being awaken too 
 # often by the DPD messages, and save battery.
 # The mobile clients are distinguished from the header
-# 'X-AnyConnect-Identifier-Platform'.
+# 'X-AnyConnect-Identifier-DeviceType'.
 mobile-dpd = 1800
 
 # If using DTLS, and no UDP traffic is received for this
@@ -238,6 +175,29 @@ switch-to-tcp-timeout = 25
 # MTU discovery (DPD must be enabled)
 try-mtu-discovery = false
 
+# The key and the certificates of the server
+# The key may be a file, or any URL supported by GnuTLS (e.g., 
+# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
+# or pkcs11:object=my-vpn-key;object-type=private)
+#
+# The server-cert file may contain a single certificate, or
+# a sorted certificate chain.
+#
+# There may be multiple server-cert and server-key directives,
+# but each key should correspond to the preceding certificate.
+# The certificate files will be reloaded when changed allowing for in-place
+# certificate renewal (they are checked and reloaded periodically;
+# a SIGHUP signal to main server will force reload).
+
+server-cert = /etc/pki/ocserv/public/server.crt
+server-key = /etc/pki/ocserv/private/server.key
+
+# Diffie-Hellman parameters. Only needed if you require support
+# for the DHE ciphersuites (by default this server supports ECDHE).
+# Can be generated using:
+# certtool --generate-dh-params --outfile /path/to/dh.pem
+#dh-params = /path/to/dh.pem
+
 # 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
@@ -245,18 +205,37 @@ try-mtu-discovery = false
 # You can update this response periodically using:
 # ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response
 # Make sure that you replace the following file in an atomic way.
-#ocsp-response = /etc/ocserv/ocsp.der
+#ocsp-response = /path/to/ocsp.der
+
+# In case PKCS #11, TPM or encrypted keys are used the PINs should be available
+# in files. The srk-pin-file is applicable to TPM keys only, and is the 
+# storage root key.
+#pin-file = /path/to/pin.txt
+#srk-pin-file = /path/to/srkpin.txt
+
+# The password or PIN needed to unlock the key in server-key file.
+# Only needed if the file is encrypted or a PKCS #11 object. This
+# is an alternative method to pin-file.
+#key-pin = 1234
+
+# The SRK PIN for TPM.
+# This is an alternative method to srk-pin-file.
+#srk-pin = 1234
+
+# The Certificate Authority that will be used to verify
+# client certificates (public keys) if certificate authentication
+# is set.
+ca-cert = /etc/pki/ocserv/cacerts/ca.crt
 
 # The object identifier that will be used to read the user ID in the client 
 # certificate. The object identifier should be part of the certificate's DN
 # Useful OIDs are: 
-#  CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1, SAN(rfc822name)
+#  CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1
 cert-user-oid = 0.9.2342.19200300.100.1.1
 
 # The object identifier that will be used to read the user group in the 
 # client  certificate. The object identifier should be part of the certificate's
-# DN. If the user may belong to multiple groups, then use multiple such fields
+# DN. Useful OIDs are: 
-# in the certificate's DN. Useful OIDs are: 
 #  OU (organizational unit) = 2.5.4.11 
 #cert-group-oid = 2.5.4.11
 
@@ -264,7 +243,7 @@ cert-user-oid = 0.9.2342.19200300.100.1.1
 # See the manual to generate an empty CRL initially. The CRL will be reloaded
 # periodically when ocserv detects a change in the file. To force a reload use
 # SIGHUP.
-#crl = /etc/ocserv/crl.pem
+#crl = /path/to/crl.pem
 
 # Uncomment this to enable compression negotiation (LZS, LZ4).
 #compression = true
@@ -289,9 +268,14 @@ 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
+#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-VERS-SSL3.0"
-# are disabled within it.
+tls-priorities = "@SYSTEM"
-tls-priorities = "NORMAL:%SERVER_PRECEDENCE"
+
+# More combinations in priority strings are available, check
+# http://gnutls.org/manual/html_node/Priority-Strings.html
+# E.g., the string below enforces perfect forward secrecy (PFS) 
+# on the main channel.
+#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-RSA:-VERS-SSL3.0:-ARCFOUR-128"
 
 # That option requires the established DTLS channel to use the same
 # cipher as the primary TLS channel. This cannot be combined with
@@ -310,9 +294,7 @@ auth-timeout = 240
 #idle-timeout = 1200
 
 # The time (in seconds) that a client is allowed to stay connected
-# Unset to disable. When set a client will be disconnected after being
+# Unset to disable.
-# continuously connected for this amount of time, and its cookies will
-# be invalidated (i.e., re-authentication will be required).
 #session-timeout = 86400
 
 # The time (in seconds) that a mobile client is allowed to stay idle (no
@@ -334,10 +316,10 @@ min-reauth-time = 300
 # locally from an HTTP server (i.e., when listen-clear-file is used).
 #
 # Set to zero to disable.
-max-ban-score = 80
+max-ban-score = 50
 
 # The time (in seconds) that all score kept for a client is reset.
-ban-reset-time = 1200
+ban-reset-time = 300
 
 # In case you'd like to change the default points.
 #ban-points-wrong-password = 10
@@ -346,11 +328,11 @@ ban-reset-time = 1200
 
 # Cookie timeout (in seconds)
 # Once a client is authenticated he's provided a cookie with
-# which he can reconnect. That cookie will be invalidated if not
+# which he can reconnect. That cookie will be invalided if not
-# used within this timeout value. This cookie remains valid, during
+# used within this timeout value. On a user disconnection, that
-# the user's connected time, and after user disconnection it
+# cookie will also be active for this time amount prior to be
-# remains active for this amount of time. That setting should allow a
+# invalid. That should allow a reasonable amount of time for roaming
-# reasonable amount of time for roaming between different networks.
+# between different networks.
 cookie-timeout = 300
 
 # If this is enabled (not recommended) the cookies will stay
@@ -380,9 +362,10 @@ 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),
+# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client), 
-# IP_REAL_LOCAL (the local interface IP the client connected), IP_LOCAL
+# DEVICE, IP_REAL (the real IP of the client), IP_REAL_LOCAL (the local
-# (the local IP in the P-t-P connection), IP_REMOTE (the VPN IP of the client),
+# 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
 # ID (a unique numeric ID); REASON may be "connect" or "disconnect".
@@ -390,8 +373,7 @@ rekey-method = ssl
 # client), OCSERV_NO_ROUTES, OCSERV_DNS (the DNS servers for this client),
 # will contain a space separated list of routes or DNS servers. A version
 # of these variables with the 4 or 6 suffix will contain only the IPv4 or
-# IPv6 values. The connect script must return zero as exit code, or the
+# IPv6 values.
-# client connection will be refused.
 
 # The disconnect script will receive the additional values: STATS_BYTES_IN,
 # STATS_BYTES_OUT, STATS_DURATION that contain a 64-bit counter of the bytes 
@@ -409,7 +391,7 @@ rekey-method = ssl
 # or via a unix socket).
 use-occtl = true
 
-# PID file. It can be overridden in the command line.
+# PID file. It can be overriden in the command line.
 pid-file = /var/run/ocserv.pid
 
 # Set the protocol-defined priority (SO_PRIORITY) for packets to
@@ -442,9 +424,6 @@ default-domain = example.com
 # these network values should contain a network with at least a single
 # address that will remain under the full control of ocserv (that is
 # to be able to assign the local part of the tun device address).
-# Note that, you could use addresses from a subnet of your LAN network if you
-# enable [proxy arp in the LAN interface](http://ocserv.gitlab.io/www/recipes-ocserv-pseudo-bridge.html);
-# in that case it is recommended to set ping-leases to true.
 #ipv4-network = 192.168.1.0
 #ipv4-netmask = 255.255.255.0
 
@@ -452,7 +431,7 @@ default-domain = example.com
 #ipv4-network = 192.168.1.0/24
 
 # The IPv6 subnet that leases will be given from.
-#ipv6-network = fda9:4efe:7e3b:03ea::/48 
+#ipv6-network = fda9:4efe:7e3b:03ea::/64
 
 # Specify the size of the network to provide to clients. It is
 # generally recommended to provide clients with a /64 network in
@@ -483,10 +462,8 @@ default-domain = example.com
 # IP range for leases.
 ping-leases = false
 
-# Use this option to set a link MTU value to the incoming
+# Use this option to enforce an MTU value to the incoming
 # connections. Unset to use the default MTU of the TUN device.
-# Note that the MTU is negotiated using the value set and the
-# value sent by the peer.
 #mtu = 1420
 
 # Unset to enable bandwidth restrictions (in bytes/sec). The
@@ -510,15 +487,11 @@ ping-leases = false
 #route = 10.10.10.0/255.255.255.0
 #route = 192.168.0.0/255.255.0.0
 #route = fef4:db8:1000:1001::/64
-#route = default
 
 # Subsets of the routes above that will not be routed by
 # the server.
 
-no-route = 192.168.5.0/255.255.255.0
+#no-route = 192.168.5.0/255.255.255.0
-
-# Note the that following two firewalling options currently are available
-# in Linux systems with iptables software. 
 
 # If set, the script /usr/bin/ocserv-fw will be called to restrict
 # the user to its allowed routes and prevent him from accessing
@@ -527,15 +500,6 @@ no-route = 192.168.5.0/255.255.255.0
 # --removeall. This option can be set globally or in the per-user configuration.
 #restrict-user-to-routes = true
 
-# This option implies restrict-user-to-routes set to true. If set, the
-# script /usr/bin/ocserv-fw will be called to restrict the user to
-# access specific ports in the network. This option can be set globally
-# or in the per-user configuration.
-#restrict-user-to-ports = "tcp(443), tcp(80), udp(443), sctp(99), tcp(583), icmp(), icmpv6()"
-
-# You could also use negation, i.e., block the user from accessing these ports only.
-#restrict-user-to-ports = "!(tcp(443), tcp(80))"
-
 # When set to true, all client's iroutes are made visible to all
 # connecting clients except for the ones offering them. This option
 # only makes sense if config-per-user is set.
@@ -563,18 +527,13 @@ no-route = 192.168.5.0/255.255.255.0
 # The options allowed in the configuration files are dns, nbns,
 #  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,
+#  user-profile, cgroup, stats-report-time, and session-timeout.
-#  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.
 #
-# Note that the 'iroute' option allows one to add routes on the server
+# Note that the 'iroute' option allows to add routes on the server
 # based on a user or group. The syntax depends on the input accepted
 # by the commands route-add-cmd and route-del-cmd (see below). The no-udp
 # is a boolean option (e.g., no-udp = true), and will prevent a UDP session
-# for that specific user or group. The hostname option will set a
+# for that specific user or group.
-# hostname to override any proposed by the user. Note also, that, any 
-# routes, no-routes, DNS or NBNS servers present will overwrite the global ones.
 
 #config-per-user = /etc/ocserv/config-per-user/
 #config-per-group = /etc/ocserv/config-per-group/
@@ -585,15 +544,15 @@ no-route = 192.168.5.0/255.255.255.0
 #default-group-config = /etc/ocserv/defaults/group.conf
 
 # The system command to use to setup a route. %{R} will be replaced with the
-# route/mask, %{RI} with the route in CIDR format, and %{D} with the (tun) device.
+# route/mask and %{D} with the (tun) device.
 #
-# The following example is from linux systems. %{R} should be something
+# The following example is from linux systems. %R should be something
-# like 192.168.2.0/255.255.255.0 and %{RI} 192.168.2.0/24 (the argument of iroute).
+# like 192.168.2.0/24 (the argument of iroute).
 
 #route-add-cmd = "ip route add %{R} dev %{D}"
 #route-del-cmd = "ip route delete %{R} dev %{D}"
 
-# This option allows one to forward a proxy. The special keywords '%{U}'
+# This option allows to forward a proxy. The special keywords '%{U}'
 # and '%{G}', if present will be replaced by the username and group name.
 #proxy-url = http://example.com/
 #proxy-url = http://example.com/%{U}/
@@ -603,36 +562,14 @@ no-route = 192.168.5.0/255.255.255.0
 # KDC server. That is a translation URL between HTTP and Kerberos.
 # In MIT kerberos you'll need to add in realms:
 #   EXAMPLE.COM = {
-#     kdc = https://ocserv.example.com/KdcProxy
+#     kdc = https://ocserv.example.com/kerberos
 #     http_anchors = FILE:/etc/ocserv-ca.pem
 #   }
-# In some distributions the krb5-k5tls plugin of kinit is required.
+# This option is available if ocserv is compiled with GSSAPI support. 
-#
-# The following option is available in ocserv, when compiled with GSSAPI support. 
 
-#kkdcp = "SERVER-PATH KERBEROS-REALM PROTOCOL@SERVER:PORT"
+#kkdcp = SERVER-PATH KERBEROS-REALM PROTOCOL@SERVER:PORT
-#kkdcp = "/KdcProxy KERBEROS.REALM udp@127.0.0.1:88"
+#kkdcp = /kerberos EXAMPLE.COM udp@127.0.0.1:88
-#kkdcp = "/KdcProxy KERBEROS.REALM tcp@127.0.0.1:88"
+#kkdcp = /kerberos-tcp EXAMPLE.COM tcp@127.0.0.1:88
-#kkdcp = "/KdcProxy KERBEROS.REALM tcp@[::1]:88"
-
-# Client profile xml. This can be used to advertise alternative servers
-# to the client. A minimal file can be:
-# <?xml version="1.0" encoding="UTF-8"?>
-# <AnyConnectProfile xmlns="http://schemas.xmlsoap.org/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/encoding/ AnyConnectProfile.xsd">
-#	<ServerList>
-#		<HostEntry>
-#	            <HostName>VPN Server name</HostName>
-#	            <HostAddress>localhost</HostAddress>
-#		</HostEntry>
-#	</ServerList>
-# </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 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
 
 #
 # The following options are for (experimental) AnyConnect client 
@@ -644,19 +581,24 @@ no-route = 192.168.5.0/255.255.255.0
 # and openconnect clients < 7.08. When set to true, it implies dtls-legacy = true.
 cisco-client-compat = true
 
-# This option allows one to disable the DTLS-PSK negotiation (enabled by default).
+# This option allows to disable the DTLS-PSK negotiation (enabled by default).
 # The DTLS-PSK negotiation was introduced in ocserv 0.11.5 to deprecate
 # the pre-draft-DTLS negotiation inherited from AnyConnect. It allows the
 # DTLS channel to negotiate its ciphers and the DTLS protocol version.
 #dtls-psk = false
 
-# This option allows one to disable the legacy DTLS negotiation (enabled by default,
+# This option allows to disable the legacy DTLS negotiation (enabled by default,
 # but that may change in the future).
 # The legacy DTLS uses a pre-draft version of the DTLS protocol and was
 # from AnyConnect protocol. It has several limitations, that are addressed
 # by the dtls-psk protocol supported by openconnect 7.08+.
 dtls-legacy = true
 
+# Client profile xml. A sample file exists in doc/profile.xml.
+# It is required by some of the CISCO clients.
+# This file must be accessible from inside the worker's chroot. 
+user-profile = profile.xml
+
 #Advanced options
 
 # Option to allow sending arbitrary custom headers to the client after
@@ -667,23 +609,3 @@ dtls-legacy = true
 # and '%{G}', if present will be replaced by the username and group name.
 #custom-header = "X-My-Header: hi there"
 
-
-
-## An example virtual host with different authentication methods serviced
-## by this server.
-
-#[vhost:www.example.com]
-#auth = "certificate"
-
-#ca-cert = /etc/ocserv/ca.pem
-
-# The certificate set here must include a 'dns_name' corresponding to
-# the virtual host name.
-
-#server-cert = /etc/pki/ocserv/public/server.crt
-#server-key = /etc/pki/ocserv/private/server.key
-
-#ipv4-network = 192.168.2.0
-#ipv4-netmask = 255.255.255.0
-
-#cert-user-oid = 0.9.2342.19200300.100.1.1

ocserv.spec

@@ -1,5 +1,6 @@
-Version:	1.1.6
+# This spec file has been automatically updated
-Release: 3%{?dist}
+Version:	0.12.4
+Release: 2%{?dist}
 %global _hardened_build 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -12,10 +13,8 @@ Release: 3%{?dist}
 
 %if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 %define use_libwrap 0
-%define use_geoip 0
 %else
 %define use_libwrap 1
-%define use_geoip 1
 %endif
 
 %define use_local_protobuf 0
@@ -42,7 +41,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
@@ -51,8 +49,6 @@ BuildRequires:	gnutls-devel
 %endif
 BuildRequires:	pam-devel
 BuildRequires:	iproute
-BuildRequires:	openconnect
-BuildRequires:  gnutls-utils
 
 %if (0%{?use_local_protobuf} == 0)
 BuildRequires:	protobuf-c-devel
@@ -62,10 +58,10 @@ BuildRequires:	libnl3-devel
 BuildRequires:	krb5-devel
 BuildRequires:	libtasn1-devel
 BuildRequires:	gperf
+BuildRequires:	pcllib-devel
 BuildRequires:	libtalloc-devel
 BuildRequires:	libev-devel
 BuildRequires:	http-parser-devel
-
 %if %{use_libwrap}
 BuildRequires:	tcp_wrappers-devel
 %endif
@@ -73,22 +69,14 @@ BuildRequires:	automake, autoconf
 BuildRequires:	radcli-devel
 BuildRequires:	lz4-devel
 BuildRequires:	readline-devel
-%if %{use_geoip}
 BuildRequires:	GeoIP-devel
-%else
-BuildRequires:	libmaxminddb-devel
-%endif
 
 %if %{use_systemd}
 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
@@ -101,16 +89,16 @@ BuildRequires:	libseccomp-devel
 %endif
 %endif
 
-%endif
+%endif #use systemd
 
 # no rubygem in epel7
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires:	rubygem-ronn-ng
+BuildRequires:	rubygem(ronn)
 %endif
 
-Recommends:		gnutls-utils
+Requires:		gnutls-utils
-Recommends:		iproute
+Requires:		iproute
-Recommends:		pam
+Requires:		pam
 Requires(pre):		shadow-utils
 %if %{use_systemd}
 Requires(post):		systemd
@@ -146,6 +134,7 @@ 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 +157,6 @@ autoreconf -fvi
 %endif
 
 %configure \
-        --without-pcl-lib \
 %if %{use_systemd}
 	--enable-systemd \
 %else
@@ -183,7 +171,7 @@ autoreconf -fvi
 	--without-libwrap
 %endif
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %pre
 getent group ocserv &>/dev/null || groupadd -r ocserv
@@ -195,7 +183,7 @@ 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}
 
 %if %{use_systemd}
 %post
@@ -222,7 +210,7 @@ install -p -m 755 %{SOURCE8} %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_bindir}
 install -p -m 755 %{SOURCE9} %{buildroot}/%{_bindir}
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel}
 sed -i 's|expiration_days=-1|expiration_days=9999|' %{buildroot}/%{_sbindir}/ocserv-genkey
 sed -i 's|tls-priorities = "@SYSTEM"|tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-VERS-SSL3.0"|' %{buildroot}/%{_sysconfdir}/ocserv/ocserv.conf
 %if 0%{?rhel} <= 6
@@ -248,9 +236,8 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 
 %config(noreplace) %{_sysconfdir}/ocserv/ocserv.conf
 %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*
@@ -262,7 +249,6 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %{_bindir}/ocserv-fw
 %{_bindir}/ocserv-script
 %{_sbindir}/ocserv
-%{_sbindir}/ocserv-worker
 %{_sbindir}/ocserv-genkey
 %{_localstatedir}/lib/ocserv/profile.xml
 %if %{use_systemd}
@@ -272,100 +258,12 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %endif
 
 %changelog
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-3
+* Fri May 01 2020 David Woodhouse <dwmw2@infradead.org> - 0.12.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+- Rebuild for the latest http-parser ABI breakage (#1816266)
-
-* 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
-- Update to upstream 1.1.1 release
-- Set default priorities to NORMAL as using @SYSTEM is no longer necessary
-  to follow crypto policies.
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jun 21 2020 Adrian Reber <adrian@lisas.de> - 1.1.0-2
-- Rebuilt for protobuf 3.12
-
-* Tue Jun 16 2020 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.1.0-1
-- Update to upstream 1.1.0 release (introduces ocserv-worker)
-
-* Wed Apr 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.0.1-2
-- Rebuild for http-parser 2.9.4
-
-* 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
 

sources

@@ -1,2 +1,11 @@
-SHA512 (ocserv-1.1.6.tar.xz.sig) = 2a87768ad63d40053732fa011bbeb3532c9673296b9be299bf8f7d8dd3dd35571eee96c0b4fa9bf5a30633b4c844337ab3d562d6ea2b6ad8efca084eb5e6f502
+SHA512 (ocserv.init) = 7c3256dd0f7d5882c4e126c95209084e2476f7d8d142af137f46c5987364982eb88044bfa5d587ebc397ebd379edb40f22e5c97c0276764be982a27715a9c601
-SHA512 (ocserv-1.1.6.tar.xz) = d1c5e5cf0e84aab168ed51516534df8b2968194dd1421f33563c61b3e47d5d79ebe9e6ffbf7cbcc9ff1242fae05151024f70ef586d063bec0b3eec00050bfdfa
+SHA512 (gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg) = c664fd9999cbf9912eeea88ee3a2c356df3f70813a664bb7a7f592be258c12bdeb9e99e4aa9a368c1f123ee449eb08e288d1dc3dcf81e849a958ece6eab82d67
+SHA512 (ocserv-script) = 6d77ebe95d23469d96b45b1ac8de7a062cb1360febd0f9664b42debf0494891a522e3da8feec53d22b84e39ad349a1824b7ecd6b6b8f0790edf75aed1087e2d0
+SHA512 (ocserv-genkey) = e898144fd977e4c57c4a9a5480b38f6a166c0281c41500c3fa9b7e142197c4525d3fb90846a738e38d217116dc33c2ba5c16ec3e11de0dbf4d834e204c598eac
+SHA512 (PACKAGE-LICENSING) = eea2a2a4765c90d874c79bb72d754c8b26b58d5e5b3c3cee10c24754fbba6849fd91f7b28e380b5db9789a456f95fc94b3bd8fe8c160a98c8042f404479ecb68
+SHA512 (ocserv-pamd.conf) = 3a75f19d89ddd164f3faa9c3579c7f675fc58413a194f43ec28eee7ebced6fee3f4ca305fe9b0ddf76ae39cd669e8d3d63b58afbbf19b84e4ca646ae7f42d61a
+SHA512 (ocserv.service) = 2b258b2e9d211c9626e9e5c67b6c2573b713e0f490917ed1c84c2bb2708f874026ddb55dceb9585e491f86de5d3c8cd400bba864d12966ae96609cc4ce6413d2
+SHA512 (ocserv.conf) = 5b68a3547c6c69bf7c2b322692d6382162a587c47edad97690223c36f30ed98d3869d1ce063c630740d91888a4d70aadd657ddc6052c10e6e26800fca2e9d0c0
+SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 3b1989dc6a64d1140f83a2af0773da2adb03c50d97b6da7357cf09525050651aafa21131f1e3180baa540a8af922119a256f5ff5bcd6602996a806e8e1816bad
+SHA512 (ocserv-0.12.4.tar.xz.sig) = 8ac5a5a7b3b4dcedce4a497cba923092e0035c816ea0d6b9a888102aeb03889af101259eb392d676501717abdc7544b78f60054f4409835022cf2a6949e795ff
+SHA512 (ocserv-0.12.4.tar.xz) = 5483cede9627886912f9620d358f1a22504b5de2653529e4275f4b96e4fc874b264877ff0c9ef85c9a0662253d0de44950c4f3a8410fea427d742cc733d5f741