rpm/haproxy
SHA256
1
0
Fork 0
forked from pool/haproxy
Code Pull Requests Activity

Accepting request 1090094 from server:http

Browse Source 
- 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/request/show/1090094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=131
This commit is contained in:
Dominique Leuenberger 2023-06-01 15:19:32 +00:00 committed by Git OBS Bridge
commit 8e662f2fd7
9 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -1,12 +1,12 @@
<services>
<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="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.7.8</param>
<param name="revision">v2.8.0</param>
<param name="changesgenerate">enable</param>
</service>

4
_servicedata
View File

@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">http://git.haproxy.org/git/haproxy-2.7.git</param>
<param name="changesrevision">58c657f26f0f7981df56c87893677924bfa0d9f2</param>
<param name="url">http://git.haproxy.org/git/haproxy-2.8.git</param>
<param name="changesrevision">fdd8154ed37fef7f351075caa357917f94704dd7</param>
</service>
</servicedata>

38
haproxy-1.6.0-makefile_lib.patch
View File

@ -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

10
haproxy-1.6.0-sec-options.patch
View File

@ -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

3
haproxy-2.7.8+git0.58c657f26.tar.gz
View File

@ -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
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eefabdb2bb0e0e8ca7dde6e49ec94e8369da84fe10374df7394b470c2bc183b5
size 4458628

14
haproxy.changes
View File

@ -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

2
haproxy.spec
View File

@ -51,7 +51,7 @@
%endif
Name: haproxy
Version: 2.7.8+git0.58c657f26
Version: 2.8.0+git0.fdd8154ed
Release: 0
#
#

1
series
View File

@ -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