diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c05f12f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vconfig -# $Id$ -NAME := vconfig -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..f126b62 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,15 @@ +--- !Policy +product_versions: + - fedora-rawhide +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} diff --git a/sources b/sources index ad1c44f..cc184bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f0c6060b33956fb16e11a15467dd394 vlan.1.9.tar.gz +SHA512 (vlan.1.9.tar.gz) = 7602679c1f1569d1742da37062213fea3a14b875bec9c41fc6b10c28a09a312db80f6eae4a8641a1892946545b2b4ef4699e61fddd8514469970e334a9dab0c5 diff --git a/vconfig-1.9-Pass-compilation-with-Werror-format-security.patch b/vconfig-1.9-Pass-compilation-with-Werror-format-security.patch new file mode 100644 index 0000000..a41be37 --- /dev/null +++ b/vconfig-1.9-Pass-compilation-with-Werror-format-security.patch @@ -0,0 +1,31 @@ +From c84508d59dacf91a89582fed6115714f42f706aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Tue, 3 Dec 2013 12:54:53 +0100 +Subject: [PATCH] Pass compilation with -Werror=format-security +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + + +Signed-off-by: Petr Písař +--- + vconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vconfig.c b/vconfig.c +index 5057cfd..77cf4b3 100644 +--- a/vconfig.c ++++ b/vconfig.c +@@ -36,7 +36,7 @@ + #define MAX_HOSTNAME 256 + + +-static char* usage = ++static const char usage[] = + "\n" + "Usage: add [interface-name] [vlan_id]\n" + " rem [vlan-name]\n" +-- +1.8.3.1 + diff --git a/vconfig.rpmlintrc b/vconfig.rpmlintrc new file mode 100644 index 0000000..89b85e7 --- /dev/null +++ b/vconfig.rpmlintrc @@ -0,0 +1 @@ +addFilter('spelling-error .* ip') diff --git a/vconfig.spec b/vconfig.spec index 250bd87..2bca8fc 100644 --- a/vconfig.spec +++ b/vconfig.spec @@ -1,41 +1,161 @@ -Summary: Linux 802.1q VLAN configuration utility -Name: vconfig -Version: 1.9 -Release: 6%{?dist} -License: GPLv2+ -Group: System Environment/Base -Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz -URL: http://www.candelatech.com/~greear/vlan.html -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define _sbin /sbin +Name: vconfig +Version: 1.9 +Release: 43%{?dist} +Summary: Linux 802.1q VLAN configuration utility +# candela_2.4.21.patch: GPL-2.0-or-later +# contrib/vlan_2.2-full.patch: GPL-2.0-or-later +# contrib/vlan_2.2-module.patch: GPL-2.0-or-later +# howto.html: "part of the Linux HOWTO project", "see [...] GNU GPL 0.1.1" +# macvlan_config.c: GPL-2.0-or-later +# vconfig.c: GPL-2.0-or-later +# vlan_2.2.patch: GPL-2.0-or-later +License: GPL-2.0-or-later +URL: https://www.candelatech.com/~greear/vlan.html +# The URL now returns a bogus file full of zeros +Source: https://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz +# Fix a security warning by compiler, bug #1037376 +Patch0: %{name}-1.9-Pass-compilation-with-Werror-format-security.patch +BuildRequires: coreutils +BuildRequires: gcc +BuildRequires: make %description The vconfig program configures and adjusts 802.1q VLAN parameters. +This tool is deprecated in favor of "ip link" command. %prep %setup -q -n vlan +%patch -P0 -p1 -b .warning %build make clean rm -f vconfig -make CCFLAGS="%{optflags}" STRIP=/bin/true vconfig +make CCFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}" STRIP=/bin/true vconfig %install -rm -rf ${RPM_BUILD_ROOT} -%{__install} -D -m755 vconfig ${RPM_BUILD_ROOT}%{_sbin}/vconfig -%{__install} -D -m644 vconfig.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/vconfig.8 -rm -rf contrib/CVS - -%clean -rm -rf ${RPM_BUILD_ROOT} +install -D -m755 vconfig ${RPM_BUILD_ROOT}%{_sbindir}/vconfig +install -D -m644 vconfig.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/vconfig.8 %files -%defattr(-, root, root, 0755) -%doc CHANGELOG contrib README vlan.html vlan_test.pl -%{_sbin}/vconfig +%doc CHANGELOG README vlan.html vlan_test.pl +%{_sbindir}/vconfig %{_mandir}/man8/vconfig.8* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.9-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 1.9-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.9-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jun 18 2025 Petr Pisar - 1.9-40 +- Update URLs to use HTTPS + +* Sun Jan 19 2025 Fedora Release Engineering - 1.9-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 1.9-38 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.9-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.9-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.9-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.9-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.9-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.9-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 1.9-31 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.9-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.9-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.9-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.9-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.9-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.9-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 07 2018 Petr Pisar - 1.9-24 +- Modernize spec file + +* Fri Feb 23 2018 Florian Weimer - 1.9-23 +- Use LDFLAGS from redhat-rpm-config + +* Fri Feb 09 2018 Fedora Release Engineering - 1.9-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.9-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.9-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.9-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.9-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.9-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.9-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Dec 03 2013 Petr Pisar - 1.9-14 +- Fix a security warning by compiler (bug #1037376) +- Move the executable to /usr/sbin +- Modernize the spec file + +* Sun Aug 04 2013 Fedora Release Engineering - 1.9-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jul 26 2009 Fedora Release Engineering - 1.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Mar 19 2008 Roman Rakus - 1.9-6 - added STRIP=/bin/true for useful debuginfo