Skip to content

Commit

Permalink
Libvirt 0.9.11.7 and 1.0.0.
Browse files Browse the repository at this point in the history
Closes Homebrew#15847.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
  • Loading branch information
Justin Clift authored and adamv committed Nov 5, 2012
1 parent 327d45a commit 73993f5
Showing 1 changed file with 4 additions and 55 deletions.
59 changes: 4 additions & 55 deletions Library/Formula/libvirt.rb
Expand Up @@ -2,18 +2,13 @@

class Libvirt < Formula
homepage 'http://www.libvirt.org'
url 'http://libvirt.org/sources/stable_updates/libvirt-0.9.11.6.tar.gz'
sha256 'ad2f77a05b2c66198ea74df1640c56b3d9f394b397eae8eec612fa1cb3efb04a'

# Patch from upstream for 0.9.11.6 only. Will be in next release.
def patches
DATA if not build.devel?
end
url 'http://libvirt.org/sources/stable_updates/libvirt-0.9.11.7.tar.gz'
sha256 'a62f9ce2cac84d0377fc68cf132cf8968ad5d37e9b305182c3f9bbcce3b1b9fa'

# Latest (roughly) monthly release.
devel do
url 'http://libvirt.org/sources/libvirt-0.10.2.tar.gz'
sha256 '1fe69ae1268a097cc0cf83563883b51780d528c6493efe3e7d94c4160cc46977'
url 'http://libvirt.org/sources/libvirt-1.0.0.tar.gz'
sha256 '14c8a30ebfb939c82cab5f759a95d09646b43b4210e45490e92459ae65123076'
end

option 'without-libvirtd', 'Build only the virsh client and development libraries'
Expand Down Expand Up @@ -69,49 +64,3 @@ def install
end
end
end

__END__
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 06004ab..d53352f 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -929,7 +929,7 @@ int virNetDevValidateConfig(const char *ifname,
}
#else /* ! HAVE_STRUCT_IFREQ */
int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED,
- const virMacAddrPtr macaddr ATTRIBUTE_UNUSED,
+ const unsigned char *macaddr ATTRIBUTE_UNUSED,
int ifindex ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
@@ -1663,7 +1663,7 @@ virNetDevLinkDump(const char *ifname ATTRIBUTE_UNUSED,
int
virNetDevReplaceNetConfig(char *linkdev ATTRIBUTE_UNUSED,
int vf ATTRIBUTE_UNUSED,
- const virMacAddrPtr macaddress ATTRIBUTE_UNUSED,
+ const unsigned char *macaddress ATTRIBUTE_UNUSED,
int vlanid ATTRIBUTE_UNUSED,
char *stateDir ATTRIBUTE_UNUSED)
{
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 2772d9b..0e4d76b 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -672,7 +672,7 @@ int virNetlinkEventServiceLocalPid(void)
int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UNUSED,
virNetlinkEventRemoveCallback removeCB ATTRIBUTE_UNUSED,
void *opaque ATTRIBUTE_UNUSED,
- const virMacAddrPtr macaddr ATTRIBUTE_UNUSED)
+ const unsigned char *macaddr ATTRIBUTE_UNUSED)
{
netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -682,7 +682,7 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UN
* virNetlinkEventRemoveClient: unregister a callback from a netlink monitor
*/
int virNetlinkEventRemoveClient(int watch ATTRIBUTE_UNUSED,
- const virMacAddrPtr macaddr ATTRIBUTE_UNUSED)
+ const unsigned char *macaddr ATTRIBUTE_UNUSED)
{
netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;

0 comments on commit 73993f5

Please sign in to comment.