forked from pool/haproxy
- Update to version 2.2.0+git0.3a00c915f:
https://www.haproxy.com/blog/announcing-haproxy-2-2/ * [RELEASE] Released version 2.2.0 * MINOR: version: mention that it's an LTS release now * DOC: minor update to coding style file * DOC: update INSTALL with new compiler versions * CLEANUP: ssl: remove unrelevant comment in smp_fetch_ssl_x_keylog() * DOC: configuration: remove obsolete mentions of H2 being converted to HTTP/1.x * BUG/MINOR: connection: See new connection as available only on reuse always * BUG/MEDIUM: connection: Don't consider new private connections as available * BUG/MINOR: backend: Remove CO_FL_SESS_IDLE if a client remains on the last server * MINOR: mux-h1: Improve traces about the splicing - refreshed patches to apply cleanly again: haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch - track series file in source rpm OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=221
This commit is contained in:
parent
1207c16689
commit
c9287944c3
4
_service
4
_service
@ -1,12 +1,12 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">http://git.haproxy.org/git/haproxy-2.1.git</param>
|
||||
<param name="url">http://git.haproxy.org/git/haproxy-2.2.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">haproxy</param>
|
||||
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
<param name="revision">v2.1.7</param>
|
||||
<param name="revision">v2.2.0</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
|
||||
|
@ -1,6 +1,8 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">http://git.haproxy.org/git/haproxy-2.1.git</param>
|
||||
<param name="changesrevision">8bebf80fb5550f5b32e0bec83d1b819b1bf482d6</param>
|
||||
<param name="changesrevision">v2.1.7</param>
|
||||
</service>
|
||||
</servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">http://git.haproxy.org/git/haproxy-2.2.git</param>
|
||||
<param name="changesrevision">3a00c915fd241fc398a080a11ccac9c5c46791ce</param></service></servicedata>
|
@ -1,8 +1,8 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d62fead7..33fa6338 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -619,7 +619,7 @@ PCRE_CONFIG := pcre-config
|
||||
Index: haproxy-2.2/Makefile
|
||||
===================================================================
|
||||
--- haproxy-2.2.orig/Makefile
|
||||
+++ haproxy-2.2/Makefile
|
||||
@@ -660,7 +660,7 @@ PCRE_CONFIG := pcre-config
|
||||
PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
||||
ifneq ($(PCREDIR),)
|
||||
PCRE_INC := $(PCREDIR)/include
|
||||
@ -11,7 +11,7 @@ index d62fead7..33fa6338 100644
|
||||
endif
|
||||
|
||||
ifeq ($(USE_STATIC_PCRE),)
|
||||
@@ -638,7 +638,7 @@ PCRE2_CONFIG := pcre2-config
|
||||
@@ -679,7 +679,7 @@ PCRE2_CONFIG := pcre2-config
|
||||
PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
||||
ifneq ($(PCRE2DIR),)
|
||||
PCRE2_INC := $(PCRE2DIR)/include
|
||||
|
@ -4,12 +4,12 @@ Date: Mon Jun 17 13:00:08 2019 +0000
|
||||
|
||||
SUSE: Makefile sec options
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 33fa6338..3777ad6d 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -675,6 +675,35 @@ endif
|
||||
endif
|
||||
Index: haproxy-2.2/Makefile
|
||||
===================================================================
|
||||
--- haproxy-2.2.orig/Makefile
|
||||
+++ haproxy-2.2/Makefile
|
||||
@@ -741,6 +741,35 @@ ifneq ($(USE_NS),)
|
||||
OPTIONS_OBJS += src/namespace.o
|
||||
endif
|
||||
|
||||
+# PIE
|
||||
@ -41,6 +41,6 @@ index 33fa6338..3777ad6d 100644
|
||||
+OPTIONS_LDFLAGS += -Wl,-z,relro,-z,now
|
||||
+endif
|
||||
+
|
||||
# This one can be changed to look for ebtree files in an external directory
|
||||
EBTREE_DIR := ebtree
|
||||
|
||||
#### Global link options
|
||||
# These options are added at the end of the "ld" command line. Use LDFLAGS to
|
||||
# add options at the beginning of the "ld" command line if needed.
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fb1b1e86480d86fa7e1374c95081abbaa60567a8eec5e79621badfef69c4e1ff
|
||||
size 2787323
|
3
haproxy-2.2.0+git0.3a00c915f.tar.gz
Normal file
3
haproxy-2.2.0+git0.3a00c915f.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:16fc8431c62efb7e98daf687c4c4967e0bd74fe493fd42c035c1b6e90854131e
|
||||
size 2950368
|
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 07 15:13:34 UTC 2020 - mrueckert@suse.de
|
||||
|
||||
- Update to version 2.2.0+git0.3a00c915f:
|
||||
https://www.haproxy.com/blog/announcing-haproxy-2-2/
|
||||
|
||||
* [RELEASE] Released version 2.2.0
|
||||
* MINOR: version: mention that it's an LTS release now
|
||||
* DOC: minor update to coding style file
|
||||
* DOC: update INSTALL with new compiler versions
|
||||
* CLEANUP: ssl: remove unrelevant comment in smp_fetch_ssl_x_keylog()
|
||||
* DOC: configuration: remove obsolete mentions of H2 being converted to HTTP/1.x
|
||||
* BUG/MINOR: connection: See new connection as available only on reuse always
|
||||
* BUG/MEDIUM: connection: Don't consider new private connections as available
|
||||
* BUG/MINOR: backend: Remove CO_FL_SESS_IDLE if a client remains on the last server
|
||||
* MINOR: mux-h1: Improve traces about the splicing
|
||||
- refreshed patches to apply cleanly again:
|
||||
haproxy-1.6.0-makefile_lib.patch
|
||||
haproxy-1.6.0-sec-options.patch
|
||||
- track series file in source rpm
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 09 20:27:50 UTC 2020 - mrueckert@suse.de
|
||||
|
||||
|
@ -53,7 +53,7 @@
|
||||
%endif
|
||||
|
||||
Name: haproxy
|
||||
Version: 2.1.7+git0.8bebf80fb
|
||||
Version: 2.2.0+git0.3a00c915f
|
||||
Release: 0
|
||||
#
|
||||
#
|
||||
@ -102,6 +102,7 @@ Patch1: haproxy-1.6.0_config_haproxy_user.patch
|
||||
Patch2: haproxy-1.6.0-makefile_lib.patch
|
||||
Patch3: haproxy-1.6.0-sec-options.patch
|
||||
#
|
||||
Source98: series
|
||||
Source99: haproxy-rpmlintrc
|
||||
#
|
||||
Summary: The Reliable, High Performance TCP/HTTP Load Balancer
|
||||
|
Loading…
Reference in New Issue
Block a user