Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (a98bd56e5e11224645a3bb041e3b8351d3a45770)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (a98bd56e5e11224645a3bb041e3b8351d3a45770)
  • Date: Wed, 17 Jul 2024 17:04:50 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

net/iproute2/DETAILS | 3
net/iproute2/HISTORY | 5
net/iproute2/PRE_BUILD | 1
net/iproute2/patches/0001-Fix-usage-of-poll.h-header.patch | 75
-------------
4 files changed, 6 insertions(+), 78 deletions(-)

New commits:
commit a98bd56e5e11224645a3bb041e3b8351d3a45770
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

net/iproute2: version 6.10.0

diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index fa7964f..b4d2c97 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,6 +1,5 @@
SPELL=iproute2
- VERSION=6.9.0
- PATCHLEVEL=1
+ VERSION=6.10.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=${KERNEL_URL}/pub/linux/utils/net/iproute2/$SOURCE
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 1d097fd..f4dcf68 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,8 @@
+2024-07-17 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 6.10.0
+ * PRE_BUILD, patches/0001-Fix-usage-of-poll.h-header.patch: removed,
+ applied in upstream
+
2024-06-23 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: added dependency on libtirpc
improved description of libnml
diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index e826254..2ab7277 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -13,7 +13,6 @@ rm "${SOURCE_CACHE}/${SOURCE}" &&
SOURCE="${SOURCE}.xz" &&

cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches &&

if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} LIBELF); then
sedit "s:libelf --:nolibelf --:" configure
diff --git a/net/iproute2/patches/0001-Fix-usage-of-poll.h-header.patch
b/net/iproute2/patches/0001-Fix-usage-of-poll.h-header.patch
deleted file mode 100644
index dfa352b..0000000
--- a/net/iproute2/patches/0001-Fix-usage-of-poll.h-header.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 959366d9f8e9ff322f383813fb7bd2257491579a Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Sat, 18 May 2024 23:41:25 +0200
-Subject: [iproute2 PATCH] Fix usage of poll.h header
-
-Change the legacy <sys/poll.h> to <poll.h> (POSIX.1-2001).
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
-Reviewed-by: Jiri Pirko <jiri AT nvidia.com>
-Signed-off-by: Stephen Hemminger <stephen AT networkplumber.org>
-Upstream-Status: Accepted
-
[https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=f9601b10c211]
-Origin: Source Mage
----
- misc/arpd.c | 2 +-
- misc/ifstat.c | 2 +-
- misc/nstat.c | 2 +-
- misc/rtacct.c | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/misc/arpd.c b/misc/arpd.c
-index 65ac6a3828e6..3185620f7a74 100644
---- a/misc/arpd.c
-+++ b/misc/arpd.c
-@@ -14,7 +14,7 @@
- #include <netdb.h>
- #include <db_185.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/uio.h>
-diff --git a/misc/ifstat.c b/misc/ifstat.c
-index 9b93ded32a61..faebe938e598 100644
---- a/misc/ifstat.c
-+++ b/misc/ifstat.c
-@@ -17,7 +17,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <signal.h>
-diff --git a/misc/nstat.c b/misc/nstat.c
-index 07d010dec35f..fce3e9c1ec79 100644
---- a/misc/nstat.c
-+++ b/misc/nstat.c
-@@ -17,7 +17,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <signal.h>
-diff --git a/misc/rtacct.c b/misc/rtacct.c
-index 08363bfd4f26..cd84b7f06b9b 100644
---- a/misc/rtacct.c
-+++ b/misc/rtacct.c
-@@ -16,7 +16,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
---
-2.44.0
-


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (a98bd56e5e11224645a3bb041e3b8351d3a45770), Pavel Vinogradov, 07/17/2024

Archive powered by MHonArc 2.6.24.

Top of Page