Attachment #120409 for bug #163212

View | Details | Raw Unified | Return to bug 163212
Collapse All | Expand All

Lines 6-12 Link Here

(-)devel/libvirt/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= libvirt	8	PORTNAME= libvirt
9	PORTVERSION= 0.9.7	9	PORTVERSION= 0.9.8
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://libvirt.org/sources/	11	MASTER_SITES= http://libvirt.org/sources/
12		12

Lines 1-2 Link Here

(-)devel/libvirt/distinfo (-2 / +2 lines)
1	SHA256 (libvirt-0.9.7.tar.gz) = 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23	1	SHA256 (libvirt-0.9.8.tar.gz) = 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
2	SIZE (libvirt-0.9.7.tar.gz) = 17853636	2	SIZE (libvirt-0.9.8.tar.gz) = 18403525

Lines 15-20 Link Here

(-)devel/libvirt/pkg-plist (+2 lines)
15	%%ETCDIR%%/nwfilter/allow-ipv4.xml	15	%%ETCDIR%%/nwfilter/allow-ipv4.xml
16	%%ETCDIR%%/nwfilter/clean-traffic.xml	16	%%ETCDIR%%/nwfilter/clean-traffic.xml
17	%%ETCDIR%%/nwfilter/no-arp-spoofing.xml	17	%%ETCDIR%%/nwfilter/no-arp-spoofing.xml
		18	%%ETCDIR%%/nwfilter/no-arp-ip-spoofing.xml
		19	%%ETCDIR%%/nwfilter/no-arp-mac-spoofing.xml
18	%%ETCDIR%%/nwfilter/no-ip-multicast.xml	20	%%ETCDIR%%/nwfilter/no-ip-multicast.xml
19	%%ETCDIR%%/nwfilter/no-ip-spoofing.xml	21	%%ETCDIR%%/nwfilter/no-ip-spoofing.xml
20	%%ETCDIR%%/nwfilter/no-mac-broadcast.xml	22	%%ETCDIR%%/nwfilter/no-mac-broadcast.xml




--- ./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




--- ./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 \

Return to bug 163212

Added Link Here

(-)devel/libvirt/files/patch-daemon__Makefile.am (+42 lines)
1	--- ./daemon/Makefile.am.orig 2011-12-12 12:08:01.000000000 -0800
2	+++ ./daemon/Makefile.am 2011-12-12 12:08:40.000000000 -0800
3	@@ -38,7 +38,6 @@
4	libvirtd.policy-1 \
5	libvirtd.sasl \
6	libvirtd.sysconf \
7	- libvirtd.sysctl \
8	libvirtd.aug \
9	libvirtd.logrotate.in \
10	libvirtd.qemu.logrotate.in \
11	@@ -172,14 +171,13 @@
12
13	install-data-local: install-init-redhat install-init-systemd install-init-upstart \
14	install-data-sasl install-data-polkit \
15	- install-logrotate install-sysctl
16	+ install-logrotate
17	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
18	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
19	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
20
21	uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-upstart \
22	- uninstall-data-sasl uninstall-data-polkit \
23	- uninstall-sysctl
24	+ uninstall-data-sasl uninstall-data-polkit
25	rmdir $(DESTDIR)$(localstatedir)/log/libvirt \|\| :
26	rmdir $(DESTDIR)$(localstatedir)/run/libvirt \|\| :
27	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt \|\| :
28	@@ -244,14 +242,6 @@
29	uninstall-sysconfig:
30	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
31
32	-install-sysctl:
33	- mkdir -p $(DESTDIR)$(sysconfdir)/sysctl.d
34	- $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
35	- $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
36	-
37	-uninstall-sysctl:
38	- rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
39	-
40	if LIBVIRT_INIT_SCRIPT_RED_HAT
41
42	BUILT_SOURCES += libvirtd.init

Added Link Here

(-)devel/libvirt/files/patch-daemon__Makefile.in (+43 lines)
1	--- ./daemon/Makefile.in.orig 2011-12-12 12:11:23.000000000 -0800
2	+++ ./daemon/Makefile.in 2011-12-12 12:12:05.000000000 -0800
3	@@ -1503,7 +1503,7 @@
4	EXTRA_DIST = remote_dispatch.h qemu_dispatch.h libvirtd.conf \
5	libvirtd.init.in libvirtd.upstart libvirtd.policy-0 \
6	libvirtd.policy-1 libvirtd.sasl libvirtd.sysconf \
7	- libvirtd.sysctl libvirtd.aug libvirtd.logrotate.in \
8	+ libvirtd.aug libvirtd.logrotate.in \
9	libvirtd.qemu.logrotate.in libvirtd.lxc.logrotate.in \
10	libvirtd.uml.logrotate.in test_libvirtd.aug THREADS.txt \
11	libvirtd.pod.in libvirtd.8.in $(DAEMON_SOURCES) \
12	@@ -2108,14 +2108,13 @@
13
14	@WITH_LIBVIRTD_TRUE@install-data-local: install-init-redhat install-init-systemd install-init-upstart \
15	@WITH_LIBVIRTD_TRUE@ install-data-sasl install-data-polkit \
16	-@WITH_LIBVIRTD_TRUE@ install-logrotate install-sysctl
17	+@WITH_LIBVIRTD_TRUE@ install-logrotate
18	@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
19	@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
20	@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
21
22	@WITH_LIBVIRTD_TRUE@uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-upstart \
23	-@WITH_LIBVIRTD_TRUE@ uninstall-data-sasl uninstall-data-polkit \
24	-@WITH_LIBVIRTD_TRUE@ uninstall-sysctl
25	+@WITH_LIBVIRTD_TRUE@ uninstall-data-sasl uninstall-data-polkit
26	@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(localstatedir)/log/libvirt \|\| :
27	@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(localstatedir)/run/libvirt \|\| :
28	@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(localstatedir)/lib/libvirt \|\| :
29	@@ -2172,14 +2171,6 @@
30	@WITH_LIBVIRTD_TRUE@uninstall-sysconfig:
31	@WITH_LIBVIRTD_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
32
33	-@WITH_LIBVIRTD_TRUE@install-sysctl:
34	-@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(sysconfdir)/sysctl.d
35	-@WITH_LIBVIRTD_TRUE@ $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
36	-@WITH_LIBVIRTD_TRUE@ $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
37	-
38	-@WITH_LIBVIRTD_TRUE@uninstall-sysctl:
39	-@WITH_LIBVIRTD_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
40	-
41	@LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@install-init-redhat: install-sysconfig libvirtd.init
42	@LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
43	@LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@ $(INSTALL_SCRIPT) libvirtd.init \