2.0.14-alt1

- 2.0.14
- build with prometheus-exporter
- add security options to systemd unit

.gear/rules

@@ -3,3 +3,4 @@ tar: v@version@:.
 copy: *.cfg
 copy: *.init
 copy: *.logrotate
+copy: *.service

.gear/tags/7aba3e72d0dbc428712d88d226234d6a9a82e8a3

@@ -1,22 +0,0 @@
-object d849866c4e658584c1f2654e4ee5c77dd028f2ca
-type commit
-tag v2.0.13
-tagger Willy Tarreau <w@1wt.eu> 1581577131 +0100
-
-HAProxy 2.0.13
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJeRPOrAAoJEE44bZycYXAvOTQP/0ifpqiszRSrC9S7aaWfheSq
-OubYXiS8SdRzDIgYSoZmkmw1V8C9n0fABPURGkOgC3MvJmEbPHKpGo3zkcEcF145
-1jmb8+oSOyj3u1Q/lkkWqEHp72u+JwuGZDN/vC1qqWxwkednKX4ARbbhDbQ42K4T
-CwrA717cNcJKpiH7rHAcPzmpuTYp2eYX1qBqqBb0kGpUfCfLREhQIJnX77ptI1Jb
-UsE5AwaPdBurp/vgTdFFZVzFmEgmgXAEBElPOTx1Vvcs52Q+jcgUPTNfdx4O5Knl
-z1aYSftzxT6e08grSY6VEcPiWuI6PylO5Eb6JP/2IltpJF6AgHcSTX6NI6BKIIm4
-NybQEsqaSo8ABWuK0sdTbwtmx0HrOmBMPOjE3Sez6dO5LsTJfGFyopEfatRUjL0v
-pNvvHDdgcVZ8sVkjUap0SwvNiwkixmszindumrT/zWxu22L6EDmO5gs5CQSibMHc
-vVoYmmv6UxLEzOip5ny9qqmYO4i54rszc9WtCdR7joErWxt94R7jgYwnk8omQP57
-KQMQDBSIMkKD+w3JZ8jmJZ8tuN5x17BoKsnDuRvpSGBYY/1d78UuxsjzAsfQZj4v
-KSDqUZccPk2gmb+qPTWD8uUzKxeTNRzfkySx1Z+/rQvmV/ro//WRTKi9T3YwkjOy
-qAf9JfHNA2tjH13y80gS
-=9Vxy
------END PGP SIGNATURE-----

.gear/tags/9cdf23d15a3eef3c472e5fd138ecfc8fbd79d22e

@@ -0,0 +1,22 @@
+object 396d200d414baff193e51d5fa5c8c9fe87ee12ad
+type commit
+tag v2.0.14
+tagger Willy Tarreau <w@1wt.eu> 1585810931 +0200
+
+HAProxy 2.0.14
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJehY3zAAoJEE44bZycYXAv5swQAJyQbQS4K5fO//e3lI2tohoq
+Odcx0Ffg786lkot1m2rRJCWhse36hwVlLK/VNB+MM7qd0LkKHerFL3Mvy80UbAeW
+4h3pUDdKDiByqJ8TFCEAsNMDs3XxiImHybFr4rdxyOJAySY/du8a6GnDUHUzAq67
+vzI24P6Jj/w3XvdubwACD3lEhjaiftiAvPjJV0ER/HDeCjvDve4CaoBHts/34JXn
+b3+hNE3phXB7AmKWmC3bRASrn1En7ghgEcfCpsSl6uXTGCB9LZZs/N7Y8e9h3xFn
+4bK2S1HuCSS6VtUqkpZI+JZDjN6kaZq0rpLNO1g0RsHgMilIf1QJzEVjMLJAUnLJ
+eSIpBRB02/211zrZaactTWIkNWrlnz9aQpzis2shH6NkdtU7zEyFFBkIyfbEhJJ3
+HaJo/nJ7ZUCR17TCYj6jyPCh7twAXEOtYm2awqbBVXGZPSim7Wh66iYhYa2fcnhg
+Bgg2Nfm6T0IqWaRm74VVgHarjz59uXxVfVw7fGRHSdGUkI/RbtaC785qGWxch7fX
++fnD+Kw8j3mPtMiFMVWJ9QRLpLQWlbtLrzW22AYMqKgqPCo7QaPSImzBmdpAB0Dw
+5h4y8uB5dUvNXQH4Jyiz70wsuXXZYpGjpX3HJw4LTgmwwWTgb5wx/sJrz+b/QUJH
+j4BtnnrBCJ5UyJ/7sX4V
+=TsK0
+-----END PGP SIGNATURE-----

.gear/tags/list

@@ -1 +1 @@
-7aba3e72d0dbc428712d88d226234d6a9a82e8a3 v2.0.13
+9cdf23d15a3eef3c472e5fd138ecfc8fbd79d22e v2.0.14

haproxy.service

@@ -0,0 +1,27 @@
+[Unit]
+Description=HAProxy Load Balancer
+Documentation=man:haproxy(1)
+After=network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/haproxy
+Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" "EXTRAOPTS=-S /run/haproxy-master.sock"
+ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS
+ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS
+ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS
+ExecReload=/bin/kill -USR2 $MAINPID
+KillMode=mixed
+Restart=always
+SuccessExitStatus=143
+Type=notify
+
+NoNewPrivileges=true
+ProtectHome=true
+ProtectSystem=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+SystemCallFilter=~@cpu-emulation @keyring @module @obsolete @raw-io @reboot @swap @sync
+
+[Install]
+WantedBy=multi-user.target

haproxy.spec

@@ -7,7 +7,7 @@
 %def_enable lua
 
 Name: haproxy
-Version: 2.0.13
+Version: 2.0.14
 Release: alt1
 
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
@@ -19,6 +19,7 @@ Source: %name-%version.tar
 Source1: %name.cfg
 Source2: %name.init
 Source3: %name.logrotate
+Source4: %name.service
 
 BuildRequires: libpcre2-devel zlib-devel libssl-devel libsystemd-devel
 %{?_enable_lua:BuildRequires: liblua5-devel >= 5.3}
@@ -53,7 +54,8 @@ addlib_opts=ADDLIB=-latomic
 %endif
 
 %make_build CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_ZLIB=1 USE_SYSTEMD=1 %{?_enable_lua:USE_LUA=1} \
-	${regparm_opts:-} ${addlib_opts:-} PREFIX="%_prefix" ADDINC="$(pcre2-config --cflags)" CFLAGS="%optflags"
+	${regparm_opts:-} ${addlib_opts:-} PREFIX="%_prefix" ADDINC="$(pcre2-config --cflags)" CFLAGS="%optflags" \
+	EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
 
 pushd contrib/halog
 %make halog OPTIMIZE="%optflags"
@@ -63,17 +65,13 @@ popd
 #%make iprange OPTIMIZE="%optflags"
 #popd
 
-pushd contrib/systemd
-%make haproxy.service PREFIX="%_prefix"
-popd
-
 %install
 %make_install install-bin DESTDIR=%buildroot PREFIX="%_prefix" TARGET="linux-glibc"
 %make_install install-man DESTDIR=%buildroot PREFIX="%_prefix"
 
 install -p -D -m 0644 %SOURCE1 %buildroot%haproxy_confdir/%name.cfg
 install -D -m 0755 %SOURCE2 %buildroot%_initrddir/haproxy
-install -p -D -m 0644 contrib/systemd/haproxy.service %buildroot%_unitdir/%name.service
+install -p -D -m 0644 %SOURCE4 %buildroot%_unitdir/%name.service
 install -p -D -m 0644 %SOURCE3 %buildroot%_logrotatedir/%name
 install -d -m 0755 %buildroot%haproxy_home
 install -d -m 0755 %buildroot%haproxy_datadir
@@ -109,6 +107,11 @@ cp -p examples/errorfiles/* %buildroot%haproxy_datadir/
 %attr(-,%haproxy_user,%haproxy_group) %dir %haproxy_home
 
 %changelog
+* Sat Apr 18 2020 Alexey Shabalin <shaba@altlinux.org> 2.0.14-alt1
+- 2.0.14
+- build with prometheus-exporter
+- add security options to systemd unit
+
 * Sun Mar 15 2020 Alexey Shabalin <shaba@altlinux.org> 2.0.13-alt1
 - 2.0.13