Compare commits

...
Sign in to create a new pull request.

29 commits

Author SHA1 Message Date
nucleo
4cc498d794 Update to 1.2.1 2026-08-08 01:03:25 +03:00
nucleo
f807322ebe New sources 2026-08-06 16:17:56 +03:00
nucleo
bd7552af5d Update to 1.2.0 2026-08-06 07:17:29 +03:00
Fedora Release Engineering
39ae42fcfa Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:05:09 +00:00
nucleo
70316aa391 Update to 1.1.1 2026-07-08 10:52:46 +03:00
nucleo
b05499019f Update to 1.1.0 2026-07-07 13:25:55 +03:00
nucleo
b2512b1246 Update to 1.0.1 2026-05-31 13:28:28 +03:00
nucleo
2b4b4276ac Update to 1.0.0 2026-05-25 18:59:09 +03:00
Fedora Release Engineering
9444dda8c1 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:31:32 +00:00
Fedora Release Engineering
596a7d7a09 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:41:34 +00:00
Fedora Release Engineering
65e46571ad Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:34:11 +00:00
nucleo
2ec5df4702 Update to 0.9.19 2024-11-07 15:07:10 +02:00
Miroslav Suchý
c29ceb9de4 convert GPLv3+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-25 13:27:02 +02:00
Fedora Release Engineering
987ff5cf41 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:05:53 +00:00
David Cantrell
6246d23cdb Rebuild for iniparser-4.2.4
Signed-off-by: David Cantrell <dcantrell@burdell.org>
2024-06-18 14:58:25 -04:00
nucleo
c46120107c Rebuilt for iniparser-4.2.2 2024-05-30 13:57:54 +03:00
Fedora Release Engineering
255dd55254 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 06:56:30 +00:00
Fedora Release Engineering
81d9bb5ccb Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 16:57:15 +00:00
Fedora Release Engineering
e3650e1cf6 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:38:32 +00:00
Fedora Release Engineering
ca7a55fd9f Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:13:46 +00:00
Fedora Release Engineering
8cfb4926d3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:22:17 +00:00
Fedora Release Engineering
6351c6298a - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 19:53:14 +00:00
nucleo
df9c0bcacd Add -lnl-3 in CFLAGS, BuildRequires: libnl3-devel (Bug 1923474) 2021-03-10 11:57:24 +02:00
Fedora Release Engineering
af49e1c9ff - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 22:31:54 +00:00
Fedora Release Engineering
c90fdfdc0e - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:08:01 +00:00
Nicolas Chauvet
4ea2cf95aa Update to 0.9.18 2020-03-30 14:58:14 +02:00
Nicolas Chauvet
a04560097c Add url macro 2020-03-30 14:54:50 +02:00
Fedora Release Engineering
9146799687 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 02:23:35 +00:00
Fedora Release Engineering
7bb772f0be - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 02:17:00 +00:00
6 changed files with 94 additions and 123 deletions

3
.gitignore vendored
View file

@ -1,2 +1 @@
/ubridge-0.9.12.tar.gz
/ubridge-0.9.14.tar.gz
ubridge-*.tar.gz

View file

@ -1,24 +0,0 @@
From cfd588c555dcf02920488b8e3e82b257ef6639f5 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmane@fedoraproject.org>
Date: Tue, 29 Aug 2017 19:51:34 +0100
Subject: [PATCH 1/3] Preserve timestamps during cp
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 132c142..8d8c030 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,6 @@ install : $(NAME)
else
install : $(NAME)
chmod +x $(NAME)
- cp $(NAME) $(BINDIR)
+ cp -p $(NAME) $(BINDIR)
setcap cap_net_admin,cap_net_raw=ep $(BINDIR)/$(NAME)
endif
--
2.13.5

View file

@ -1,65 +0,0 @@
From 7c692d02aef17e65081ccabb2cc81ab743db6920 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmane@fedoraproject.org>
Date: Tue, 29 Aug 2017 22:24:24 +0100
Subject: [PATCH 2/3] Add option to use system provided iniparser
---
Makefile | 10 ++++++++--
src/parse.h | 5 +++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 8d8c030..c5bf8c9 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,6 @@ SRC = src/ubridge.c \
src/nio_unix.c \
src/nio_ethernet.c \
src/nio_tap.c \
- src/iniparser/iniparser.c \
- src/iniparser/dictionary.c \
src/parse.c \
src/packet_filter.c \
src/pcap_capture.c \
@@ -37,6 +35,7 @@ SRC = src/ubridge.c \
src/hypervisor_parser.c \
src/hypervisor_bridge.c
+
OBJ = $(SRC:.c=.o)
CC = gcc
@@ -66,6 +65,13 @@ ifeq ($(shell uname), Linux)
src/netlink/nl.c
endif
+ifeq ($(SYSTEM_INIPARSER),1)
+ CFLAGS += -DUSE_SYSTEM_INIPARSER
+else
+ SRC += src/iniparser/iniparser.c \
+ src/iniparser/dictionary.c
+endif
+
##############################
$(NAME) : $(OBJ)
diff --git a/src/parse.h b/src/parse.h
index be3deb7..969a962 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -22,7 +22,12 @@
#define PARSE_H_
#include "ubridge.h"
+
+#ifdef USE_SYSTEM_INIPARSER
+#include <iniparser.h>
+#else
#include "iniparser/iniparser.h"
+#endif
#define MAX_KEY_SIZE 256
--
2.13.5

View file

@ -1,24 +0,0 @@
From c493edcc28bb3aeb725797180ce611f5538154b1 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmane@fedoraproject.org>
Date: Tue, 29 Aug 2017 23:00:00 +0100
Subject: [PATCH 3/3] Tweak LIBS var as well for system provided iniparse
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index c5bf8c9..c8cd93c 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ endif
ifeq ($(SYSTEM_INIPARSER),1)
CFLAGS += -DUSE_SYSTEM_INIPARSER
+ LIBS += -liniparser
else
SRC += src/iniparser/iniparser.c \
src/iniparser/dictionary.c
--
2.13.5

View file

@ -1 +1 @@
SHA512 (ubridge-0.9.14.tar.gz) = 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f
SHA512 (ubridge-1.2.1.tar.gz) = ee947db5129da2d08b2fe53322283c20838ce3b25e778125d419276b28cecad8cac859ec87613587960097f0bd10e7e439ebcdf43b90476a62496d7f0ed081b8

View file

@ -1,18 +1,19 @@
%global _hardened_build 1
Name: ubridge
Version: 0.9.14
Release: 5%{?dist}
Version: 1.2.1
Release: 1%{?dist}
Summary: Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces
License: GPLv3+
# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
URL: https://github.com/GNS3/ubridge
Source0: https://github.com/GNS3/ubridge/archive/v%{version}/%{name}-%{version}.tar.gz
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Not needed, RPM will auto-generate deps
#Requires: iniparser
BuildRequires: libnl3-devel
BuildRequires: libpcap-devel
BuildRequires: gcc
BuildRequires: make
@ -36,7 +37,7 @@ interfaces is supported. Packet capture is also supported.
%build
make %{?_smp_mflags} SYSTEM_INIPARSER=1 CFLAGS="-DLINUX_RAW $RPM_OPT_FLAGS"
make %{?_smp_mflags} SYSTEM_INIPARSER=1 CFLAGS="-DLINUX_RAW $RPM_OPT_FLAGS -lnl-3"
%install
mkdir -p %{buildroot}%{_bindir}
@ -46,11 +47,95 @@ install -p -m4755 %{name} %{buildroot}%{_bindir}
%files
%license LICENSE
%doc README.rst
%doc README.md SECURITY.md doc/brctl.md doc/link.md
%attr(0755,root,root) %caps(cap_net_admin,cap_net_raw=ep) %{_bindir}/%{name}
%changelog
* Sat Aug 08 2026 Alexey Kurov <nucleo@fedoraproject.org> - 1.2.1-1
- Update to 1.2.1
* Thu Aug 06 2026 Alexey Kurov <nucleo@fedoraproject.org> - 1.2.0-2
- New sources
* Thu Aug 06 2026 Alexey Kurov <nucleo@fedoraproject.org> - 1.2.0-1
- Update to 1.2.0
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Wed Jul 08 2026 Alexey Kurov <nucleo@fedoraproject.org> - 1.1.1-1
- Update to 1.1.1
* Tue Jul 07 2026 Alexey Kurov <nucleo@fedoraproject.org> - 1.1.0-1
- Update to 1.1.0
* Sun May 31 2026 Alexey Kurov <nucleo@fedoraproject.org> - 1.0.1-1
- Update to 1.0.1
* Mon May 25 2026 Alexey Kurov <nucleo@fedoraproject.org> - 1.0.0-1
- Update to 1.0.0
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.19-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Nov 7 2024 Alexey Kurov <nucleo@fedoraproject.org> - 0.9.19-1
- Update to 0.9.19
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 0.9.18-14
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Jun 18 2024 David Cantrell <dcantrell@redhat.com> - 0.9.18-12
- Rebuild for iniparser-4.2.4
* Thu May 30 2024 Alexey Kurov <nucleo@fedoraproject.org> - 0.9.18-11
- Rebuilt for iniparser-4.2.2
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Mar 10 2021 Alexey Kurov <nucleo@fedoraproject.org> - 0.9.18-4
- Add -lnl-3 in CFLAGS, BuildRequires: libnl3-devel (Bug 1923474)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Mar 30 2020 Nicolas Chauvet <kwizart@gmail.com> - 0.9.18-1
- Update to 0.9.18
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Mar 21 2019 Athmane Madjoudj <athmane@fedoraproject.org> - 0.9.14-5
- Enable raw support