* [PR PATCH] libnl: drop package
@ 2024-01-10 3:22 sgn
2024-01-12 19:12 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2024-01-10 3:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages rm-libnl
https://github.com/void-linux/void-packages/pull/48149
libnl: drop package
No other packages linked to libnl anymore.
Everyone supposed to use libnl-3 instead.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48149.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rm-libnl-48149.patch --]
[-- Type: text/x-diff, Size: 5772 bytes --]
From cb87aacb02d3f38ab5b98961ddaa64e805ffe1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 18 Dec 2023 10:37:07 +0700
Subject: [PATCH] libnl: drop package
No other packages linked to libnl anymore.
Everyone supposed to use libnl-3 instead.
---
srcpkgs/libnl-devel | 1 -
srcpkgs/libnl/patches/fix-includes.patch | 25 -----------
srcpkgs/libnl/patches/fix-strerror_r.patch | 50 ---------------------
srcpkgs/libnl/patches/libnl-1.1-flags.patch | 11 -----
srcpkgs/libnl/template | 22 ---------
srcpkgs/libnl/update | 1 -
6 files changed, 110 deletions(-)
delete mode 120000 srcpkgs/libnl-devel
delete mode 100644 srcpkgs/libnl/patches/fix-includes.patch
delete mode 100644 srcpkgs/libnl/patches/fix-strerror_r.patch
delete mode 100644 srcpkgs/libnl/patches/libnl-1.1-flags.patch
delete mode 100644 srcpkgs/libnl/template
delete mode 100644 srcpkgs/libnl/update
diff --git a/srcpkgs/libnl-devel b/srcpkgs/libnl-devel
deleted file mode 120000
index 49e285a3f3a3b..0000000000000
--- a/srcpkgs/libnl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libnl
\ No newline at end of file
diff --git a/srcpkgs/libnl/patches/fix-includes.patch b/srcpkgs/libnl/patches/fix-includes.patch
deleted file mode 100644
index 8e36b4982bea4..0000000000000
--- a/srcpkgs/libnl/patches/fix-includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/lib/netfilter/log.c
-+++ b/lib/netfilter/log.c
-@@ -18,6 +18,7 @@
- * @{
- */
-
-+#include <byteswap.h>
- #include <sys/types.h>
- #include <linux/netfilter/nfnetlink_log.h>
-
---- a/include/netlink/netlink.h
-+++ b/include/netlink/netlink.h
-@@ -12,11 +12,11 @@
- #ifndef NETLINK_NETLINK_H_
- #define NETLINK_NETLINK_H_
-
-+#include <poll.h>
- #include <stdio.h>
- #include <stdint.h>
- #include <string.h>
- #include <stdlib.h>
--#include <sys/poll.h>
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/time.h>
diff --git a/srcpkgs/libnl/patches/fix-strerror_r.patch b/srcpkgs/libnl/patches/fix-strerror_r.patch
deleted file mode 100644
index 7dc6831525ddb..0000000000000
--- a/srcpkgs/libnl/patches/fix-strerror_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/lib/fib_lookup/lookup.c
-+++ b/lib/fib_lookup/lookup.c
-@@ -124,7 +124,7 @@
- static int result_dump_brief(struct nl_object *obj, struct nl_dump_params *p)
- {
- struct flnl_result *res = (struct flnl_result *) obj;
-- char buf[256];
-+ char buf[256], buf2[256];
- int line = 1;
-
- dp_dump(p, "table %s prefixlen %u next-hop-selector %u\n",
-@@ -132,9 +132,10 @@
- res->fr_prefixlen, res->fr_nh_sel);
- dp_dump_line(p, line++, "type %s ",
- nl_rtntype2str(res->fr_type, buf, sizeof(buf)));
-+ strerror_r(-res->fr_error, buf2, sizeof(buf2));
- dp_dump(p, "scope %s error %s (%d)\n",
- rtnl_scope2str(res->fr_scope, buf, sizeof(buf)),
-- strerror_r(-res->fr_error, buf, sizeof(buf)), res->fr_error);
-+ buf2, res->fr_error);
-
- return line;
- }
---- a/lib/handlers.c
-+++ b/lib/handlers.c
-@@ -136,8 +136,8 @@
- FILE *ofd = arg ? arg : stderr;
- char buf[256];
-
-- fprintf(ofd, "-- Error received: %s\n-- Original message: ",
-- strerror_r(-e->error, buf, sizeof(buf)));
-+ strerror_r(-e->error, buf, sizeof(buf));
-+ fprintf(ofd, "-- Error received: %s\n-- Original message: ", buf);
- print_header_content(ofd, &e->msg);
- fprintf(ofd, "\n");
-
---- a/lib/msg.c
-+++ b/lib/msg.c
-@@ -961,9 +961,9 @@
- struct nlmsgerr *err = nlmsg_data(hdr);
- char buf[256];
-
-+ strerror_r(-err->error, buf, sizeof(buf));
- fprintf(ofd, " [ERRORMSG] %Zu octets\n", sizeof(*err));
-- fprintf(ofd, " .error = %d \"%s\"\n", err->error,
-- strerror_r(-err->error, buf, sizeof(buf)));
-+ fprintf(ofd, " .error = %d \"%s\"\n", err->error, buf);
- fprintf(ofd, " [ORIGINAL MESSAGE] %Zu octets\n", sizeof(*hdr));
-
- errmsg = nlmsg_inherit(&err->msg);
diff --git a/srcpkgs/libnl/patches/libnl-1.1-flags.patch b/srcpkgs/libnl/patches/libnl-1.1-flags.patch
deleted file mode 100644
index 2e0a4be33ce5b..0000000000000
--- a/srcpkgs/libnl/patches/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Makefile 2008-01-14 16:48:45.000000000 +0100
-+++ b/lib/Makefile 2009-05-26 09:47:42.000000000 +0200
-@@ -48,7 +48,7 @@
-
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- @echo " LD $(OUT_SLIB)"; \
-- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \
- rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \
diff --git a/srcpkgs/libnl/template b/srcpkgs/libnl/template
deleted file mode 100644
index ab8c03352d7d2..0000000000000
--- a/srcpkgs/libnl/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libnl'
-pkgname=libnl
-version=1.1.4
-revision=4
-build_style=gnu-configure
-short_desc="Library for applications dealing with netlink sockets"
-homepage="http://www.infradead.org/~tgr/libnl/"
-license="LGPL-2.1-only"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.infradead.org/~tgr/libnl/files/libnl-${version}.tar.gz"
-checksum=4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063
-
-libnl-devel_package() {
- depends="libnl>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libnl/update b/srcpkgs/libnl/update
deleted file mode 100644
index 737f347957090..0000000000000
--- a/srcpkgs/libnl/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern=">libnl-\K1\..+(?=\.tar\.gz</a>)"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: libnl: drop package
2024-01-10 3:22 [PR PATCH] libnl: drop package sgn
@ 2024-01-12 19:12 ` leahneukirchen
0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2024-01-12 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There's a merged pull request on the void-packages repository
libnl: drop package
https://github.com/void-linux/void-packages/pull/48149
Description:
No other packages linked to libnl anymore.
Everyone supposed to use libnl-3 instead.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-12 19:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-10 3:22 [PR PATCH] libnl: drop package sgn
2024-01-12 19:12 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).