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

Accepting request 894761 from server:http

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/894761
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=103
This commit is contained in:
Dominique Leuenberger 2021-05-23 21:30:32 +00:00 committed by Git OBS Bridge
commit 7760d2cd73
10 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -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.3.git</param> <param name="url">http://git.haproxy.org/git/haproxy-2.4.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.3.10</param> <param name="revision">v2.4.0</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
</service> </service>

10
_servicedata
View File

@ -1,10 +1,6 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">http://git.haproxy.org/git/haproxy-2.1.git</param> <param name="url">http://git.haproxy.org/git/haproxy-2.4.git</param>
<param name="changesrevision">v2.2.0</param> <param name="changesrevision">6cbbecf09734aeb5fa8bb88f36f06a6f6d35e813</param>
</service> </service>
<service name="tar_scm"> </servicedata>
<param name="url">http://git.haproxy.org/git/haproxy-2.2.git</param>
<param name="changesrevision">34b2b106689c8a017eb5726193b199ea96f2c9f7</param></service><service name="tar_scm">
<param name="url">http://git.haproxy.org/git/haproxy-2.3.git</param>
<param name="changesrevision">4764f0e4eac1a823331f59e2a2c68e96e303a112</param></service></servicedata>

10
haproxy-1.6.0-makefile_lib.patch
View File

@ -1,8 +1,8 @@
Index: haproxy-2.2/Makefile Index: haproxy-2.4/Makefile
=================================================================== ===================================================================
--- haproxy-2.2.orig/Makefile --- haproxy-2.4.orig/Makefile
+++ haproxy-2.2/Makefile +++ haproxy-2.4/Makefile
@@ -660,7 +660,7 @@ PCRE_CONFIG := pcre-config @@ -716,7 +716,7 @@ PCRE_CONFIG := pcre-config
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
@ -11,7 +11,7 @@ Index: haproxy-2.2/Makefile
endif endif
ifeq ($(USE_STATIC_PCRE),) ifeq ($(USE_STATIC_PCRE),)
@@ -679,7 +679,7 @@ PCRE2_CONFIG := pcre2-config @@ -735,7 +735,7 @@ PCRE2_CONFIG := pcre2-config
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

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 SUSE: Makefile sec options
Index: haproxy-2.2/Makefile Index: haproxy-2.4/Makefile
=================================================================== ===================================================================
--- haproxy-2.2.orig/Makefile --- haproxy-2.4.orig/Makefile
+++ haproxy-2.2/Makefile +++ haproxy-2.4/Makefile
@@ -741,6 +741,35 @@ ifneq ($(USE_NS),) @@ -801,6 +801,35 @@ ifneq ($(USE_OT),)
OPTIONS_OBJS += src/namespace.o include addons/ot/Makefile
endif endif
+# PIE +# PIE

3
haproxy-2.3.10+git0.4764f0e4e.tar.gz
View File

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

3
haproxy-2.4.0+git0.6cbbecf09.tar.gz Normal file
View File

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

12
haproxy.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri May 14 08:31:04 UTC 2021 - mrueckert@suse.de
- Update to version 2.4.0+git0.6cbbecf09:
https://www.haproxy.com/blog/announcing-haproxy-2-4/
for all the details see /usr/share/doc/packages/haproxy/CHANGELOG
- refreshed patches to apply cleanly again
haproxy-1.6.0-makefile_lib.patch
haproxy-1.6.0-sec-options.patch
lua54.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 23 20:35:49 UTC 2021 - mrueckert@suse.de Fri Apr 23 20:35:49 UTC 2021 - mrueckert@suse.de

23
haproxy.spec
View File

@ -53,7 +53,7 @@
%endif %endif
Name: haproxy Name: haproxy
Version: 2.3.10+git0.4764f0e4e Version: 2.4.0+git0.6cbbecf09
Release: 0 Release: 0
# #
# #
@ -171,26 +171,31 @@ make %{?_smp_mflags} \
USE_RELRO_NOW=1 \ USE_RELRO_NOW=1 \
LIB="%{_lib}" \ LIB="%{_lib}" \
PREFIX="%{_prefix}" \ PREFIX="%{_prefix}" \
EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" \ USE_PROMEX=1 \
%if %{with opentracing}
USE_OT=1 \
%endif
%if %{with memory_profiling}
USE_MEMORY_PROFILING=1 \
%endif
DEBUG_CFLAGS="%{optflags}" V=1 DEBUG_CFLAGS="%{optflags}" V=1
%if %{with systemd} %if %{with systemd}
make -C contrib/systemd PREFIX="%{_prefix}" make -C admin/systemd PREFIX="%{_prefix}"
%if %{with sysusers} %if %{with sysusers}
%sysusers_generate_pre %{SOURCE5} haproxy %sysusers_generate_pre %{SOURCE5} haproxy
%endif %endif
%endif %endif
make -C contrib/halog PREFIX="%{_prefix}" \ make admin/halog/halog DEBUG_CFLAGS="%{optflags}" V=1
DEFINE="%{optflags} -pie -fpie -fstack-protector -Wl,-z,relro,-z,now"
%install %install
install -D -m 0755 %{pkg_name} %{buildroot}%{_sbindir}/%{pkg_name} install -D -m 0755 %{pkg_name} %{buildroot}%{_sbindir}/%{pkg_name}
install -d -m 0750 %{buildroot}%{_sysconfdir}/%{pkg_name}/ install -d -m 0750 %{buildroot}%{_sysconfdir}/%{pkg_name}/
install -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg install -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg
install -D -m 0755 contrib/halog/halog %{buildroot}%{_sbindir}/haproxy-halog install -D -m 0755 admin/halog/halog %{buildroot}%{_sbindir}/haproxy-halog
%if %{with systemd} %if %{with systemd}
install -D -m 0644 contrib/systemd/%{pkg_name}.service %{buildroot}%{_unitdir}/%{pkg_name}.service install -D -m 0644 admin/systemd/%{pkg_name}.service %{buildroot}%{_unitdir}/%{pkg_name}.service
ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{pkg_name} ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{pkg_name}
%if %{with sysusers} %if %{with sysusers}
install -D -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/haproxy-user.conf install -D -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/haproxy-user.conf
@ -201,7 +206,7 @@ ln -fs %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
%endif %endif
install -d -m 0750 %{buildroot}%{pkg_home} install -d -m 0750 %{buildroot}%{pkg_home}
install -D -m 0644 contrib/syntax-highlight/haproxy.vim %{buildroot}%{vim_data_dir}/syntax/%{pkg_name}.vim install -D -m 0644 admin/syntax-highlight/haproxy.vim %{buildroot}%{vim_data_dir}/syntax/%{pkg_name}.vim
install -D -m 0644 doc/%{pkg_name}.1 %{buildroot}%{_mandir}/man1/%{pkg_name}.1 install -D -m 0644 doc/%{pkg_name}.1 %{buildroot}%{_mandir}/man1/%{pkg_name}.1
%if %{with apparmor} %if %{with apparmor}
install -D -m 0644 %{S:2} %{buildroot}/etc/apparmor.d/usr.sbin.haproxy install -D -m 0644 %{S:2} %{buildroot}/etc/apparmor.d/usr.sbin.haproxy
@ -260,7 +265,7 @@ getent passwd %{pkg_name} >/dev/null || \
%license LICENSE %license LICENSE
%doc CHANGELOG README %doc CHANGELOG README
%doc ROADMAP doc/* examples/ %doc ROADMAP doc/* examples/
%doc contrib/netsnmp-perl/ contrib/selinux/ %doc admin/netsnmp-perl/ admin/selinux/
%dir %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name} %dir %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name}
%config(noreplace) %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name}/* %config(noreplace) %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name}/*
%if %{with systemd} %if %{with systemd}

26
lua54.patch
View File

@ -1,15 +1,17 @@
--- a/Makefile Index: haproxy-2.4/Makefile
+++ b/Makefile ===================================================================
@@ -101,7 +101,7 @@ --- haproxy-2.4.orig/Makefile
+++ haproxy-2.4/Makefile
@@ -104,7 +104,7 @@
# LUA_LIB : force the lib path to lua # LUA_LIB : force the lib path to lua
# LUA_INC : force the include path to lua # LUA_INC : force the include path to lua
# LUA_LIB_NAME : force the lib name (or automatically evaluated, by order of # LUA_LIB_NAME : force the lib name (or automatically evaluated, by order of
-# priority : lua5.3, lua53, lua). -# priority : lua5.3, lua53, lua).
+# priority : lua5.4, lua54, lua5.3, lua53, lua). +# priority : lua5.4, lua5.3, lua53, lua).
# IGNOREGIT : ignore GIT commit versions if set. # OT_DEBUG : compile the OpenTracing filter in debug mode
# VERSION : force haproxy version reporting. # OT_INC : force the include path to libopentracing-c-wrapper
# SUBVERS : add a sub-version (eg: platform, model, ...). # OT_LIB : force the lib path to libopentracing-c-wrapper
@@ -579,11 +579,11 @@ @@ -608,11 +608,11 @@ OPTIONS_CFLAGS += $(if $(LUA_INC),-I$(L
LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) $(if $(LUA_LIB),-L$(LUA_LIB)) LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) $(if $(LUA_LIB),-L$(LUA_LIB))
ifeq ($(LUA_LIB_NAME),) ifeq ($(LUA_LIB_NAME),)
# Try to automatically detect the Lua library # Try to automatically detect the Lua library
@ -24,9 +26,11 @@
ifneq ($(LUA_INC),) ifneq ($(LUA_INC),)
OPTIONS_CFLAGS += -I$(LUA_INC) OPTIONS_CFLAGS += -I$(LUA_INC)
endif endif
--- a/INSTALL Index: haproxy-2.4/INSTALL
+++ b/INSTALL ===================================================================
@@ -295,9 +295,9 @@ --- haproxy-2.4.orig/INSTALL
+++ haproxy-2.4/INSTALL
@@ -318,9 +318,9 @@ Lua is an embedded programming language
advanced scripting capabilities. Only versions 5.3 and above are supported. advanced scripting capabilities. Only versions 5.3 and above are supported.
In order to enable Lua support, please specify "USE_LUA=1" on the command line. In order to enable Lua support, please specify "USE_LUA=1" on the command line.
Some systems provide this library under various names to avoid conflicts with Some systems provide this library under various names to avoid conflicts with

1
series
View File

@ -1,3 +1,4 @@
haproxy-1.6.0_config_haproxy_user.patch -p1 haproxy-1.6.0_config_haproxy_user.patch -p1
haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-makefile_lib.patch
haproxy-1.6.0-sec-options.patch haproxy-1.6.0-sec-options.patch
lua54.patch