| 1 |
commit: af621c349cb52c36d298d3715ad5b0c784836c1f |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 1 18:44:23 2016 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 19:15:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af621c34 |
| 7 |
|
| 8 |
app-emulation/libvirt: version bump to 1.3.4, bug #580418, bug #579960 |
| 9 |
|
| 10 |
- bump to version 1.3.4, bug #580418 |
| 11 |
|
| 12 |
- apply a build system patch for the sysmacros header change, bug #579960 |
| 13 |
fixes the compile error "undefined reference to {'major', 'minor'}" |
| 14 |
due to gentoo specific glibc patches (bug #575232) |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.26 |
| 17 |
|
| 18 |
app-emulation/libvirt/Manifest | 1 + |
| 19 |
.../libvirt/files/libvirt-1.3.4-glibc-2.23.patch | 86 ++++++++++++++++++++++ |
| 20 |
.../{libvirt-9999.ebuild => libvirt-1.3.4.ebuild} | 20 +++-- |
| 21 |
app-emulation/libvirt/libvirt-9999.ebuild | 3 +- |
| 22 |
4 files changed, 102 insertions(+), 8 deletions(-) |
| 23 |
|
| 24 |
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest |
| 25 |
index c05b37b..5d2e4bb 100644 |
| 26 |
--- a/app-emulation/libvirt/Manifest |
| 27 |
+++ b/app-emulation/libvirt/Manifest |
| 28 |
@@ -4,3 +4,4 @@ DIST libvirt-1.3.0-20151222.tar.xz 1684 SHA256 3628c3398862eae2966ccf0e55822e4cb |
| 29 |
DIST libvirt-1.3.0.tar.gz 30114683 SHA256 ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64 SHA512 e252390a05b76e9cd9ed02caadd0ee0d674505f60940bb6ced955e17f69c7dd55fe5b38204ae5c25b6e5703415a0f6a12fc545d138d0e8b016457a85dc8fa2b8 WHIRLPOOL 852c592b27be86d3fb2ec75ca5debf9a1e0ac5de6d1ab06c55c2d70e83de125d10c2fc967b7578fba9137ed7a30b7a7e195f4e5f8d35708deeeddc97424d5e40 |
| 30 |
DIST libvirt-1.3.1.tar.gz 29900143 SHA256 a5d43fbed34d31eeffc641d2ac9b6026a57bf1a4fa74d0fa19a9891d9ec2c21a SHA512 a109c09d947f7c5e924fdbc9c9b6c0a9d6ff64d9411aedd9a3e710d20f749b088ff9895e882dd888b88bfea7724a8933534be4078f16cb9d2047da761515e804 WHIRLPOOL 62fb8486bfa53d55b397d9a90750d32a83f0a73cf2e6685f296489390abf9c62efc69fecd6d011fc51e9f562f75f5b8ce03208c350e98d20de0a5560721c675e |
| 31 |
DIST libvirt-1.3.2.tar.gz 30056101 SHA256 e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05 SHA512 bcca111204c42db3a199c7d35758e78bcd9da557f091cb690dd712912aeee0ee89afa37a427ad972b94cc8ea9ed0788ff555a9042a9bab5ad0b55ca0d13aed1c WHIRLPOOL 551c4232e4890515276824e96a4379cc4908b71ac2d7ad27e4a1f7c78cc0ca39223422c17fee929d5dce090af03eaba5b5bd7ef83b0fc995dcac03398ef5d43b |
| 32 |
+DIST libvirt-1.3.4.tar.gz 30493908 SHA256 e2396ebebb3f3fdb50429ce8faa99559f6e8e3cc0493d5fa0c1999db189c25bd SHA512 6f85e4cd8a696da729bb88368c608694119258c6ab7f9b99f41c34a6cc4492d9ad90b8ff1574fd4ee6c78c674a3a501db60d1d3ba898f7013321ecc996612919 WHIRLPOOL af4a8a0e3d746f50e0f9d95e3920c023c5bbec0d7c641f43aea580db9b95a793027f7579ecd94625a68b7e3662c328d94b7b2d243afea60a8d2f31cab1cc9319 |
| 33 |
|
| 34 |
diff --git a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch b/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..adeff5c |
| 37 |
--- /dev/null |
| 38 |
+++ b/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch |
| 39 |
@@ -0,0 +1,86 @@ |
| 40 |
+get major/minor macros by using AC_HEADER_MAJOR |
| 41 |
+ |
| 42 |
+https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html#AC_HEADER_MAJOR |
| 43 |
+ |
| 44 |
+https://bugs.gentoo.org/579960 |
| 45 |
+diff --git a/configure.ac b/configure.ac |
| 46 |
+index 93d347c..1e7ee51 100644 |
| 47 |
+--- a/configure.ac |
| 48 |
++++ b/configure.ac |
| 49 |
+@@ -282,2 +282,5 @@ AC_CHECK_SIZEOF([long]) |
| 50 |
+ |
| 51 |
++dnl detect system-specific headers for major()/minor() |
| 52 |
++AC_HEADER_MAJOR |
| 53 |
++ |
| 54 |
+ dnl Availability of various common functions (non-fatal if missing), |
| 55 |
+diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c |
| 56 |
+index bd2eeb6..74b2487 100644 |
| 57 |
+--- a/src/conf/domain_audit.c |
| 58 |
++++ b/src/conf/domain_audit.c |
| 59 |
+@@ -28,2 +28,9 @@ |
| 60 |
+ |
| 61 |
++#ifdef MAJOR_IN_MKDEV |
| 62 |
++# include <sys/mkdev.h> |
| 63 |
++#endif |
| 64 |
++#ifdef MAJOR_IN_SYSMACROS |
| 65 |
++# include <sys/sysmacros.h> |
| 66 |
++#endif |
| 67 |
++ |
| 68 |
+ #include "domain_audit.h" |
| 69 |
+diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c |
| 70 |
+index 76bef82..49c0648 100644 |
| 71 |
+--- a/src/lxc/lxc_controller.c |
| 72 |
++++ b/src/lxc/lxc_controller.c |
| 73 |
+@@ -48,2 +48,9 @@ |
| 74 |
+ |
| 75 |
++#ifdef MAJOR_IN_MKDEV |
| 76 |
++# include <sys/mkdev.h> |
| 77 |
++#endif |
| 78 |
++#ifdef MAJOR_IN_SYSMACROS |
| 79 |
++# include <sys/sysmacros.h> |
| 80 |
++#endif |
| 81 |
++ |
| 82 |
+ #include "virerror.h" |
| 83 |
+diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c |
| 84 |
+index 3c6c839..983cd21 100644 |
| 85 |
+--- a/src/lxc/lxc_driver.c |
| 86 |
++++ b/src/lxc/lxc_driver.c |
| 87 |
+@@ -38,2 +38,9 @@ |
| 88 |
+ |
| 89 |
++#ifdef MAJOR_IN_MKDEV |
| 90 |
++# include <sys/mkdev.h> |
| 91 |
++#endif |
| 92 |
++#ifdef MAJOR_IN_SYSMACROS |
| 93 |
++# include <sys/sysmacros.h> |
| 94 |
++#endif |
| 95 |
++ |
| 96 |
+ #include "virerror.h" |
| 97 |
+diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c |
| 98 |
+index 38398fd..4b45458 100644 |
| 99 |
+--- a/src/util/vircgroup.c |
| 100 |
++++ b/src/util/vircgroup.c |
| 101 |
+@@ -31,2 +31,10 @@ |
| 102 |
+ #endif |
| 103 |
++ |
| 104 |
++#ifdef MAJOR_IN_MKDEV |
| 105 |
++# include <sys/mkdev.h> |
| 106 |
++#endif |
| 107 |
++#ifdef MAJOR_IN_SYSMACROS |
| 108 |
++# include <sys/sysmacros.h> |
| 109 |
++#endif |
| 110 |
++ |
| 111 |
+ #include <fcntl.h> |
| 112 |
+diff --git a/src/util/virutil.c b/src/util/virutil.c |
| 113 |
+index bb9604a..9840a9e 100644 |
| 114 |
+--- a/src/util/virutil.c |
| 115 |
++++ b/src/util/virutil.c |
| 116 |
+@@ -68,2 +68,9 @@ |
| 117 |
+ |
| 118 |
++#ifdef MAJOR_IN_MKDEV |
| 119 |
++# include <sys/mkdev.h> |
| 120 |
++#endif |
| 121 |
++#ifdef MAJOR_IN_SYSMACROS |
| 122 |
++# include <sys/sysmacros.h> |
| 123 |
++#endif |
| 124 |
++ |
| 125 |
+ #include "c-ctype.h" |
| 126 |
|
| 127 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-1.3.4.ebuild |
| 128 |
similarity index 93% |
| 129 |
copy from app-emulation/libvirt/libvirt-9999.ebuild |
| 130 |
copy to app-emulation/libvirt/libvirt-1.3.4.ebuild |
| 131 |
index 22d4afb..67b638a 100644 |
| 132 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 133 |
+++ b/app-emulation/libvirt/libvirt-1.3.4.ebuild |
| 134 |
@@ -1,4 +1,4 @@ |
| 135 |
-# Copyright 1999-2015 Gentoo Foundation |
| 136 |
+# Copyright 1999-2016 Gentoo Foundation |
| 137 |
# Distributed under the terms of the GNU General Public License v2 |
| 138 |
# $Id$ |
| 139 |
|
| 140 |
@@ -220,7 +220,9 @@ src_prepare() { |
| 141 |
epatch \ |
| 142 |
"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \ |
| 143 |
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ |
| 144 |
- "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch |
| 145 |
+ "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \ |
| 146 |
+ "${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch \ |
| 147 |
+ "${FILESDIR}"/${P}-glibc-2.23.patch |
| 148 |
|
| 149 |
[[ -n ${BACKPORTS} ]] && |
| 150 |
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ |
| 151 |
@@ -229,11 +231,11 @@ src_prepare() { |
| 152 |
epatch_user |
| 153 |
|
| 154 |
# Tweak the init script: |
| 155 |
- cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die |
| 156 |
+ cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die |
| 157 |
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ |
| 158 |
- -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \ |
| 159 |
- -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \ |
| 160 |
- -e "s/USE_FLAG_RBD/$(usex rbd ceph '')/" \ |
| 161 |
+ -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \ |
| 162 |
+ -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ |
| 163 |
+ -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ |
| 164 |
-i "${S}/libvirtd.init" || die "sed failed" |
| 165 |
|
| 166 |
AUTOTOOLS_AUTORECONF=true |
| 167 |
@@ -312,6 +314,10 @@ src_configure() { |
| 168 |
# bug #377279 |
| 169 |
(cd .gnulib && git reset --hard > /dev/null) |
| 170 |
fi |
| 171 |
+ |
| 172 |
+ # Workaround: Sometimes this subdirectory is missing and leads to a |
| 173 |
+ # build failure. |
| 174 |
+ mkdir -p "${BUILD_DIR}"/docs/internals |
| 175 |
} |
| 176 |
|
| 177 |
src_test() { |
| 178 |
@@ -343,7 +349,7 @@ src_install() { |
| 179 |
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf |
| 180 |
|
| 181 |
newinitd "${S}/libvirtd.init" libvirtd || die |
| 182 |
- newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die |
| 183 |
+ newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die |
| 184 |
newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die |
| 185 |
newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die |
| 186 |
|
| 187 |
|
| 188 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 189 |
index 22d4afb..2b973d6 100644 |
| 190 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 191 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 192 |
@@ -220,7 +220,8 @@ src_prepare() { |
| 193 |
epatch \ |
| 194 |
"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \ |
| 195 |
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ |
| 196 |
- "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch |
| 197 |
+ "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \ |
| 198 |
+ "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch |
| 199 |
|
| 200 |
[[ -n ${BACKPORTS} ]] && |
| 201 |
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ |
Archives