From: Robin H. Johnson Date: Sat, 31 Mar 2007 22:03:53 +0000 (+0000) Subject: Add 64-bit patch. Bug #171564. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d6f53b19857368d10482e77d04cdecf058a9bac;p=gentoo.git Add 64-bit patch. Bug #171564. Package-Manager: portage-2.1.2.2 --- diff --git a/net-misc/vmpsd/ChangeLog b/net-misc/vmpsd/ChangeLog index 9cdc37bcefc5..3dabce4557ee 100644 --- a/net-misc/vmpsd/ChangeLog +++ b/net-misc/vmpsd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/vmpsd # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/ChangeLog,v 1.3 2007/03/31 21:06:37 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/ChangeLog,v 1.4 2007/03/31 22:03:53 robbat2 Exp $ + +*vmpsd-1.3-r3 (31 Mar 2007) + + 31 Mar 2007; Robin H. Johnson + +files/vmpsd-1.3-64bit.patch, +vmpsd-1.3-r3.ebuild: + Add 64-bit patch. Bug #171564. *vmpsd-1.3-r2 (31 Mar 2007) diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest index 068ff1ecac7f..45905970017e 100644 --- a/net-misc/vmpsd/Manifest +++ b/net-misc/vmpsd/Manifest @@ -1,3 +1,7 @@ +AUX vmpsd-1.3-64bit.patch 910 RMD160 208b4e2aa435541878bd6ad5d3d550372db97f68 SHA1 dc7f0f72fbf448222404c2ccdec91b54270a3c41 SHA256 e6d57def5aff4389c656ef0bb32b10a028a50ede711ea88d5c2edfe125a0533f +MD5 cda8b88a0b6e5781c492ba72259bda79 files/vmpsd-1.3-64bit.patch 910 +RMD160 208b4e2aa435541878bd6ad5d3d550372db97f68 files/vmpsd-1.3-64bit.patch 910 +SHA256 e6d57def5aff4389c656ef0bb32b10a028a50ede711ea88d5c2edfe125a0533f files/vmpsd-1.3-64bit.patch 910 AUX vmpsd-1.3-snmp-support.patch 2757 RMD160 47c53f465f282f733770e6c6193b676db43cee7b SHA1 93243e5308f0ccecc34e5ed38b834fcf596783be SHA256 fbf1ebcd6c60fd75b3c98e0576f8239efc52b00db2710fb44b7ca1bfa88a6200 MD5 f521da2ac026b355d27d6f86894ed213 files/vmpsd-1.3-snmp-support.patch 2757 RMD160 47c53f465f282f733770e6c6193b676db43cee7b files/vmpsd-1.3-snmp-support.patch 2757 @@ -11,14 +15,18 @@ EBUILD vmpsd-1.3-r2.ebuild 977 RMD160 d19c3609b816eefff29a08f161ee57ba1fafc0cb S MD5 a8fc6a612717f90526426a09889cb707 vmpsd-1.3-r2.ebuild 977 RMD160 d19c3609b816eefff29a08f161ee57ba1fafc0cb vmpsd-1.3-r2.ebuild 977 SHA256 5425410c8c789117f3051337b7bbf1886f317cc22e276f0b878ec117148348ee vmpsd-1.3-r2.ebuild 977 +EBUILD vmpsd-1.3-r3.ebuild 1014 RMD160 968ba254d2993596e27b02e8e4ba34db323c7384 SHA1 f91df39a6b63624196fd16ab149a9f91a83b0517 SHA256 cbf6d51e7c38804f0450c79c1eff8302ef474d83230924e75a75f5c6eb25d02e +MD5 09bf235e97c2f685d67ab8c05779b905 vmpsd-1.3-r3.ebuild 1014 +RMD160 968ba254d2993596e27b02e8e4ba34db323c7384 vmpsd-1.3-r3.ebuild 1014 +SHA256 cbf6d51e7c38804f0450c79c1eff8302ef474d83230924e75a75f5c6eb25d02e vmpsd-1.3-r3.ebuild 1014 EBUILD vmpsd-1.3.ebuild 926 RMD160 6f406244064a4d5c14becf279438fd82c89d633b SHA1 5b5a993532463956d9701436a833263ad15fd42b SHA256 c9fdc2389e8b58edf1e5b4bb12d2764756e89ee74e8a971a8a4ce2d890622fea MD5 43acb0e78c9e240e5e2bffdc3dc4ad3b vmpsd-1.3.ebuild 926 RMD160 6f406244064a4d5c14becf279438fd82c89d633b vmpsd-1.3.ebuild 926 SHA256 c9fdc2389e8b58edf1e5b4bb12d2764756e89ee74e8a971a8a4ce2d890622fea vmpsd-1.3.ebuild 926 -MISC ChangeLog 913 RMD160 6473f26516cc43ebd9acba4083a4423da38eda60 SHA1 674d94f3b07397c905e2b74e41d180aa72c0595f SHA256 480659d196875d6a146f526f03791cb529e3afd7d94b3f32f993f41b5d7efb48 -MD5 7e4226807ca806051e16a03558901c70 ChangeLog 913 -RMD160 6473f26516cc43ebd9acba4083a4423da38eda60 ChangeLog 913 -SHA256 480659d196875d6a146f526f03791cb529e3afd7d94b3f32f993f41b5d7efb48 ChangeLog 913 +MISC ChangeLog 1083 RMD160 e865e1508c2a98e978114083e566a757f4bb5887 SHA1 e94d248df380ee8a5f37862897bd41e540b4171e SHA256 79b01c6cd309e945f8e2bc22655b51d583662e56d42a77ebe91624ebce5407e6 +MD5 dfe1334ca76b628b80b41de216217da2 ChangeLog 1083 +RMD160 e865e1508c2a98e978114083e566a757f4bb5887 ChangeLog 1083 +SHA256 79b01c6cd309e945f8e2bc22655b51d583662e56d42a77ebe91624ebce5407e6 ChangeLog 1083 MISC metadata.xml 225 RMD160 c09f9d0847a74b63fa447b4f33720f22f73595f6 SHA1 78f3994ac404ca6cee7bccc029cea214c72f7e39 SHA256 426743569a0f3c42eee0aecbe64a683e26802253fef77b403e9b1b04c01ffca2 MD5 5c9d9683447326ea1f1a6fe9aa699120 metadata.xml 225 RMD160 c09f9d0847a74b63fa447b4f33720f22f73595f6 metadata.xml 225 @@ -32,3 +40,6 @@ SHA256 302b7fa717c51641bb95afe9e7971ae53ef17ef48b1c3d8568d06ee12cf284b7 files/di MD5 9a49f8a708039fbbfb4862bdd5ae83ab files/digest-vmpsd-1.3-r2 226 RMD160 6f2bc4719a58e9210fdfabeaa6c83a196fdae57e files/digest-vmpsd-1.3-r2 226 SHA256 302b7fa717c51641bb95afe9e7971ae53ef17ef48b1c3d8568d06ee12cf284b7 files/digest-vmpsd-1.3-r2 226 +MD5 9a49f8a708039fbbfb4862bdd5ae83ab files/digest-vmpsd-1.3-r3 226 +RMD160 6f2bc4719a58e9210fdfabeaa6c83a196fdae57e files/digest-vmpsd-1.3-r3 226 +SHA256 302b7fa717c51641bb95afe9e7971ae53ef17ef48b1c3d8568d06ee12cf284b7 files/digest-vmpsd-1.3-r3 226 diff --git a/net-misc/vmpsd/files/digest-vmpsd-1.3-r3 b/net-misc/vmpsd/files/digest-vmpsd-1.3-r3 new file mode 100644 index 000000000000..577a1ce45315 --- /dev/null +++ b/net-misc/vmpsd/files/digest-vmpsd-1.3-r3 @@ -0,0 +1,3 @@ +MD5 07ad86343ad715c94b9de4c54c62d3db vmpsd-1.3.tar.gz 95202 +RMD160 1185fbd654d5d0e939fdfa08149d1ebcb3fc0ef2 vmpsd-1.3.tar.gz 95202 +SHA256 6f6bd6c5d1e9fc862c27cf783bcbabef21619aa5fe7984231eb55e32e11ca142 vmpsd-1.3.tar.gz 95202 diff --git a/net-misc/vmpsd/files/vmpsd-1.3-64bit.patch b/net-misc/vmpsd/files/vmpsd-1.3-64bit.patch new file mode 100644 index 000000000000..c2825d4a6b76 --- /dev/null +++ b/net-misc/vmpsd/files/vmpsd-1.3-64bit.patch @@ -0,0 +1,38 @@ +*** vmpsd/vqp.c.orig Tue Aug 3 05:54:04 2004 +--- vmpsd/vqp.c Tue Mar 20 06:48:33 2007 +*************** +*** 127,134 **** + VQP_HEADER h; + u_char buf[MAX_PACKET_SIZE]; + u_char *p; +! unsigned long int data_type; +! unsigned short int data_len; + unsigned int n = 0; + + h.unkn1 = 0x01; +--- 127,134 ---- + VQP_HEADER h; + u_char buf[MAX_PACKET_SIZE]; + u_char *p; +! uint32_t data_type; +! uint16_t data_len; + unsigned int n = 0; + + h.unkn1 = 0x01; +*************** +*** 310,316 **** + MAC_ENTRY *m; + + m = find_mac(r->mac); +! if ( (m->speed != 0) || (m->duplex != 0) ) + set_port_speed( inet_ntoa(r->client_ip), + community, + r->port, +--- 310,316 ---- + MAC_ENTRY *m; + + m = find_mac(r->mac); +! if ( m != NULL && ((m->speed != 0) || (m->duplex != 0)) ) + set_port_speed( inet_ntoa(r->client_ip), + community, + r->port, diff --git a/net-misc/vmpsd/vmpsd-1.3-r3.ebuild b/net-misc/vmpsd/vmpsd-1.3-r3.ebuild new file mode 100644 index 000000000000..ecee4a669e68 --- /dev/null +++ b/net-misc/vmpsd/vmpsd-1.3-r3.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/vmpsd-1.3-r3.ebuild,v 1.1 2007/03/31 22:03:53 robbat2 Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="An open-source VLAN management system" +HOMEPAGE="http://vmps.sourceforge.net" +SRC_URI="mirror://sourceforge/vmps/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +IUSE="" +DEPEND="virtual/libc + net-analyzer/net-snmp + dev-libs/openssl" +S="${WORKDIR}/${PN}" + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/${P}-snmp-support.patch + epatch ${FILESDIR}/${P}-64bit.patch +} + +src_compile() { + append-ldflags -lssl + econf \ + --sysconfdir=/etc/vmpsd \ + --enable-snmp \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + cd "${S}" + emake DESTDIR="${D}" install || die + dodoc README INSTALL AUTHORS doc/*txt + newdoc external/README README.external + newdoc tools/README README.tools + dodoc external/simple tools/vqpcli.pl +}