Sébastien Luttringer pushed to branch main at Arch Linux / Packaging / Packages
/ ipvsadm
Commits:
53506677 by Sébastien Luttringer at 2023-08-15T10:46:47+02:00
upgpkg: 1.31-2
- fix FS#77272
- - - - -
2 changed files:
- + 01-use-CFLAGS-and-LDFLAGS-environment.patch
- PKGBUILD
Changes:
=====================================
01-use-CFLAGS-and-LDFLAGS-environment.patch
=====================================
@@ -0,0 +1,52 @@
+From 25d7aa2faef0c36f053ee1ba418fe14022ef6f7c Mon Sep 17 00:00:00 2001
+From: Ryan O'Hara <roh...@redhat.com>
+Date: Tue, 27 Feb 2018 11:49:44 -0600
+Subject: [PATCH] ipvsadm: use CFLAGS and LDFLAGS environment variables
+
+Signed-off-by: Ryan O'Hara <roh...@redhat.com>
+---
+ Makefile | 6 +++---
+ libipvs/Makefile | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 91a2991..2a1d179 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,9 +46,9 @@ INSTALL = install
+ STATIC_LIBS = libipvs/libipvs.a
+
+ ifeq "${ARCH}" "sparc64"
+- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe
-mcpu=ultrasparc -mcmodel=medlow
++ CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe
-mcpu=ultrasparc -mcmodel=medlow
+ else
+- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g
++ CFLAGS += -Wall -Wunused -Wstrict-prototypes -g
+ endif
+
+
+@@ -87,7 +87,7 @@ libs:
+ make -C libipvs
+
+ ipvsadm: $(OBJS) $(STATIC_LIBS)
+- $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ install: all
+ if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
+diff --git a/libipvs/Makefile b/libipvs/Makefile
+index f845c8b..780f3f3 100644
+--- a/libipvs/Makefile
++++ b/libipvs/Makefile
+@@ -1,7 +1,7 @@
+ # Makefile for libipvs
+
+ CC = gcc
+-CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC
++CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -fPIC
+ ifneq (0,$(HAVE_NL))
+ CFLAGS += -DLIBIPVS_USE_NL
+ CFLAGS += $(shell \
+--
+2.14.3
+
=====================================
PKGBUILD
=====================================
@@ -3,34 +3,37 @@
pkgname=ipvsadm
pkgver=1.31
-pkgrel=1
+pkgrel=2
pkgdesc='The IP Virtual Server administration utility'
arch=('x86_64')
url='http://www.linuxvirtualserver.org/software/ipvs.html'
license=('GPL2')
-depends=('libnl1' 'popt' 'bash')
+depends=('glibc' 'libnl' 'popt' 'bash')
backup=("etc/$pkgname.conf")
options=('!makeflags')
install=$pkgname.install
source=("https://kernel.org/pub/linux/utils/kernel/ipvsadm/$pkgname-$pkgver.tar."{xz,sign}
"$pkgname.systemd"
- "$pkgname.service")
+ "$pkgname.service"
+ '01-use-CFLAGS-and-LDFLAGS-environment.patch')
validpgpkeys=('D893F72888349DB4F170F9A23A554D033B37BCED') # Jesper Dangaard
Brouer (RedHat)
# upstream provides sha256sums of release
sha256sums=('1a0a5e25b5a1226435d2fb76341656f83a710183aebb0d204db39c0ec3bedfdb'
'SKIP'
'4960ea254128347b03665d51817f29cb643cf2ebca13f5f46649257552ad3ceb'
- '25506d07f412cccab6f2f3a2a1900d5eeda27bc58602d14f44910c4e036b5341')
+ '25506d07f412cccab6f2f3a2a1900d5eeda27bc58602d14f44910c4e036b5341'
+ '3016d22a0b5d8e735676ea2ab8c9d718fe6254e22fca5cec0a753fe57f34c4f9')
prepare() {
cd $pkgname-$pkgver
# apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- echo "Applying patch ${filename##*/}"
- patch -p1 -N -i "$srcdir/${filename##*/}"
- fi
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
done
:
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/ipvsadm/-/commit/53506677614c158541eb2468911cd8575d8cb216
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/ipvsadm/-/commit/53506677614c158541eb2468911cd8575d8cb216
You're receiving this email because of your account on gitlab.archlinux.org.
