Attachment 120409 Details for Bug 163212 – file.diff

[patch] file.diff

file.diff (text/plain), 6.28 KB, created by Jason Helfman on 2011-12-12 21:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2011-12-12 21:10:11 UTC

Size: 6.28 KB

patch

obsolete

>Index: devel/libvirt/Makefile
>===================================================================
>RCS file: /home/jhelfman/ncvs/ports/devel/libvirt/Makefile,v
>retrieving revision 1.10
>diff -u -r1.10 Makefile
>--- devel/libvirt/Makefile	11 Nov 2011 17:27:15 -0000	1.10
>+++ devel/libvirt/Makefile	10 Dec 2011 07:36:51 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	libvirt
>-PORTVERSION=	0.9.7
>+PORTVERSION=	0.9.8
> CATEGORIES=	devel
> MASTER_SITES=	http://libvirt.org/sources/
> 
>Index: devel/libvirt/distinfo
>===================================================================
>RCS file: /home/jhelfman/ncvs/ports/devel/libvirt/distinfo,v
>retrieving revision 1.6
>diff -u -r1.6 distinfo
>--- devel/libvirt/distinfo	11 Nov 2011 17:27:15 -0000	1.6
>+++ devel/libvirt/distinfo	12 Dec 2011 20:09:05 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (libvirt-0.9.7.tar.gz) = 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23
>-SIZE (libvirt-0.9.7.tar.gz) = 17853636
>+SHA256 (libvirt-0.9.8.tar.gz) = 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
>+SIZE (libvirt-0.9.8.tar.gz) = 18403525
>Index: devel/libvirt/pkg-plist
>===================================================================
>RCS file: /home/jhelfman/ncvs/ports/devel/libvirt/pkg-plist,v
>retrieving revision 1.7
>diff -u -r1.7 pkg-plist
>--- devel/libvirt/pkg-plist	11 Nov 2011 17:27:15 -0000	1.7
>+++ devel/libvirt/pkg-plist	12 Dec 2011 17:52:37 -0000
>@@ -15,6 +15,8 @@
> %%ETCDIR%%/nwfilter/allow-ipv4.xml
> %%ETCDIR%%/nwfilter/clean-traffic.xml
> %%ETCDIR%%/nwfilter/no-arp-spoofing.xml
>+%%ETCDIR%%/nwfilter/no-arp-ip-spoofing.xml
>+%%ETCDIR%%/nwfilter/no-arp-mac-spoofing.xml
> %%ETCDIR%%/nwfilter/no-ip-multicast.xml
> %%ETCDIR%%/nwfilter/no-ip-spoofing.xml
> %%ETCDIR%%/nwfilter/no-mac-broadcast.xml
>Index: devel/libvirt/files/patch-daemon__Makefile.am
>===================================================================
>RCS file: devel/libvirt/files/patch-daemon__Makefile.am
>diff -N devel/libvirt/files/patch-daemon__Makefile.am
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ devel/libvirt/files/patch-daemon__Makefile.am	12 Dec 2011 20:09:11 -0000
>@@ -0,0 +1,42 @@
>+--- ./daemon/Makefile.am.orig	2011-12-12 12:08:01.000000000 -0800
>++++ ./daemon/Makefile.am	2011-12-12 12:08:40.000000000 -0800
>+@@ -38,7 +38,6 @@
>+ 	libvirtd.policy-1				\
>+ 	libvirtd.sasl					\
>+ 	libvirtd.sysconf				\
>+-	libvirtd.sysctl					\
>+ 	libvirtd.aug                                    \
>+ 	libvirtd.logrotate.in                           \
>+ 	libvirtd.qemu.logrotate.in                      \
>+@@ -172,14 +171,13 @@
>+ 
>+ install-data-local: install-init-redhat install-init-systemd install-init-upstart \
>+ 		install-data-sasl install-data-polkit \
>+-		install-logrotate install-sysctl
>++		install-logrotate
>+ 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
>+ 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
>+ 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
>+ 
>+ uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-upstart \
>+-		uninstall-data-sasl uninstall-data-polkit \
>+-		uninstall-sysctl
>++		uninstall-data-sasl uninstall-data-polkit
>+ 	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
>+ 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
>+ 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
>+@@ -244,14 +242,6 @@
>+ uninstall-sysconfig:
>+ 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
>+ 
>+-install-sysctl:
>+-	mkdir -p $(DESTDIR)$(sysconfdir)/sysctl.d
>+-	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
>+-	  $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
>+-
>+-uninstall-sysctl:
>+-	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
>+-
>+ if LIBVIRT_INIT_SCRIPT_RED_HAT
>+ 
>+ BUILT_SOURCES += libvirtd.init
>Index: devel/libvirt/files/patch-daemon__Makefile.in
>===================================================================
>RCS file: devel/libvirt/files/patch-daemon__Makefile.in
>diff -N devel/libvirt/files/patch-daemon__Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ devel/libvirt/files/patch-daemon__Makefile.in	12 Dec 2011 20:12:23 -0000
>@@ -0,0 +1,43 @@
>+--- ./daemon/Makefile.in.orig	2011-12-12 12:11:23.000000000 -0800
>++++ ./daemon/Makefile.in	2011-12-12 12:12:05.000000000 -0800
>+@@ -1503,7 +1503,7 @@
>+ EXTRA_DIST = remote_dispatch.h qemu_dispatch.h libvirtd.conf \
>+ 	libvirtd.init.in libvirtd.upstart libvirtd.policy-0 \
>+ 	libvirtd.policy-1 libvirtd.sasl libvirtd.sysconf \
>+-	libvirtd.sysctl libvirtd.aug libvirtd.logrotate.in \
>++	libvirtd.aug libvirtd.logrotate.in \
>+ 	libvirtd.qemu.logrotate.in libvirtd.lxc.logrotate.in \
>+ 	libvirtd.uml.logrotate.in test_libvirtd.aug THREADS.txt \
>+ 	libvirtd.pod.in libvirtd.8.in $(DAEMON_SOURCES) \
>+@@ -2108,14 +2108,13 @@
>+ 
>+ @WITH_LIBVIRTD_TRUE@install-data-local: install-init-redhat install-init-systemd install-init-upstart \
>+ @WITH_LIBVIRTD_TRUE@		install-data-sasl install-data-polkit \
>+-@WITH_LIBVIRTD_TRUE@		install-logrotate install-sysctl
>++@WITH_LIBVIRTD_TRUE@		install-logrotate
>+ @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
>+ @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
>+ @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
>+ 
>+ @WITH_LIBVIRTD_TRUE@uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-upstart \
>+-@WITH_LIBVIRTD_TRUE@		uninstall-data-sasl uninstall-data-polkit \
>+-@WITH_LIBVIRTD_TRUE@		uninstall-sysctl
>++@WITH_LIBVIRTD_TRUE@		uninstall-data-sasl uninstall-data-polkit
>+ @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
>+ @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
>+ @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
>+@@ -2172,14 +2171,6 @@
>+ @WITH_LIBVIRTD_TRUE@uninstall-sysconfig:
>+ @WITH_LIBVIRTD_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
>+ 
>+-@WITH_LIBVIRTD_TRUE@install-sysctl:
>+-@WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(sysconfdir)/sysctl.d
>+-@WITH_LIBVIRTD_TRUE@	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
>+-@WITH_LIBVIRTD_TRUE@	  $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
>+-
>+-@WITH_LIBVIRTD_TRUE@uninstall-sysctl:
>+-@WITH_LIBVIRTD_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
>+-
>+ @LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@install-init-redhat: install-sysconfig libvirtd.init
>+ @LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
>+ @LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@	$(INSTALL_SCRIPT) libvirtd.init \

Actions: View | Diff

Attachments on bug 163212: 120409