- Refreshed patches to apply cleanly again:
haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch - Updated series file: removed outdated patches - Update to version 2.8.0+git0.fdd8154ed: https://www.mail-archive.com/haproxy@formilux.org/msg43600.html OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=284
This commit is contained in:
parent
0722f0d7b0
commit
0d50066a3d
4
_service
4
_service
@ -1,12 +1,12 @@
|
|||||||
<services>
|
<services>
|
||||||
<service name="tar_scm" mode="disabled">
|
<service name="tar_scm" mode="disabled">
|
||||||
<param name="url">http://git.haproxy.org/git/haproxy-2.7.git</param>
|
<param name="url">http://git.haproxy.org/git/haproxy-2.8.git</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="filename">haproxy</param>
|
<param name="filename">haproxy</param>
|
||||||
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
|
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
|
||||||
<param name="versionrewrite-pattern">v(.*)</param>
|
<param name="versionrewrite-pattern">v(.*)</param>
|
||||||
<param name="versionrewrite-replacement">\1</param>
|
<param name="versionrewrite-replacement">\1</param>
|
||||||
<param name="revision">v2.7.8</param>
|
<param name="revision">v2.8.0</param>
|
||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">enable</param>
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
|
@ -3,4 +3,6 @@
|
|||||||
<param name="url">http://git.haproxy.org/git/haproxy-2.7.git</param>
|
<param name="url">http://git.haproxy.org/git/haproxy-2.7.git</param>
|
||||||
<param name="changesrevision">58c657f26f0f7981df56c87893677924bfa0d9f2</param>
|
<param name="changesrevision">58c657f26f0f7981df56c87893677924bfa0d9f2</param>
|
||||||
</service>
|
</service>
|
||||||
</servicedata>
|
<service name="tar_scm">
|
||||||
|
<param name="url">http://git.haproxy.org/git/haproxy-2.8.git</param>
|
||||||
|
<param name="changesrevision">fdd8154ed37fef7f351075caa357917f94704dd7</param></service></servicedata>
|
@ -1,22 +1,22 @@
|
|||||||
Index: haproxy-2.6/Makefile
|
Index: haproxy-2.8/Makefile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- haproxy-2.6.orig/Makefile
|
--- haproxy-2.8.orig/Makefile
|
||||||
+++ haproxy-2.6/Makefile
|
+++ haproxy-2.8/Makefile
|
||||||
@@ -759,7 +759,7 @@ PCRE_CONFIG := pcre-config
|
@@ -750,7 +750,7 @@ ifneq ($(USE_PCRE)$(USE_STATIC_PCRE)$(US
|
||||||
PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
||||||
ifneq ($(PCREDIR),)
|
ifneq ($(PCREDIR),)
|
||||||
PCRE_INC := $(PCREDIR)/include
|
PCRE_INC := $(PCREDIR)/include
|
||||||
-PCRE_LIB := $(PCREDIR)/lib
|
- PCRE_LIB := $(PCREDIR)/lib
|
||||||
+PCRE_LIB := $(PCREDIR)/$(LIB)
|
+ PCRE_LIB := $(PCREDIR)/$(LIB)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_STATIC_PCRE),)
|
PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC))
|
||||||
@@ -778,7 +778,7 @@ PCRE2_CONFIG := pcre2-config
|
@@ -768,7 +768,7 @@ ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(
|
||||||
PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
||||||
ifneq ($(PCRE2DIR),)
|
ifneq ($(PCRE2DIR),)
|
||||||
PCRE2_INC := $(PCRE2DIR)/include
|
PCRE2_INC := $(PCRE2DIR)/include
|
||||||
-PCRE2_LIB := $(PCRE2DIR)/lib
|
- PCRE2_LIB := $(PCRE2DIR)/lib
|
||||||
+PCRE2_LIB := $(PCRE2DIR)/$(LIB)
|
+ PCRE2_LIB := $(PCRE2DIR)/$(LIB)
|
||||||
|
|
||||||
ifeq ($(PCRE2_WIDTH),)
|
ifeq ($(PCRE2_WIDTH),)
|
||||||
PCRE2_WIDTH = 8
|
PCRE2_WIDTH = 8
|
||||||
|
@ -4,12 +4,12 @@ Date: Mon Jun 17 13:00:08 2019 +0000
|
|||||||
|
|
||||||
SUSE: Makefile sec options
|
SUSE: Makefile sec options
|
||||||
|
|
||||||
Index: haproxy-2.6/Makefile
|
Index: haproxy-2.8/Makefile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- haproxy-2.6.orig/Makefile
|
--- haproxy-2.8.orig/Makefile
|
||||||
+++ haproxy-2.6/Makefile
|
+++ haproxy-2.8/Makefile
|
||||||
@@ -848,6 +848,35 @@ ifneq ($(USE_LIBATOMIC),)
|
@@ -849,6 +849,35 @@ ifneq ($(TRACE),)
|
||||||
TARGET_LDFLAGS += -latomic
|
COPTS += -finstrument-functions
|
||||||
endif
|
endif
|
||||||
|
|
||||||
+# PIE
|
+# PIE
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:8e503035fba8a783cea2f8035211b642d12174f46d60e7b90e6613e6a8668b59
|
|
||||||
size 4302154
|
|
3
haproxy-2.8.0+git0.fdd8154ed.tar.gz
Normal file
3
haproxy-2.8.0+git0.fdd8154ed.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:eefabdb2bb0e0e8ca7dde6e49ec94e8369da84fe10374df7394b470c2bc183b5
|
||||||
|
size 4458628
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 31 19:10:51 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
- Refreshed patches to apply cleanly again:
|
||||||
|
haproxy-1.6.0-makefile_lib.patch
|
||||||
|
haproxy-1.6.0-sec-options.patch
|
||||||
|
- Updated series file: removed outdated patches
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 31 19:07:54 UTC 2023 - mrueckert@suse.de
|
||||||
|
|
||||||
|
- Update to version 2.8.0+git0.fdd8154ed:
|
||||||
|
https://www.mail-archive.com/haproxy@formilux.org/msg43600.html
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 02 14:06:55 UTC 2023 - mrueckert@suse.de
|
Tue May 02 14:06:55 UTC 2023 - mrueckert@suse.de
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: haproxy
|
Name: haproxy
|
||||||
Version: 2.7.8+git0.58c657f26
|
Version: 2.8.0+git0.fdd8154ed
|
||||||
Release: 0
|
Release: 0
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user