diff --git a/_service b/_service index bc88a13..5cac1c1 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - http://git.haproxy.org/git/haproxy-2.7.git + http://git.haproxy.org/git/haproxy-2.8.git git haproxy @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - v2.7.8 + v2.8.0 enable diff --git a/_servicedata b/_servicedata index 015d8a5..6ce724e 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,6 @@ http://git.haproxy.org/git/haproxy-2.7.git 58c657f26f0f7981df56c87893677924bfa0d9f2 - \ No newline at end of file + + http://git.haproxy.org/git/haproxy-2.8.git + fdd8154ed37fef7f351075caa357917f94704dd7 \ No newline at end of file diff --git a/haproxy-1.6.0-makefile_lib.patch b/haproxy-1.6.0-makefile_lib.patch index f38049a..28c0e55 100644 --- a/haproxy-1.6.0-makefile_lib.patch +++ b/haproxy-1.6.0-makefile_lib.patch @@ -1,22 +1,22 @@ -Index: haproxy-2.6/Makefile +Index: haproxy-2.8/Makefile =================================================================== ---- haproxy-2.6.orig/Makefile -+++ haproxy-2.6/Makefile -@@ -759,7 +759,7 @@ PCRE_CONFIG := pcre-config - PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local) - ifneq ($(PCREDIR),) - PCRE_INC := $(PCREDIR)/include --PCRE_LIB := $(PCREDIR)/lib -+PCRE_LIB := $(PCREDIR)/$(LIB) - endif +--- haproxy-2.8.orig/Makefile ++++ haproxy-2.8/Makefile +@@ -750,7 +750,7 @@ ifneq ($(USE_PCRE)$(USE_STATIC_PCRE)$(US + PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local) + ifneq ($(PCREDIR),) + PCRE_INC := $(PCREDIR)/include +- PCRE_LIB := $(PCREDIR)/lib ++ PCRE_LIB := $(PCREDIR)/$(LIB) + endif - ifeq ($(USE_STATIC_PCRE),) -@@ -778,7 +778,7 @@ PCRE2_CONFIG := pcre2-config - PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local) - ifneq ($(PCRE2DIR),) - PCRE2_INC := $(PCRE2DIR)/include --PCRE2_LIB := $(PCRE2DIR)/lib -+PCRE2_LIB := $(PCRE2DIR)/$(LIB) + PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC)) +@@ -768,7 +768,7 @@ ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$( + PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local) + ifneq ($(PCRE2DIR),) + PCRE2_INC := $(PCRE2DIR)/include +- PCRE2_LIB := $(PCRE2DIR)/lib ++ PCRE2_LIB := $(PCRE2DIR)/$(LIB) - ifeq ($(PCRE2_WIDTH),) - PCRE2_WIDTH = 8 + ifeq ($(PCRE2_WIDTH),) + PCRE2_WIDTH = 8 diff --git a/haproxy-1.6.0-sec-options.patch b/haproxy-1.6.0-sec-options.patch index 4ba192b..ca494a9 100644 --- a/haproxy-1.6.0-sec-options.patch +++ b/haproxy-1.6.0-sec-options.patch @@ -4,12 +4,12 @@ Date: Mon Jun 17 13:00:08 2019 +0000 SUSE: Makefile sec options -Index: haproxy-2.6/Makefile +Index: haproxy-2.8/Makefile =================================================================== ---- haproxy-2.6.orig/Makefile -+++ haproxy-2.6/Makefile -@@ -848,6 +848,35 @@ ifneq ($(USE_LIBATOMIC),) - TARGET_LDFLAGS += -latomic +--- haproxy-2.8.orig/Makefile ++++ haproxy-2.8/Makefile +@@ -849,6 +849,35 @@ ifneq ($(TRACE),) + COPTS += -finstrument-functions endif +# PIE diff --git a/haproxy-2.7.8+git0.58c657f26.tar.gz b/haproxy-2.7.8+git0.58c657f26.tar.gz deleted file mode 100644 index fc38460..0000000 --- a/haproxy-2.7.8+git0.58c657f26.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e503035fba8a783cea2f8035211b642d12174f46d60e7b90e6613e6a8668b59 -size 4302154 diff --git a/haproxy-2.8.0+git0.fdd8154ed.tar.gz b/haproxy-2.8.0+git0.fdd8154ed.tar.gz new file mode 100644 index 0000000..be9966f --- /dev/null +++ b/haproxy-2.8.0+git0.fdd8154ed.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eefabdb2bb0e0e8ca7dde6e49ec94e8369da84fe10374df7394b470c2bc183b5 +size 4458628 diff --git a/haproxy.changes b/haproxy.changes index b1d66e8..e096717 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed May 31 19:10:51 UTC 2023 - Marcus Rueckert + +- 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 diff --git a/haproxy.spec b/haproxy.spec index ab5d534..e8b6118 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -51,7 +51,7 @@ %endif Name: haproxy -Version: 2.7.8+git0.58c657f26 +Version: 2.8.0+git0.fdd8154ed Release: 0 # # diff --git a/series b/series index 18374b4..67324f1 100644 --- a/series +++ b/series @@ -1,4 +1,3 @@ haproxy-1.6.0_config_haproxy_user.patch haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch -lua54.patch