From af70820bd2e5be572dbfccacf0e062045c8d02867e36fbcbb2443dfd71ef66e9 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Thu, 11 Jul 2024 14:58:02 +0000
Subject: [PATCH] - refreshed patches:   haproxy-1.6.0-makefile_lib.patch  
 haproxy-1.6.0-sec-options.patch

OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=309
---
 haproxy-1.6.0-makefile_lib.patch | 10 +++++-----
 haproxy-1.6.0-sec-options.patch  |  8 ++++----
 haproxy.changes                  |  7 +++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/haproxy-1.6.0-makefile_lib.patch b/haproxy-1.6.0-makefile_lib.patch
index 28c0e55..652f4c1 100644
--- a/haproxy-1.6.0-makefile_lib.patch
+++ b/haproxy-1.6.0-makefile_lib.patch
@@ -1,8 +1,8 @@
-Index: haproxy-2.8/Makefile
+Index: haproxy-3.0/Makefile
 ===================================================================
---- haproxy-2.8.orig/Makefile
-+++ haproxy-2.8/Makefile
-@@ -750,7 +750,7 @@ ifneq ($(USE_PCRE)$(USE_STATIC_PCRE)$(US
+--- haproxy-3.0.orig/Makefile
++++ haproxy-3.0/Makefile
+@@ -784,7 +784,7 @@ ifneq ($(USE_PCRE:0=)$(USE_STATIC_PCRE:0
    PCREDIR     := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local)
    ifneq ($(PCREDIR),)
      PCRE_INC := $(PCREDIR)/include
@@ -11,7 +11,7 @@ Index: haproxy-2.8/Makefile
    endif
  
    PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC))
-@@ -768,7 +768,7 @@ ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(
+@@ -802,7 +802,7 @@ ifneq ($(USE_PCRE2:0=)$(USE_STATIC_PCRE2
    PCRE2DIR     := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local)
    ifneq ($(PCRE2DIR),)
      PCRE2_INC := $(PCRE2DIR)/include
diff --git a/haproxy-1.6.0-sec-options.patch b/haproxy-1.6.0-sec-options.patch
index ca494a9..3bbbee7 100644
--- a/haproxy-1.6.0-sec-options.patch
+++ b/haproxy-1.6.0-sec-options.patch
@@ -4,11 +4,11 @@ Date:   Mon Jun 17 13:00:08 2019 +0000
 
     SUSE: Makefile sec options
 
-Index: haproxy-2.8/Makefile
+Index: haproxy-3.0/Makefile
 ===================================================================
---- haproxy-2.8.orig/Makefile
-+++ haproxy-2.8/Makefile
-@@ -849,6 +849,35 @@ ifneq ($(TRACE),)
+--- haproxy-3.0.orig/Makefile
++++ haproxy-3.0/Makefile
+@@ -887,6 +887,35 @@ ifneq ($(TRACE),)
    COPTS += -finstrument-functions
  endif
  
diff --git a/haproxy.changes b/haproxy.changes
index 88b5920..789a6a2 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 11 14:57:46 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- refreshed patches:
+  haproxy-1.6.0-makefile_lib.patch
+  haproxy-1.6.0-sec-options.patch
+
 -------------------------------------------------------------------
 Thu Jul 11 14:56:11 UTC 2024 - mrueckert@suse.de