Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
12547bd829 | ||
|
|
f002e3e2b1 | ||
|
|
0221240ea3 | ||
| e9875d9d57 | |||
|
|
b3de70ead7 | ||
|
0346a1931f | ||
|
|
8a9d6c930d |
4 changed files with 32 additions and 231 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
/wicked-version-0.6.63.tar.gz
|
||||
/wicked-version-0.6.69.tar.gz
|
||||
/wicked-version-0.6.77.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,218 +0,0 @@
|
|||
From d48906e79036bcf36214235eaaf2feca09060d46 Mon Sep 17 00:00:00 2001
|
||||
From: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
|
||||
Date: Wed, 20 Apr 2022 18:30:55 +0200
|
||||
Subject: [PATCH] wireless: Remove libiw dependencies
|
||||
|
||||
Remove libiw dependency (since https://github.com/openSUSE/wicked/pull/872)
|
||||
used to detect wireless interfaces only.
|
||||
Unfortunately `rtnetlink(7)` does not provide this info in the `NEWLINK`
|
||||
message, so we're using sysfs telling us if an interface has a wireless
|
||||
extension, once the `/sys/class/net/$name/wireless` directory exists
|
||||
(issue: https://github.com/openSUSE/wicked/issues/910).
|
||||
---
|
||||
INSTALL | 1 -
|
||||
README | 7 +++---
|
||||
configure.ac | 1 -
|
||||
src/iflist.c | 9 +++-----
|
||||
src/kernel.c | 61 --------------------------------------------------
|
||||
src/kernel.h | 6 -----
|
||||
wicked.spec.in | 5 -----
|
||||
7 files changed, 6 insertions(+), 84 deletions(-)
|
||||
|
||||
diff --git a/INSTALL b/INSTALL
|
||||
index fc67919fc..c4a808ad8 100644
|
||||
--- a/INSTALL
|
||||
+++ b/INSTALL
|
||||
@@ -10,7 +10,6 @@ These devel packages should be installed to compile wicked from source:
|
||||
autoconf
|
||||
libtool
|
||||
libnl-devel
|
||||
- libiw-devel
|
||||
dbus-1-devel
|
||||
pkg-config
|
||||
libgcrypt-devel
|
||||
diff --git a/README b/README
|
||||
index 45bef2723..7a701c1be 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -96,12 +96,12 @@ These factory interfaces are attached to the
|
||||
Frequently Asked Questions
|
||||
==========================
|
||||
|
||||
-We have a FAQ section hosted in our GitHub's wiki, be sure to check that
|
||||
+We have a FAQ section hosted in our GitHub's wiki, be sure to check that
|
||||
out for common questions about usage or Wicked in general:
|
||||
|
||||
https://github.com/openSUSE/wicked/wiki/FAQ
|
||||
|
||||
-For any questions not answered on the FAQ, please read our section
|
||||
+For any questions not answered on the FAQ, please read our section
|
||||
below: "Where to discuss or report bugs"
|
||||
|
||||
What's currently supported
|
||||
@@ -150,8 +150,7 @@ To build wicked from sources, try following commands:
|
||||
|
||||
zypper in git-core rpm-build gcc make pkg-config \
|
||||
autoconf automake libtool systemd-devel \
|
||||
- libnl3-devel libiw-devel dbus-1-devel \
|
||||
- libgcrypt-devel
|
||||
+ libnl3-devel dbus-1-devel libgcrypt-devel
|
||||
git clone https://github.com/openSUSE/wicked.git
|
||||
cd wicked
|
||||
./autogen.sh
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 08df65cad..bccb11970 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -261,7 +261,6 @@ if test "X$enable_systemd" = Xyes; then
|
||||
fi
|
||||
|
||||
# Checks for header files.
|
||||
-AC_CHECK_HEADER([iwlib.h],[],[AC_MSG_ERROR([Please install libiw-devel to get wireless.h])])
|
||||
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h])
|
||||
AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/ioctl.h sys/param.h])
|
||||
AC_CHECK_HEADERS([sys/socket.h sys/time.h syslog.h unistd.h])
|
||||
diff --git a/src/iflist.c b/src/iflist.c
|
||||
index d8af3e39d..6c90e97d4 100644
|
||||
--- a/src/iflist.c
|
||||
+++ b/src/iflist.c
|
||||
@@ -1138,12 +1138,9 @@ __ni_process_ifinfomsg_linktype(ni_linkinfo_t *link, const char *ifname, ni_netc
|
||||
/* We're at the very least an ethernet. */
|
||||
tmp_link_type = NI_IFTYPE_ETHERNET;
|
||||
|
||||
- /*
|
||||
- * Try to detect if this is a WLAN device.
|
||||
- * The official way of doing this is to check whether
|
||||
- * ioctl(SIOCGIWNAME) succeeds.
|
||||
- */
|
||||
- if (__ni_wireless_get_name(ifname, NULL, 0) == 0)
|
||||
+ /* rtnetlink does not tell us if the device has a
|
||||
+ * wireless extensions or not, but sysfs does. */
|
||||
+ if ( ni_sysfs_netif_exists(ifname, "wireless"))
|
||||
tmp_link_type = NI_IFTYPE_WIRELESS;
|
||||
|
||||
memset(&drv_info, 0, sizeof(drv_info));
|
||||
diff --git a/src/kernel.c b/src/kernel.c
|
||||
index d3057bf79..60fdb7d24 100644
|
||||
--- a/src/kernel.c
|
||||
+++ b/src/kernel.c
|
||||
@@ -108,27 +108,6 @@ __ni_ethtool(const char *ifname, int cmd, void *data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-/*
|
||||
- * Call a wireless extension
|
||||
- */
|
||||
-int
|
||||
-__ni_wireless_ext(const ni_netdev_t *dev, int cmd,
|
||||
- void *data, size_t data_len, unsigned int flags)
|
||||
-{
|
||||
- struct iwreq iwr;
|
||||
-
|
||||
- memset(&iwr, 0, sizeof(iwr));
|
||||
- strncpy(iwr.ifr_name, dev->name, IFNAMSIZ);
|
||||
- iwr.u.data.pointer = data;
|
||||
- iwr.u.data.length = data_len;
|
||||
- iwr.u.data.flags = flags;
|
||||
-
|
||||
- if (__ni_ioctl(cmd, &iwr) < 0)
|
||||
- return -1;
|
||||
- /* Not optimal yet */
|
||||
- return iwr.u.data.length;
|
||||
-}
|
||||
-
|
||||
/*
|
||||
* Bridge helper functions
|
||||
*/
|
||||
@@ -164,46 +143,6 @@ __ni_brioctl_del_port(const char *ifname, unsigned int port_index)
|
||||
return __ni_ioctl(SIOCBRDELIF, &ifr);
|
||||
}
|
||||
|
||||
-/*
|
||||
- * Wireless extension ioctls
|
||||
- */
|
||||
-int
|
||||
-__ni_wireless_get_name(const char *name, char *result, size_t size)
|
||||
-{
|
||||
- struct iwreq iwreq;
|
||||
-
|
||||
- memset(&iwreq, 0, sizeof(iwreq));
|
||||
- strncpy(iwreq.ifr_name, name, IFNAMSIZ);
|
||||
- if (__ni_ioctl(SIOCGIWNAME, &iwreq) < 0)
|
||||
- return -1;
|
||||
-
|
||||
- if (size) {
|
||||
- strncpy(result, iwreq.ifr_name, size-1);
|
||||
- result[size-1] = '\0';
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-int
|
||||
-__ni_wireless_get_essid(const char *name, char *result, size_t size)
|
||||
-{
|
||||
- char buffer[IW_ESSID_MAX_SIZE];
|
||||
- struct iwreq iwreq;
|
||||
-
|
||||
- memset(&iwreq, 0, sizeof(iwreq));
|
||||
- strncpy(iwreq.ifr_name, name, IFNAMSIZ);
|
||||
- iwreq.u.essid.pointer = buffer;
|
||||
- iwreq.u.essid.length = sizeof(buffer);
|
||||
- if (__ni_ioctl(SIOCGIWESSID, &iwreq) < 0)
|
||||
- return -1;
|
||||
-
|
||||
- if (size) {
|
||||
- strncpy(result, buffer, size-1);
|
||||
- result[size-1] = '\0';
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
/*
|
||||
* Create/delete a tun/tap device
|
||||
* Yet another API variant for interface creation...
|
||||
diff --git a/src/kernel.h b/src/kernel.h
|
||||
index 95b30e199..4918f75b0 100644
|
||||
--- a/src/kernel.h
|
||||
+++ b/src/kernel.h
|
||||
@@ -14,7 +14,6 @@
|
||||
#include <linux/fib_rules.h>
|
||||
|
||||
#define __user /* unclean header file */
|
||||
-#include <wireless.h>
|
||||
|
||||
#include <wicked/types.h>
|
||||
|
||||
@@ -40,16 +39,11 @@ __ni_rta_get_uint16(uint16_t *val, struct rtattr *rta)
|
||||
}
|
||||
|
||||
extern int __ni_ethtool(const char *, int, void *);
|
||||
-extern int __ni_wireless_ext(const ni_netdev_t *dev, int cmd,
|
||||
- void *data, size_t data_len, unsigned int flags);
|
||||
extern int __ni_brioctl_add_bridge(const char *);
|
||||
extern int __ni_brioctl_del_bridge(const char *);
|
||||
extern int __ni_brioctl_add_port(const char *, unsigned int);
|
||||
extern int __ni_brioctl_del_port(const char *, unsigned int);
|
||||
|
||||
-extern int __ni_wireless_get_name(const char *, char *, size_t);
|
||||
-extern int __ni_wireless_get_essid(const char *, char *, size_t);
|
||||
-
|
||||
extern int __ni_tuntap_create(const ni_netdev_t *);
|
||||
|
||||
extern int __ni_netdev_rename(const char *old_name, const char *new_name);
|
||||
diff --git a/wicked.spec.in b/wicked.spec.in
|
||||
index 29bf630d4..bf3d9d397 100644
|
||||
--- a/wicked.spec.in
|
||||
+++ b/wicked.spec.in
|
||||
@@ -77,11 +77,6 @@ Obsoletes: libwicked-0-6 < %{version}
|
||||
%endif
|
||||
|
||||
BuildRequires: libnl3-devel
|
||||
-%if 0%{?suse_version} > 1110
|
||||
-BuildRequires: libiw-devel
|
||||
-%else
|
||||
-BuildRequires: wireless-tools
|
||||
-%endif
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: pkg-config
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (wicked-version-0.6.69.tar.gz) = eb925c490ee45b2fb7873086d7e342055e64edebe3c2c44bd689979728b925d81eaba94655fdc504b0975b94cbf3d1dbae1cb410540f3b1aaf3376a839d7bacc
|
||||
SHA512 (wicked-version-0.6.77.tar.gz) = 79abbe380651af8732d0343f410acd36c521f18c67f80916fc675cd394ae3481e8422b51a100305d60bffb88eb0a020f3ec8de14fed052840f8ae81062f7ab34
|
||||
|
|
|
|||
42
wicked.spec
42
wicked.spec
|
|
@ -6,33 +6,27 @@
|
|||
%global wicked_statedir %{_rundir}/%{name}
|
||||
%global wicked_storedir %{_sharedstatedir}/%{name}
|
||||
|
||||
%if 0%{?fedora} >= 30
|
||||
%global dbus_service dbus-broker.service
|
||||
%else
|
||||
%if 0%{?rhel} && 0%{?rhel} < 9
|
||||
%global dbus_service dbus-daemon.service
|
||||
%else
|
||||
%global dbus_service dbus-broker.service
|
||||
%endif
|
||||
|
||||
Name: wicked
|
||||
Version: 0.6.69
|
||||
Release: 6%{?dist}
|
||||
Version: 0.6.77
|
||||
Release: 4%{?dist}
|
||||
Summary: Network configuration infrastructure
|
||||
License: GPLv2+
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://en.opensuse.org/Portal:Wicked
|
||||
Source0: https://github.com/openSUSE/%{name}/archive/version-%{version}/%{name}-version-%{version}.tar.gz
|
||||
|
||||
# Backport from upstream
|
||||
## From: https://github.com/openSUSE/wicked/commit/d48906e79036bcf36214235eaaf2feca09060d46
|
||||
Patch0001: 0001-wireless-Remove-libiw-dependencies.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
BuildRequires: systemd
|
||||
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%endif
|
||||
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
|
|
@ -141,6 +135,7 @@ fi
|
|||
%dir %{_sysconfdir}/wicked
|
||||
%config(noreplace) %{_sysconfdir}/wicked/common.xml
|
||||
%config(noreplace) %{_sysconfdir}/wicked/client.xml
|
||||
%config(noreplace) %{_sysconfdir}/wicked/client-nbft.xml
|
||||
%config(noreplace) %{_sysconfdir}/wicked/server.xml
|
||||
%config(noreplace) %{_sysconfdir}/wicked/nanny.xml
|
||||
%dir %{_sysconfdir}/wicked/scripts
|
||||
|
|
@ -183,6 +178,7 @@ fi
|
|||
%{_mandir}/man8/wicked-redfish.8*
|
||||
%{_mandir}/man8/wickedd.8*
|
||||
%{_mandir}/man8/wicked-ethtool.8*
|
||||
%{_mandir}/man8/wicked-firmware.8*
|
||||
%attr(0750,root,root) %dir %{wicked_storedir}
|
||||
|
||||
%files devel
|
||||
|
|
@ -196,6 +192,28 @@ fi
|
|||
%{_libdir}/libwicked-%{version}.so
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.77-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.77-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.77-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue May 06 2025 Neal Gompa <ngompa@fedoraproject.org> - 0.6.77-1
|
||||
- Rebase to version 0.6.77
|
||||
- Small packaging cleanups
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.69-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0.6.69-8
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.69-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.69-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue