From 453cf502671a30f2b3c2fd1900da43b92f62658f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 9 Sep 2009 16:20:45 +0000 Subject: [PATCH 1/8] Initialize branch EL-5 for vmpsd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 6a81b6978faa4532da254fe104e757eba9e285d3 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Thu, 10 Sep 2009 12:25:46 +0000 Subject: [PATCH 2/8] Initial commit of vmpsd --- .cvsignore | 1 + import.log | 1 + sources | 1 + vmpsd.init | 62 +++++++++++++++++++++++++++++ vmpsd.spec | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ vmpsd.sysconfig | 1 + 6 files changed, 168 insertions(+) create mode 100644 import.log create mode 100644 vmpsd.init create mode 100644 vmpsd.spec create mode 100644 vmpsd.sysconfig diff --git a/.cvsignore b/.cvsignore index e69de29..8062fd7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +vmpsd-1.4.01.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..348af68 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +vmpsd-1_4_01-6:EL-5:vmpsd-1.4.01-6.src.rpm:1252585515 diff --git a/sources b/sources index e69de29..3f070fe 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b95f6390f0a340f4f99d4e8f72201cb4 vmpsd-1.4.01.tar.gz diff --git a/vmpsd.init b/vmpsd.init new file mode 100644 index 0000000..b705a06 --- /dev/null +++ b/vmpsd.init @@ -0,0 +1,62 @@ +#!/bin/bash +# +# chkconfig: - 92 8 +# description: vmpsd is a GPL implementation of Cisco's VMPS +# processname: vmpsd +# pidfile: /var/run/vmpsd.pid +# config: /etc/sysconfig/vmpsd + +# source function library +. /etc/init.d/functions + +if test -e /etc/sysconfig/vmpsd ; then + . /etc/sysconfig/vmpsd +fi + +RETVAL=0 + +start() { + echo -n $"Starting vmpsd: " + + daemon --user nobody vmpsd $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/vmpsd +} + +stop() { + echo -n $"Shutting down vmpsd: " + killproc vmpsd + RETVAL=$? + + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/vmpsd +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + condrestart) + if [ -f /var/lock/subsys/vmpsd ]; then + stop + start + fi + ;; + status) + status vmpsd + RETVAL=$? + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/vmpsd.spec b/vmpsd.spec new file mode 100644 index 0000000..d3b277f --- /dev/null +++ b/vmpsd.spec @@ -0,0 +1,102 @@ +Name: vmpsd +Version: 1.4.01 +Release: 6%{?dist} +Summary: A GPL implementation of Cisco Systems' VMPS + +Group: System Environment/Daemons +# Valid license according to http://fedoraproject.org/wiki/Licensing +License: GPL+ +URL: http://vmps.sourceforge.net/ +Source0: http://downloads.sourceforge.net/vmps/%{name}-%{version}.tar.gz +Source1: vmpsd.sysconfig +Source2: vmpsd.init +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires(post): chkconfig +Requires(preun): chkconfig +# This is for /sbin/service +Requires(preun): initscripts +Requires(postun): initscripts + +%description +VMPS (VLAN Management Policy Server) is a way of assigning switch ports to +specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL +implementation of VMPS. + +%prep +%setup -qn %{name} + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +mkdir -p $RPM_BUILD_ROOT%{_mandir} + +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + +install %{S:1} -p -m 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install %{S:2} -p $RPM_BUILD_ROOT%{_initrddir}/%{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add %{name} + +%preun +if [ $1 -eq 0 ] ; then + /sbin/service %{name} stop > /dev/null 2>&1 + /sbin/chkconfig --del %{name} +fi + +%postun +if [ "$1" -ge "1" ] ; then + /sbin/service %{name} condrestart >/dev/null 2>&1 || : +fi + +%files +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/vlan.db +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%attr(0755,root,root) %{_initrddir}/%{name} +%attr(0755,root,root) %{_bindir}/%{name} +%doc doc/NetregExtension.txt +%doc doc/VQP-spec.txt +%doc doc/vlan.db.example +%doc COPYING.GPL ChangeLog AUTHORS +%{_mandir}/man1/%{name}.1.gz + +%changelog +* Mon Sep 7 2009 Colin Coe - 1.4.01-6%{?dist} +- Remove condrestart from post section as it's now in the postun section +- Stop packaging the INSTALL file + +* Sun Sep 6 2009 Colin Coe - 1.4.01-5 +- Add condrestart in postun +- Add ChangeLog and COPYING.GPL to files section + +* Sat Sep 5 2009 Colin Coe - 1.4.01-4 +- Add condrestart into post section +- Use macros in files section +- Remove '$DESTDIR=$RPM_BUILD_ROOT' from make in build section +- Do parallel make +- Don't start service by default +- Add Requires for post and preun +- Correct the Source0 URL +- Move clean to after install + +* Tue Sep 1 2009 Colin Coe - 1.4.01-3 +- Split /etc/sysconfig/vmpsd and /etc/rc.d/init.d/vmpsd out of the spec file +- Corrected license from GPLv2 to GPL+ +- Ensured that the make is done in the build section + +* Thu Aug 20 2009 Colin Coe - 1.4.01-2 +- Tidied spec file and silenced rpmlint output + +* Mon Aug 17 2009 Colin Coe - 1.4.01-1 +- Initial Packaging diff --git a/vmpsd.sysconfig b/vmpsd.sysconfig new file mode 100644 index 0000000..cd7c043 --- /dev/null +++ b/vmpsd.sysconfig @@ -0,0 +1 @@ +OPTIONS="-f /etc/vmps.db -l 0x700" From 3c235821d764cbe4248fb8844674591d842b2242 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:59 +0000 Subject: [PATCH 3/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 88c93de..3a5e3f7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vmpsd -# $Id$ +# $Id: Makefile,v 1.1 2009/09/09 16:20:41 kevin Exp $ NAME := vmpsd 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b72581c88e62bed59c03d0d19e7c663ad085ec77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:06:43 +0000 Subject: [PATCH 4/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 3a5e3f7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vmpsd -# $Id: Makefile,v 1.1 2009/09/09 16:20:41 kevin Exp $ -NAME := vmpsd -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 $$d/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),) -# attept 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/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/import.log b/import.log deleted file mode 100644 index 348af68..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -vmpsd-1_4_01-6:EL-5:vmpsd-1.4.01-6.src.rpm:1252585515 From 8bf3ce323b91ce5b8186cc1cdc56c0acd6e5f090 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Thu, 28 Apr 2011 20:30:17 +0800 Subject: [PATCH 5/8] Update 1.4.02 --- .gitignore | 1 + sources | 2 +- vmpsd.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8062fd7..6339ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vmpsd-1.4.01.tar.gz +/vmpsd-1.4.02.tar.gz diff --git a/sources b/sources index 3f070fe..69802aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b95f6390f0a340f4f99d4e8f72201cb4 vmpsd-1.4.01.tar.gz +d62bf43a28088e2eaa4a7037a2c850e1 vmpsd-1.4.02.tar.gz diff --git a/vmpsd.spec b/vmpsd.spec index d3b277f..d762d70 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,6 +1,6 @@ Name: vmpsd -Version: 1.4.01 -Release: 6%{?dist} +Version: 1.4.02 +Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS Group: System Environment/Daemons @@ -72,6 +72,12 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Apr 28 2011 Colin Coe - 1.4.02-1 +- Rebase to latest upstream + +* Mon Feb 07 2011 Fedora Release Engineering - 1.4.01-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Sep 7 2009 Colin Coe - 1.4.01-6%{?dist} - Remove condrestart from post section as it's now in the postun section - Stop packaging the INSTALL file From 715d510711150543d7bab8b83561ed62d5247a60 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Mon, 2 May 2011 19:12:18 +0800 Subject: [PATCH 6/8] Rebase to v1.4.03 --- vmpsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vmpsd.spec b/vmpsd.spec index d762d70..579b545 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,5 +1,5 @@ Name: vmpsd -Version: 1.4.02 +Version: 1.4.03 Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS @@ -23,7 +23,7 @@ specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL implementation of VMPS. %prep -%setup -qn %{name} +%setup -qn %{name}-%{version} %build %configure @@ -72,6 +72,9 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Mon May 2 2011 Colin Coe - 1.4.03-1 +- Rebase to latest upstream to resolve BZ699728 + * Thu Apr 28 2011 Colin Coe - 1.4.02-1 - Rebase to latest upstream From 574a91521b383c258feded1ff342e69af5b6efe8 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Mon, 2 May 2011 19:34:51 +0800 Subject: [PATCH 7/8] Rebase to v1.4.03 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6339ac2..1e2e3f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vmpsd-1.4.01.tar.gz /vmpsd-1.4.02.tar.gz +/vmpsd-1.4.03.tar.gz diff --git a/sources b/sources index 69802aa..445ce60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d62bf43a28088e2eaa4a7037a2c850e1 vmpsd-1.4.02.tar.gz +6c8a318495b4affdea52e76b52c51b34 vmpsd-1.4.03.tar.gz From 2936ef17c9ef8f018c36ceca0ddb509e85fd5170 Mon Sep 17 00:00:00 2001 From: Colin Coe Date: Wed, 11 Apr 2012 19:54:27 +0800 Subject: [PATCH 8/8] Rebase to v1.4.04 --- .gitignore | 1 + sources | 2 +- vmpsd.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1e2e3f4..48ffa52 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vmpsd-1.4.01.tar.gz /vmpsd-1.4.02.tar.gz /vmpsd-1.4.03.tar.gz +/vmpsd-1.4.04.tar.gz diff --git a/sources b/sources index 445ce60..8d3133a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c8a318495b4affdea52e76b52c51b34 vmpsd-1.4.03.tar.gz +27d8a178c3372b61e74898cec43856b8 vmpsd-1.4.04.tar.gz diff --git a/vmpsd.spec b/vmpsd.spec index 579b545..cfc4b62 100644 --- a/vmpsd.spec +++ b/vmpsd.spec @@ -1,5 +1,5 @@ Name: vmpsd -Version: 1.4.03 +Version: 1.4.04 Release: 1%{?dist} Summary: A GPL implementation of Cisco Systems' VMPS @@ -72,6 +72,12 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Wed Apr 11 2012 Colin Coe - 1.4.04-1 +- Rebase to latest upstream to resolve BZ754963 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.4.03-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon May 2 2011 Colin Coe - 1.4.03-1 - Rebase to latest upstream to resolve BZ699728