diff --git a/.gitignore b/.gitignore index 16ab27f..46a83d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/ubridge-0.9.12.tar.gz -/ubridge-0.9.14.tar.gz +ubridge-*.tar.gz diff --git a/0001-Preserve-timestamps-during-cp.patch b/0001-Preserve-timestamps-during-cp.patch deleted file mode 100644 index ca0befd..0000000 --- a/0001-Preserve-timestamps-during-cp.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cfd588c555dcf02920488b8e3e82b257ef6639f5 Mon Sep 17 00:00:00 2001 -From: Athmane Madjoudj -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 - diff --git a/0002-Add-option-to-use-system-provided-iniparser.patch b/0002-Add-option-to-use-system-provided-iniparser.patch deleted file mode 100644 index 0894079..0000000 --- a/0002-Add-option-to-use-system-provided-iniparser.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7c692d02aef17e65081ccabb2cc81ab743db6920 Mon Sep 17 00:00:00 2001 -From: Athmane Madjoudj -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 -+#else - #include "iniparser/iniparser.h" -+#endif - - #define MAX_KEY_SIZE 256 - --- -2.13.5 - diff --git a/0003-Tweak-LIBS-var-as-well-for-system-provided-iniparse.patch b/0003-Tweak-LIBS-var-as-well-for-system-provided-iniparse.patch deleted file mode 100644 index 13154f6..0000000 --- a/0003-Tweak-LIBS-var-as-well-for-system-provided-iniparse.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c493edcc28bb3aeb725797180ce611f5538154b1 Mon Sep 17 00:00:00 2001 -From: Athmane Madjoudj -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 - diff --git a/sources b/sources index 51b4616..0a663a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ubridge-0.9.14.tar.gz) = 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f +SHA512 (ubridge-1.2.1.tar.gz) = ee947db5129da2d08b2fe53322283c20838ce3b25e778125d419276b28cecad8cac859ec87613587960097f0bd10e7e439ebcdf43b90476a62496d7f0ed081b8 diff --git a/ubridge.spec b/ubridge.spec index 04d36e2..d0ce3e9 100644 --- a/ubridge.spec +++ b/ubridge.spec @@ -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 - 1.2.1-1 +- Update to 1.2.1 + +* Thu Aug 06 2026 Alexey Kurov - 1.2.0-2 +- New sources + +* Thu Aug 06 2026 Alexey Kurov - 1.2.0-1 +- Update to 1.2.0 + +* Fri Jul 17 2026 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Wed Jul 08 2026 Alexey Kurov - 1.1.1-1 +- Update to 1.1.1 + +* Tue Jul 07 2026 Alexey Kurov - 1.1.0-1 +- Update to 1.1.0 + +* Sun May 31 2026 Alexey Kurov - 1.0.1-1 +- Update to 1.0.1 + +* Mon May 25 2026 Alexey Kurov - 1.0.0-1 +- Update to 1.0.0 + +* Sat Jan 17 2026 Fedora Release Engineering - 0.9.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 0.9.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.9.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Nov 7 2024 Alexey Kurov - 0.9.19-1 +- Update to 0.9.19 + +* Thu Jul 25 2024 Miroslav Suchý - 0.9.18-14 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 0.9.18-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jun 18 2024 David Cantrell - 0.9.18-12 +- Rebuild for iniparser-4.2.4 + +* Thu May 30 2024 Alexey Kurov - 0.9.18-11 +- Rebuilt for iniparser-4.2.2 + +* Sat Jan 27 2024 Fedora Release Engineering - 0.9.18-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.9.18-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.9.18-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.9.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Mar 10 2021 Alexey Kurov - 0.9.18-4 +- Add -lnl-3 in CFLAGS, BuildRequires: libnl3-devel (Bug 1923474) + +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Mar 30 2020 Nicolas Chauvet - 0.9.18-1 +- Update to 0.9.18 + +* Fri Jan 31 2020 Fedora Release Engineering - 0.9.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.9.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Mar 21 2019 Athmane Madjoudj - 0.9.14-5 - Enable raw support