rpms/rstp/F-13 rstp-type-punning.patch, NONE, 1.1 rstp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Neil Horman nhorman at fedoraproject.org
Thu Apr 8 14:37:35 UTC 2010


Author: nhorman

Update of /cvs/pkgs/rpms/rstp/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9763

Modified Files:
	.cvsignore sources 
Added Files:
	rstp-type-punning.patch rstp.spec 
Log Message:
Initial import

rstp-type-punning.patch:
 bridge_track.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rstp-type-punning.patch ---
commit 371d676359dfe4618b14ba4248192efe905bcb68
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Wed Mar 3 08:39:57 2010 -0500

    Fix type-punning error in bridge_track to quite compiler warning
    Signed-off-by: Neil Horman <nhorman at tuxdriver.com>

diff --git a/bridge_track.c b/bridge_track.c
index be555de..fa59732 100644
--- a/bridge_track.c
+++ b/bridge_track.c
@@ -599,7 +599,7 @@ void bridge_bpdu_rcv(int if_index, const unsigned char *data, int len)
 		//    TST(ntohs(*(uint16_t*)bpdu.body.message_age)
 		//        < ntohs(*(uint16_t*)bpdu.body.max_age), );
 		TST(memcmp(bpdu->body.bridge_id, &ifc->master->bridge_id, 8) != 0
-		    || (ntohs(*(uint16_t *) bpdu->body.port_id) & 0xfff) !=
+		    || (ntohs((uint16_t) *bpdu->body.port_id) & 0xfff) !=
 		    ifc->port_index,);
 		break;
 	case BPDU_TOPO_CHANGE_TYPE:


--- NEW FILE rstp.spec ---
Name:		rstp
Summary:	Rapid Spanning Tree User Space Daemon
Version:	04012009git
Release:	4%{dist}
# Note the lack of a URL tag here.  rstp has no official upstream project page,
# just a git repository, so we don't include the URL here. rpmlint will yell
# about this, rpmlint is wrong,

License:	GPLv2+ and LGPLv2+
Group:		System Environment/Base
# Generate this tarball with the following commands in the git tree:
# git clone git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/rstp.git
# cd rstp
# git checkout 76eb7423e188f6852ba9ced4352e0d61f4dace4d
# cd ..
# tar jcf git-04012009git.tar.bz2 rstp 
Source0:	%{name}-%{version}.tar.bz2

# http://patchwork.ozlabs.org/patch/46803/
# Submitted upstream, no reply yet
Patch0:	rstp-type-punning.patch

%description
rstp is a user space implementation of the rapid spanning tree protocol.  It
replaces the in-kernel STP implementation

%prep
%setup -q -n rstp

%patch0 -p1

%build
make %{?_smp_mflags}

%install
make INSTALLPREFIX=$RPM_BUILD_ROOT install
install -m 755 bridge $RPM_BUILD_ROOT/sbin
install -m 755 bridge-stp $RPM_BUILD_ROOT/sbin

%files
%defattr(-,root,root,-)
/sbin/*
%{_mandir}/man8/*
%doc CHANGES_TO_RSTPLIB TODO LICENSE rstplib/COPYING


%changelog
* Wed Apr 07 2010 Neil Horman <nhorman at redhat.com> - 04012009git-4
- Add more comments
- add LICENSE file and COPYING file

* Wed Apr 07 2010 Neil Horman <nhorman at redhat.com> - 04012009git-3
- Removed clean script
- Added comments regarding patch and tarball

* Wed Apr 07 2010 Neil Horman <nhorman at redhat.com> - 04012009git-2
- Fix review comments in bz 570166
- remove buildroot tag
- remove URL tag
- add requested docs

* Mon Mar 03 2010 Neil Horman <nhorman at redhat.com> - 04012009git-1
- Initial Build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rstp/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2010 02:50:33 -0000	1.1
+++ .cvsignore	8 Apr 2010 14:37:34 -0000	1.2
@@ -0,0 +1 @@
+rstp-04012009git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rstp/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2010 02:50:33 -0000	1.1
+++ sources	8 Apr 2010 14:37:35 -0000	1.2
@@ -0,0 +1 @@
+2f7defec2c586d3a820485b839c9dd12  rstp-04012009git.tar.bz2



More information about the scm-commits mailing list