Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2014-06-01 19:40:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipvsadm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2014-05-23
07:51:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2014-06-01
19:41:17.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 28 01:07:07 UTC 2014 - crrodrig...@opensuse.org
+
+- 03_libnl-3-linking.patch from debian, allow use of libnl3
+ instead of libnl1
+
+-------------------------------------------------------------------
New:
----
03_libnl-3-linking.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ipvsadm.spec ++++++
--- /var/tmp/diff_new_pack.5hktnq/_old 2014-06-01 19:41:18.000000000 +0200
+++ /var/tmp/diff_new_pack.5hktnq/_new 2014-06-01 19:41:18.000000000 +0200
@@ -18,9 +18,11 @@
Name: ipvsadm
BuildRequires: kernel-source
-BuildRequires: libnl-1_1-devel
+BuildRequires: pkgconfig
BuildRequires: popt-devel
BuildRequires: systemd
+BuildRequires: pkgconfig(libnl-3.0)
+BuildRequires: pkgconfig(libnl-genl-3.0)
Summary: A Utility for Administering the Linux Virtual Server
License: GPL-2.0+
Group: Productivity/Networking/System
@@ -35,6 +37,7 @@
Patch3: ipvsadm-%{version}-ipvs_dests_parse_cb-memory-corruption.diff
# PATCH-FIX-SLE wrong-error-with--ops-option bnc#847005
Patch4: ipvsadm-%{version}-wrong-error-with--ops-option.bnc847005.diff
+Patch5: 03_libnl-3-linking.patch
Provides: %{name}-%{version}
Requires: grep
Requires(pre): %fillup_prereq
@@ -47,7 +50,7 @@
%prep
-%setup
+%setup -q
# This files are embedded here instead of being another source in order
# to the prefix directory
cat >sysconfig.ipvsadm <<EOFF
@@ -70,7 +73,7 @@
%patch2
%patch3
%patch4
-
+%patch5 -p1
%build
make POPT_LIB="-lpopt" CFLAGS="%{optflags} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL"
@@ -80,7 +83,7 @@
# Sysvinit support dropping
rm -rf %{buildroot}/etc/init.d
# install SuSE init script
-install -m 755 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
+install -m 644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{name}
install -m 644 sysconfig.ipvsadm
%{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
install -m 644 ipvsadm.rules %{buildroot}%{_sysconfdir}/%{name}.rules
++++++ 03_libnl-3-linking.patch ++++++
--- ipvsadm-1.26~/Makefile 2012-05-31 18:22:39.000000000 -0400
+++ ipvsadm-1.26/Makefile 2012-05-31 18:22:39.000000000 -0400
@@ -82,7 +82,8 @@
OBJS = ipvsadm.o config_stream.o dynamic_array.o
LIBS = $(POPT_LIB)
ifneq (0,$(HAVE_NL))
-LIBS += -lnl
+INCLUDE += $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0)
+LIBS += $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0)
endif
DEFINES = -DVERSION=\"$(VERSION)\"
-DSCHEDULERS=\"$(SCHEDULERS)\" \
-DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE)
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
ipvsadm-1.26~/libipvs/Makefile ipvsadm-1.26/libipvs/Makefile
--- ipvsadm-1.26~/libipvs/Makefile 2008-09-21 06:02:03.000000000 -0400
+++ ipvsadm-1.26/libipvs/Makefile 2012-05-31 18:22:39.000000000 -0400
@@ -4,6 +4,7 @@
CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC
ifneq (0,$(HAVE_NL))
CFLAGS += -DLIBIPVS_USE_NL
+INCLUDE += $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0)
endif
INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
ipvsadm-1.26~/libipvs/libipvs.c ipvsadm-1.26/libipvs/libipvs.c
--- ipvsadm-1.26~/libipvs/libipvs.c 2011-02-06 21:38:57.000000000 -0500
+++ ipvsadm-1.26/libipvs/libipvs.c 2012-05-31 18:24:11.176032999 -0400
@@ -32,7 +32,7 @@
struct ip_vs_getinfo ipvs_info;
#ifdef LIBIPVS_USE_NL
-static struct nl_handle *sock = NULL;
+static struct nl_sock *sock = NULL;
static int family, try_nl = 1;
#endif
@@ -73,7 +73,7 @@
{
int err = EINVAL;
- sock = nl_handle_alloc();
+ sock = nl_socket_alloc();
if (!sock) {
nlmsg_free(msg);
return -1;
@@ -88,7 +88,7 @@
/* To test connections and set the family */
if (msg == NULL) {
- nl_handle_destroy(sock);
+ nl_socket_free(sock);
sock = NULL;
return 0;
}
@@ -104,12 +104,12 @@
nlmsg_free(msg);
- nl_handle_destroy(sock);
+ nl_socket_free(sock);
return 0;
fail_genl:
- nl_handle_destroy(sock);
+ nl_socket_free(sock);
sock = NULL;
nlmsg_free(msg);
errno = err;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
