parent
559b0c1c0a
commit
69b9d2b8a7
@ -1,12 +1,12 @@
|
|||||||
# Copyright 1999-2008 Gentoo Foundation
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild,v 1.1 2008/05/13 21:28:23 beandog Exp $
|
# $Header: /var/cvsroot/gentoo-x86/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild,v 1.2 2013/11/07 02:39:50 patrick Exp $
|
||||||
|
|
||||||
SWORD_MODULE="HunUj"
|
SWORD_MODULE="HunUj"
|
||||||
|
|
||||||
inherit sword-module
|
inherit sword-module
|
||||||
|
|
||||||
DESCRIPTION="The New Translation Bible of the Hungarian Bible Society (Magyar Bibliatarsulat Ujforditasu Bibliaja)"
|
DESCRIPTION="New Translation Bible of the Hungarian Bible Society (Magyar Bibliatarsulat Ujforditasu Bibliaja)"
|
||||||
HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
|
HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
|
||||||
LICENSE="freedist"
|
LICENSE="freedist"
|
||||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
|
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
DIST libvirt-1.0.5.6.tar.gz 23998470 SHA256 171e2497d4d4109f4839f6f4b727b92f02530776b87b7246189d7ca6b44372bf SHA512 119c8c7a584a0fb6ea8e6385d5d5aac814e9f0a975adf4e75ee012d116a139c558ecb121da544e073700f1eb95a9b360fb457ce6cfebeddfb703fe42d41546a7 WHIRLPOOL 5f3b17f07e124816facf847d43bde74cbcd90213206085f770b1cb86240b0ba2a7cde8f1846665ecdaaf261d1ca44eb14226d27223e98b652efcbb834d00a103
|
DIST libvirt-1.0.5.6.tar.gz 23998470 SHA256 171e2497d4d4109f4839f6f4b727b92f02530776b87b7246189d7ca6b44372bf SHA512 119c8c7a584a0fb6ea8e6385d5d5aac814e9f0a975adf4e75ee012d116a139c558ecb121da544e073700f1eb95a9b360fb457ce6cfebeddfb703fe42d41546a7 WHIRLPOOL 5f3b17f07e124816facf847d43bde74cbcd90213206085f770b1cb86240b0ba2a7cde8f1846665ecdaaf261d1ca44eb14226d27223e98b652efcbb834d00a103
|
||||||
DIST libvirt-1.1.3-062ad8b2.tar.xz 18836 SHA256 a16a72d9cc6b49564e234b39f94a987e20da9fd511203ec1cb4534ccf4570121 SHA512 0734836972ef3e7a2d8bcb1d1ab001b3f15202c2921107c28a17f6ccf4002849c920133969b611560a88ca7f969eea468b1a8bc14b432b270f624c6594fc1ade WHIRLPOOL 340ca175f7322ede982455ba311a19cd5cbb33ea49e1fa3a7ab13a0fdb31c37a8a0fc58cec189efb19a861a21d6c677c3c3533e58e9fb9eaa4ce0f3dde721ec9
|
DIST libvirt-1.1.3-062ad8b2.tar.xz 18836 SHA256 a16a72d9cc6b49564e234b39f94a987e20da9fd511203ec1cb4534ccf4570121 SHA512 0734836972ef3e7a2d8bcb1d1ab001b3f15202c2921107c28a17f6ccf4002849c920133969b611560a88ca7f969eea468b1a8bc14b432b270f624c6594fc1ade WHIRLPOOL 340ca175f7322ede982455ba311a19cd5cbb33ea49e1fa3a7ab13a0fdb31c37a8a0fc58cec189efb19a861a21d6c677c3c3533e58e9fb9eaa4ce0f3dde721ec9
|
||||||
|
DIST libvirt-1.1.3.1.tar.gz 26595900 SHA256 00383e0beef1854610d8d47fd9347564b3654ce0e4a263e06b0de364a118c93e SHA512 59f79d0fc52ae0c9ae97bcc8fd90f799d6daf63c9a36d38738ec7d7392e630e39347f0c472b02434e83888b3ee0ab62d2b0b4eaa92eed3102ff36ca30f2598aa WHIRLPOOL 92be678e7ef84f9437bb91b1a621e6b35f9ce1383b945e466b4b864c0df1cfb95900da6267263bb1984663ea8e2b5b358bd516748a934835a87be822f5d27e90
|
||||||
DIST libvirt-1.1.3.tar.gz 26578000 SHA256 af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c SHA512 895f8ccf1fdf7a36918e4d460b44b1bf67d06842e39142c89c620f6191e299b53c50f80ab47677d7cba6bd570177d79b5ee0d7d2a11472991590389db51fab9d WHIRLPOOL c046f1182976bbd6bf65b460b2017996e63f67b5cce44f0af859d90f892278d0236192e6e7172e16c85183da6e258a003d9c8757af2079ab4d77de9ca300d986
|
DIST libvirt-1.1.3.tar.gz 26578000 SHA256 af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c SHA512 895f8ccf1fdf7a36918e4d460b44b1bf67d06842e39142c89c620f6191e299b53c50f80ab47677d7cba6bd570177d79b5ee0d7d2a11472991590389db51fab9d WHIRLPOOL c046f1182976bbd6bf65b460b2017996e63f67b5cce44f0af859d90f892278d0236192e6e7172e16c85183da6e258a003d9c8757af2079ab4d77de9ca300d986
|
||||||
DIST libvirt-1.1.4.tar.gz 26799019 SHA256 5910f5cf607a50c606d959e6b1e5d6e67966b7aa7324982afd7f85d9c24bd98f SHA512 64455585b8d7e5c0f701e9803ae00d277ee27f9bec92b9890e487cd0298f5f8ff9075d0b2bc81be67e8d8e03bfe58eb2e4fd6292439acd9d22a3f3e7f5b87efc WHIRLPOOL c8de6024b51988415847463064ccf2bcc9d7cb42be8765fbfcf901b594d963351f312d962ca4fb2a5ecce7c2247a60b6201e57a41ba44caa6211148585d65352
|
DIST libvirt-1.1.4.tar.gz 26799019 SHA256 5910f5cf607a50c606d959e6b1e5d6e67966b7aa7324982afd7f85d9c24bd98f SHA512 64455585b8d7e5c0f701e9803ae00d277ee27f9bec92b9890e487cd0298f5f8ff9075d0b2bc81be67e8d8e03bfe58eb2e4fd6292439acd9d22a3f3e7f5b87efc WHIRLPOOL c8de6024b51988415847463064ccf2bcc9d7cb42be8765fbfcf901b594d963351f312d962ca4fb2a5ecce7c2247a60b6201e57a41ba44caa6211148585d65352
|
||||||
|
@ -0,0 +1,433 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3.1.ebuild,v 1.1 2013/11/06 19:06:35 cardoe Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
#BACKPORTS=062ad8b2
|
||||||
|
AUTOTOOLIZE=yes
|
||||||
|
|
||||||
|
MY_P="${P/_rc/-rc}"
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||||
|
|
||||||
|
inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
|
||||||
|
|
||||||
|
if [[ ${PV} = *9999* ]]; then
|
||||||
|
inherit git-2
|
||||||
|
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
|
||||||
|
AUTOTOOLIZE=yes
|
||||||
|
SRC_URI=""
|
||||||
|
KEYWORDS=""
|
||||||
|
else
|
||||||
|
SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
|
||||||
|
ftp://libvirt.org/libvirt/${MY_P}.tar.gz
|
||||||
|
${BACKPORTS:+
|
||||||
|
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
fi
|
||||||
|
S="${WORKDIR}/${P%_rc*}"
|
||||||
|
|
||||||
|
DESCRIPTION="C toolkit to manipulate virtual machines"
|
||||||
|
HOMEPAGE="http://www.libvirt.org/"
|
||||||
|
LICENSE="LGPL-2.1"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
|
||||||
|
nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
|
||||||
|
selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
|
||||||
|
systemd"
|
||||||
|
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
|
||||||
|
lxc? ( caps libvirtd )
|
||||||
|
openvz? ( libvirtd )
|
||||||
|
qemu? ( libvirtd )
|
||||||
|
uml? ( libvirtd )
|
||||||
|
vepa? ( macvtap )
|
||||||
|
virtualbox? ( libvirtd )
|
||||||
|
xen? ( libvirtd )
|
||||||
|
virt-network? ( libvirtd )
|
||||||
|
firewalld? ( virt-network )
|
||||||
|
python? ( ${PYTHON_REQUIRED_USE} )"
|
||||||
|
|
||||||
|
# gettext.sh command is used by the libvirt command wrappers, and it's
|
||||||
|
# non-optional, so put it into RDEPEND.
|
||||||
|
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
|
||||||
|
# package will use 3 by default. Since we don't have slot pinning in an API,
|
||||||
|
# we must go with the most recent
|
||||||
|
RDEPEND="sys-libs/readline
|
||||||
|
sys-libs/ncurses
|
||||||
|
>=net-misc/curl-7.18.0
|
||||||
|
dev-libs/libgcrypt
|
||||||
|
>=dev-libs/libxml2-2.7.6
|
||||||
|
dev-libs/libnl:3
|
||||||
|
>=net-libs/gnutls-1.0.25
|
||||||
|
net-libs/libssh2
|
||||||
|
sys-apps/dmidecode
|
||||||
|
>=sys-apps/util-linux-2.17
|
||||||
|
sys-devel/gettext
|
||||||
|
>=net-analyzer/netcat6-1.0-r2
|
||||||
|
app-misc/scrub
|
||||||
|
audit? ( sys-process/audit )
|
||||||
|
avahi? ( >=net-dns/avahi-0.6[dbus] )
|
||||||
|
caps? ( sys-libs/libcap-ng )
|
||||||
|
fuse? ( >=sys-fs/fuse-2.8.6 )
|
||||||
|
iscsi? ( sys-block/open-iscsi )
|
||||||
|
lxc? ( sys-power/pm-utils )
|
||||||
|
lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
|
||||||
|
nfs? ( net-fs/nfs-utils )
|
||||||
|
numa? (
|
||||||
|
>sys-process/numactl-2.0.2
|
||||||
|
sys-process/numad
|
||||||
|
)
|
||||||
|
openvz? ( sys-kernel/openvz-sources )
|
||||||
|
parted? (
|
||||||
|
>=sys-block/parted-1.8[device-mapper]
|
||||||
|
sys-fs/lvm2
|
||||||
|
)
|
||||||
|
pcap? ( >=net-libs/libpcap-1.0.0 )
|
||||||
|
policykit? ( >=sys-auth/polkit-0.9 )
|
||||||
|
python? ( ${PYTHON_DEPS} )
|
||||||
|
qemu? (
|
||||||
|
>=app-emulation/qemu-0.13.0
|
||||||
|
dev-libs/yajl
|
||||||
|
sys-power/pm-utils
|
||||||
|
)
|
||||||
|
rbd? ( sys-cluster/ceph )
|
||||||
|
sasl? ( dev-libs/cyrus-sasl )
|
||||||
|
selinux? ( >=sys-libs/libselinux-2.0.85 )
|
||||||
|
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
|
||||||
|
xen? ( app-emulation/xen-tools app-emulation/xen )
|
||||||
|
udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
|
||||||
|
virt-network? ( net-dns/dnsmasq
|
||||||
|
>=net-firewall/iptables-1.4.10
|
||||||
|
net-misc/radvd
|
||||||
|
net-firewall/ebtables
|
||||||
|
sys-apps/iproute2[-minimal]
|
||||||
|
firewalld? ( net-firewall/firewalld )
|
||||||
|
)
|
||||||
|
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
|
||||||
|
# one? ( dev-libs/xmlrpc-c )
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
virtual/pkgconfig
|
||||||
|
app-text/xhtml1
|
||||||
|
dev-lang/perl
|
||||||
|
dev-libs/libxslt"
|
||||||
|
|
||||||
|
DOC_CONTENTS="For the basic networking support (bridged and routed networks)
|
||||||
|
you don't need any extra software. For more complex network modes
|
||||||
|
including but not limited to NATed network, you can enable the
|
||||||
|
'virt-network' USE flag.\n\n
|
||||||
|
If you are using dnsmasq on your system, you will have
|
||||||
|
to configure /etc/dnsmasq.conf to enable the following settings:\n\n
|
||||||
|
bind-interfaces\n
|
||||||
|
interface or except-interface\n\n
|
||||||
|
Otherwise you might have issues with your existing DNS server."
|
||||||
|
|
||||||
|
LXC_CONFIG_CHECK="
|
||||||
|
~CGROUPS
|
||||||
|
~CGROUP_FREEZER
|
||||||
|
~CGROUP_DEVICE
|
||||||
|
~CGROUP_CPUACCT
|
||||||
|
~CGROUP_SCHED
|
||||||
|
~CGROUP_PERF
|
||||||
|
~BLK_CGROUP
|
||||||
|
~NET_CLS_CGROUP
|
||||||
|
~NETPRIO_CGROUP
|
||||||
|
~CPUSETS
|
||||||
|
~RESOURCE_COUNTERS
|
||||||
|
~NAMESPACES
|
||||||
|
~UTS_NS
|
||||||
|
~IPC_NS
|
||||||
|
~PID_NS
|
||||||
|
~NET_NS
|
||||||
|
~USER_NS
|
||||||
|
~DEVPTS_MULTIPLE_INSTANCES
|
||||||
|
~VETH
|
||||||
|
~MACVLAN
|
||||||
|
~POSIX_MQUEUE
|
||||||
|
~SECURITYFS
|
||||||
|
~!GRKERNSEC_CHROOT_MOUNT
|
||||||
|
~!GRKERNSEC_CHROOT_DOUBLE
|
||||||
|
~!GRKERNSEC_CHROOT_PIVOT
|
||||||
|
~!GRKERNSEC_CHROOT_CHMOD
|
||||||
|
~!GRKERNSEC_CHROOT_CAPS
|
||||||
|
"
|
||||||
|
|
||||||
|
VIRTNET_CONFIG_CHECK="
|
||||||
|
~BRIDGE_NF_EBTABLES
|
||||||
|
~BRIDGE_EBT_MARK_T
|
||||||
|
~NETFILTER_ADVANCED
|
||||||
|
~NETFILTER_XT_TARGET_CHECKSUM
|
||||||
|
~NETFILTER_XT_CONNMARK
|
||||||
|
~NETFILTER_XT_MARK
|
||||||
|
"
|
||||||
|
|
||||||
|
MACVTAP_CONFIG_CHECK=" ~MACVTAP"
|
||||||
|
|
||||||
|
LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
enewgroup qemu 77
|
||||||
|
enewuser qemu 77 -1 -1 qemu kvm
|
||||||
|
|
||||||
|
# Some people used the masked ebuild which was not adding the qemu
|
||||||
|
# user to the kvm group originally. This results in VMs failing to
|
||||||
|
# start for some users. bug #430808
|
||||||
|
egetent group kvm | grep -q qemu
|
||||||
|
if [[ $? -ne 0 ]]; then
|
||||||
|
gpasswd -a qemu kvm
|
||||||
|
fi
|
||||||
|
|
||||||
|
python-single-r1_pkg_setup
|
||||||
|
|
||||||
|
# Handle specific kernel versions for different features
|
||||||
|
kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
|
||||||
|
kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
|
||||||
|
|
||||||
|
CONFIG_CHECK=""
|
||||||
|
use fuse && CONFIG_CHECK+=" ~FUSE_FS"
|
||||||
|
use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
|
||||||
|
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
|
||||||
|
use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
|
||||||
|
use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
|
||||||
|
if [[ -n ${CONFIG_CHECK} ]]; then
|
||||||
|
linux-info_pkg_setup
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
touch "${S}/.mailmap"
|
||||||
|
[[ -n ${BACKPORTS} ]] && \
|
||||||
|
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||||
|
epatch
|
||||||
|
|
||||||
|
if [[ ${PV} = *9999* ]]; then
|
||||||
|
|
||||||
|
# git checkouts require bootstrapping to create the configure script.
|
||||||
|
# Additionally the submodules must be cloned to the right locations
|
||||||
|
# bug #377279
|
||||||
|
./bootstrap || die "bootstrap failed"
|
||||||
|
(
|
||||||
|
git submodule status | sed 's/^[ +-]//;s/ .*//'
|
||||||
|
git hash-object bootstrap.conf
|
||||||
|
) >.git-module-status
|
||||||
|
fi
|
||||||
|
|
||||||
|
epatch_user
|
||||||
|
|
||||||
|
[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
|
||||||
|
|
||||||
|
# Tweak the init script
|
||||||
|
local avahi_init=
|
||||||
|
local iscsi_init=
|
||||||
|
local rbd_init=
|
||||||
|
local firewalld_init=
|
||||||
|
cp "${FILESDIR}/libvirtd.init-r13" "${S}/libvirtd.init"
|
||||||
|
use avahi && avahi_init='avahi-daemon'
|
||||||
|
use iscsi && iscsi_init='iscsid'
|
||||||
|
use rbd && rbd_init='ceph'
|
||||||
|
use firewalld && firewalld_init='need firewalld'
|
||||||
|
|
||||||
|
sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
|
||||||
|
sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
|
||||||
|
sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
|
||||||
|
sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
local myconf=""
|
||||||
|
|
||||||
|
## enable/disable daemon, otherwise client only utils
|
||||||
|
myconf="${myconf} $(use_with libvirtd)"
|
||||||
|
|
||||||
|
## enable/disable the daemon using avahi to find VMs
|
||||||
|
myconf="${myconf} $(use_with avahi)"
|
||||||
|
|
||||||
|
## hypervisors on the local host
|
||||||
|
myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
|
||||||
|
myconf+=" --without-xenapi"
|
||||||
|
if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
|
||||||
|
myconf+=" --with-libxl"
|
||||||
|
else
|
||||||
|
myconf+=" --without-libxl"
|
||||||
|
fi
|
||||||
|
myconf="${myconf} $(use_with openvz)"
|
||||||
|
myconf="${myconf} $(use_with lxc)"
|
||||||
|
if use virtualbox && has_version app-emulation/virtualbox-ose; then
|
||||||
|
myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
|
||||||
|
else
|
||||||
|
myconf="${myconf} $(use_with virtualbox vbox)"
|
||||||
|
fi
|
||||||
|
myconf="${myconf} $(use_with uml)"
|
||||||
|
myconf="${myconf} $(use_with qemu)"
|
||||||
|
myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
|
||||||
|
myconf="${myconf} $(use_with phyp)"
|
||||||
|
myconf="${myconf} --with-esx"
|
||||||
|
myconf="${myconf} --with-vmware"
|
||||||
|
|
||||||
|
## additional host drivers
|
||||||
|
myconf="${myconf} $(use_with virt-network network)"
|
||||||
|
myconf="${myconf} --with-storage-fs"
|
||||||
|
myconf="${myconf} $(use_with lvm storage-lvm)"
|
||||||
|
myconf="${myconf} $(use_with iscsi storage-iscsi)"
|
||||||
|
myconf="${myconf} $(use_with parted storage-disk)"
|
||||||
|
myconf="${myconf} $(use_with lvm storage-mpath)"
|
||||||
|
myconf="${myconf} $(use_with rbd storage-rbd)"
|
||||||
|
myconf="${myconf} $(use_with numa numactl)"
|
||||||
|
myconf="${myconf} $(use_with numa numad)"
|
||||||
|
myconf="${myconf} $(use_with selinux)"
|
||||||
|
myconf="${myconf} $(use_with fuse)"
|
||||||
|
|
||||||
|
# udev for device support details
|
||||||
|
myconf="${myconf} $(use_with udev)"
|
||||||
|
|
||||||
|
# linux capability support so we don't need privileged accounts
|
||||||
|
myconf="${myconf} $(use_with caps capng)"
|
||||||
|
|
||||||
|
## auth stuff
|
||||||
|
myconf="${myconf} $(use_with policykit polkit)"
|
||||||
|
myconf="${myconf} $(use_with sasl)"
|
||||||
|
|
||||||
|
# network bits
|
||||||
|
myconf="${myconf} $(use_with macvtap)"
|
||||||
|
myconf="${myconf} $(use_with pcap libpcap)"
|
||||||
|
myconf="${myconf} $(use_with vepa virtualport)"
|
||||||
|
myconf="${myconf} $(use_with firewalld)"
|
||||||
|
|
||||||
|
## other
|
||||||
|
myconf="${myconf} $(use_enable nls)"
|
||||||
|
myconf="${myconf} $(use_with python)"
|
||||||
|
|
||||||
|
# user privilege bits fir qemu/kvm
|
||||||
|
if use caps; then
|
||||||
|
myconf="${myconf} --with-qemu-user=qemu"
|
||||||
|
myconf="${myconf} --with-qemu-group=qemu"
|
||||||
|
else
|
||||||
|
myconf="${myconf} --with-qemu-user=root"
|
||||||
|
myconf="${myconf} --with-qemu-group=root"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# audit support
|
||||||
|
myconf="${myconf} $(use_with audit)"
|
||||||
|
|
||||||
|
## stuff we don't yet support
|
||||||
|
myconf="${myconf} --without-netcf"
|
||||||
|
|
||||||
|
# we use udev over hal
|
||||||
|
myconf="${myconf} --without-hal"
|
||||||
|
|
||||||
|
# locking support
|
||||||
|
myconf="${myconf} --without-sanlock"
|
||||||
|
|
||||||
|
# systemd unit files
|
||||||
|
use systemd && myconf="${myconf} --with-init-script=systemd"
|
||||||
|
|
||||||
|
# this is a nasty trick to work around the problem in bug
|
||||||
|
# #275073. The reason why we don't solve this properly is that
|
||||||
|
# it'll require us to rebuild autotools (and we don't really want
|
||||||
|
# to do that right now). The proper solution has been sent
|
||||||
|
# upstream and should hopefully land in 0.7.7, in the mean time,
|
||||||
|
# mime the same functionality with this.
|
||||||
|
case ${CHOST} in
|
||||||
|
*cygwin* | *mingw* )
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ac_cv_prog_WINDRES=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
econf \
|
||||||
|
${myconf} \
|
||||||
|
--disable-static \
|
||||||
|
--docdir=/usr/share/doc/${PF} \
|
||||||
|
--with-remote \
|
||||||
|
--localstatedir=/var
|
||||||
|
|
||||||
|
if [[ ${PV} = *9999* ]]; then
|
||||||
|
# Restore gnulib's config.sub and config.guess
|
||||||
|
# bug #377279
|
||||||
|
(cd .gnulib && git reset --hard > /dev/null)
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
# Explicitly allow parallel build of tests
|
||||||
|
export VIR_TEST_DEBUG=1
|
||||||
|
HOME="${T}" emake check || die "tests failed"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake install \
|
||||||
|
DESTDIR="${D}" \
|
||||||
|
HTML_DIR=/usr/share/doc/${PF}/html \
|
||||||
|
DOCS_DIR=/usr/share/doc/${PF} \
|
||||||
|
EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
|
||||||
|
SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
|
||||||
|
|| die "emake install failed"
|
||||||
|
|
||||||
|
find "${D}" -name '*.la' -delete || die
|
||||||
|
|
||||||
|
use libvirtd || return 0
|
||||||
|
# From here, only libvirtd-related instructions, be warned!
|
||||||
|
|
||||||
|
newinitd "${S}/libvirtd.init" libvirtd || die
|
||||||
|
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
|
||||||
|
newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
|
||||||
|
|
||||||
|
keepdir /var/lib/libvirt/images
|
||||||
|
|
||||||
|
use python && python_optimize
|
||||||
|
|
||||||
|
readme.gentoo_create_doc
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
# we only ever want to generate this once
|
||||||
|
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||||
|
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
|
||||||
|
fi
|
||||||
|
|
||||||
|
# We really don't want to use or support old PolicyKit cause it
|
||||||
|
# screws with the new polkit integration
|
||||||
|
if has_version sys-auth/policykit; then
|
||||||
|
rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Only sysctl files ending in .conf work
|
||||||
|
dodir /etc/sysctl.d
|
||||||
|
mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||||
|
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
|
||||||
|
fi
|
||||||
|
|
||||||
|
# support for dropped privileges
|
||||||
|
if use qemu; then
|
||||||
|
fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
|
||||||
|
fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use caps && use qemu; then
|
||||||
|
fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
|
||||||
|
fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
|
||||||
|
elif use qemu; then
|
||||||
|
fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
|
||||||
|
fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! use policykit; then
|
||||||
|
elog "To allow normal users to connect to libvirtd you must change the"
|
||||||
|
elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
|
||||||
|
fi
|
||||||
|
|
||||||
|
use libvirtd || return 0
|
||||||
|
# From here, only libvirtd-related instructions, be warned!
|
||||||
|
|
||||||
|
readme.gentoo_print_elog
|
||||||
|
|
||||||
|
if use caps && use qemu; then
|
||||||
|
elog "libvirt will now start qemu/kvm VMs with non-root privileges."
|
||||||
|
elog "Ensure any resources your VMs use are accessible by qemu:qemu"
|
||||||
|
fi
|
||||||
|
}
|
@ -0,0 +1,83 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1.ebuild,v 1.1 2013/11/06 23:08:20 dilfridge Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit eutils flag-o-matic linux-info linux-mod user versionator udev
|
||||||
|
|
||||||
|
PV_MAJOR=$(get_major_version)
|
||||||
|
PV_MINOR=$(get_version_component_range 2)
|
||||||
|
|
||||||
|
DESCRIPTION="VMware kernel modules"
|
||||||
|
HOMEPAGE="http://www.vmware.com/"
|
||||||
|
|
||||||
|
SRC_URI=""
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="pax_kernel"
|
||||||
|
|
||||||
|
RDEPEND=""
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
|
||||||
|
=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
|
||||||
|
|
||||||
|
S=${WORKDIR}
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
CONFIG_CHECK="~HIGH_RES_TIMERS"
|
||||||
|
if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
|
||||||
|
CONFIG_CHECK="${CONFIG_CHECK} BKL"
|
||||||
|
fi
|
||||||
|
|
||||||
|
linux-info_pkg_setup
|
||||||
|
|
||||||
|
linux-mod_pkg_setup
|
||||||
|
|
||||||
|
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
|
||||||
|
|
||||||
|
VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
|
||||||
|
VMWARE_MOD_DIR="${PN}-${PVR}"
|
||||||
|
|
||||||
|
BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
|
||||||
|
|
||||||
|
enewgroup "${VMWARE_GROUP}"
|
||||||
|
filter-flags -mfpmath=sse
|
||||||
|
|
||||||
|
for mod in ${VMWARE_MODULE_LIST}; do
|
||||||
|
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
cd "${S}"
|
||||||
|
for mod in ${VMWARE_MODULE_LIST}; do
|
||||||
|
tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
|
||||||
|
epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
|
||||||
|
epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
|
||||||
|
use pax_kernel && epatch "${FILESDIR}/hardened.patch"
|
||||||
|
epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
|
||||||
|
kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
|
||||||
|
kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
|
||||||
|
|
||||||
|
# Allow user patches so they can support RC kernels and whatever else
|
||||||
|
epatch_user
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
linux-mod_src_install
|
||||||
|
local udevrules="${T}/60-vmware.rules"
|
||||||
|
cat > "${udevrules}" <<-EOF
|
||||||
|
KERNEL=="vmci", GROUP="vmware", MODE=660
|
||||||
|
KERNEL=="vmmon", GROUP="vmware", MODE=660
|
||||||
|
KERNEL=="vsock", GROUP="vmware", MODE=660
|
||||||
|
EOF
|
||||||
|
udev_dorules "${udevrules}"
|
||||||
|
}
|
@ -0,0 +1,55 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-9.6.1.1379776.ebuild,v 1.1 2013/11/06 23:14:49 dilfridge Exp $
|
||||||
|
|
||||||
|
inherit versionator vmware-bundle
|
||||||
|
|
||||||
|
MY_PV="$(replace_version_separator 3 - $PV)"
|
||||||
|
BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/"
|
||||||
|
|
||||||
|
DESCRIPTION="VMware Tools for guest operating systems"
|
||||||
|
HOMEPAGE="http://www.vmware.com/products/player/"
|
||||||
|
|
||||||
|
LICENSE="vmware"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="-* ~amd64 ~x86"
|
||||||
|
RESTRICT="mirror"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
DEPEND=""
|
||||||
|
RDEPEND=""
|
||||||
|
|
||||||
|
IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
|
||||||
|
|
||||||
|
VM_INSTALL_DIR="/opt/vmware"
|
||||||
|
|
||||||
|
for guest in ${IUSE_VMWARE_GUEST} ; do
|
||||||
|
SRC_URI+=" vmware_guest_${guest}? (
|
||||||
|
amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
|
||||||
|
x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar )
|
||||||
|
)"
|
||||||
|
IUSE+=" vmware_guest_${guest}"
|
||||||
|
done ; unset guest
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
local arch
|
||||||
|
if use x86 ; then arch='i386'
|
||||||
|
elif use amd64 ; then arch='x86_64'
|
||||||
|
fi
|
||||||
|
local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
|
||||||
|
if use "vmware_guest_${guest}" ; then
|
||||||
|
local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
|
||||||
|
unpack "${component}.tar"
|
||||||
|
vmware-bundle_extract-component "${component}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
|
||||||
|
local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
|
||||||
|
if use "vmware_guest_${guest}" ; then
|
||||||
|
doins "${guest}".iso{,.sig}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
@ -0,0 +1,491 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776.ebuild,v 1.1 2013/11/06 23:07:41 dilfridge Exp $
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
|
||||||
|
|
||||||
|
MY_PN="VMware-Workstation"
|
||||||
|
MY_PV=$(get_version_component_range 1-3)
|
||||||
|
PV_MINOR=$(get_version_component_range 3)
|
||||||
|
PV_BUILD=$(get_version_component_range 4)
|
||||||
|
MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
|
||||||
|
|
||||||
|
SYSTEMD_UNITS_TAG="gentoo-01"
|
||||||
|
|
||||||
|
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
|
||||||
|
HOMEPAGE="http://www.vmware.com/products/workstation/"
|
||||||
|
BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
|
||||||
|
SRC_URI="
|
||||||
|
x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
|
||||||
|
amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
|
||||||
|
https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
|
||||||
|
"
|
||||||
|
LICENSE="vmware GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="-* ~amd64 ~x86"
|
||||||
|
IUSE="cups doc ovftool server vix vmware-tools"
|
||||||
|
RESTRICT="mirror strip"
|
||||||
|
|
||||||
|
# vmware-workstation should not use virtual/libc as this is a
|
||||||
|
# precompiled binary package thats linked to glibc.
|
||||||
|
RDEPEND="dev-cpp/cairomm
|
||||||
|
dev-cpp/glibmm:2
|
||||||
|
dev-cpp/gtkmm:2.4
|
||||||
|
dev-cpp/libgnomecanvasmm
|
||||||
|
dev-cpp/pangomm
|
||||||
|
dev-libs/atk
|
||||||
|
dev-libs/glib:2
|
||||||
|
dev-libs/icu
|
||||||
|
dev-libs/expat
|
||||||
|
dev-libs/libaio
|
||||||
|
dev-libs/libsigc++
|
||||||
|
dev-libs/libxml2
|
||||||
|
=dev-libs/openssl-0.9.8*
|
||||||
|
dev-libs/xmlrpc-c
|
||||||
|
gnome-base/libgnomecanvas
|
||||||
|
gnome-base/libgtop:2
|
||||||
|
gnome-base/librsvg:2
|
||||||
|
gnome-base/orbit
|
||||||
|
media-libs/fontconfig
|
||||||
|
media-libs/freetype
|
||||||
|
media-libs/libart_lgpl
|
||||||
|
=media-libs/libpng-1.2*
|
||||||
|
media-libs/libpng
|
||||||
|
net-misc/curl
|
||||||
|
cups? ( net-print/cups )
|
||||||
|
sys-devel/gcc
|
||||||
|
sys-fs/fuse
|
||||||
|
sys-libs/glibc
|
||||||
|
sys-libs/zlib
|
||||||
|
x11-libs/cairo
|
||||||
|
x11-libs/gtk+:2
|
||||||
|
x11-libs/libgksu
|
||||||
|
x11-libs/libICE
|
||||||
|
x11-libs/libSM
|
||||||
|
x11-libs/libX11
|
||||||
|
x11-libs/libXau
|
||||||
|
x11-libs/libxcb
|
||||||
|
x11-libs/libXcomposite
|
||||||
|
x11-libs/libXcursor
|
||||||
|
x11-libs/libXdamage
|
||||||
|
x11-libs/libXdmcp
|
||||||
|
x11-libs/libXext
|
||||||
|
x11-libs/libXfixes
|
||||||
|
x11-libs/libXft
|
||||||
|
x11-libs/libXi
|
||||||
|
x11-libs/libXinerama
|
||||||
|
x11-libs/libXrandr
|
||||||
|
x11-libs/libXrender
|
||||||
|
x11-libs/libXtst
|
||||||
|
x11-libs/pango
|
||||||
|
x11-libs/startup-notification
|
||||||
|
x11-themes/hicolor-icon-theme
|
||||||
|
!app-emulation/vmware-player"
|
||||||
|
PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
|
||||||
|
vmware-tools? ( app-emulation/vmware-tools )"
|
||||||
|
|
||||||
|
S=${WORKDIR}
|
||||||
|
VM_INSTALL_DIR="/opt/vmware"
|
||||||
|
VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
|
||||||
|
VM_HOSTD_USER="root"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
default
|
||||||
|
local bundle
|
||||||
|
use amd64 && bundle=${MY_P}.x86_64.bundle
|
||||||
|
use x86 && bundle=${MY_P}.i386.bundle
|
||||||
|
local component; for component in \
|
||||||
|
vmware-vmx \
|
||||||
|
vmware-player-app \
|
||||||
|
vmware-player-setup \
|
||||||
|
vmware-workstation \
|
||||||
|
vmware-network-editor \
|
||||||
|
vmware-network-editor-ui \
|
||||||
|
vmware-usbarbitrator \
|
||||||
|
vmware-vprobe
|
||||||
|
do
|
||||||
|
vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
|
||||||
|
done
|
||||||
|
|
||||||
|
if use server; then
|
||||||
|
vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use vix; then
|
||||||
|
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
|
||||||
|
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix
|
||||||
|
fi
|
||||||
|
if use ovftool; then
|
||||||
|
vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
rm -f bin/vmware-modconfig
|
||||||
|
rm -rf lib/modules/binary
|
||||||
|
# Bug 459566
|
||||||
|
mv lib/libvmware-netcfg.so lib/lib/
|
||||||
|
|
||||||
|
if use server; then
|
||||||
|
rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
|
||||||
|
fi
|
||||||
|
|
||||||
|
find "${S}" -name '*.a' -delete
|
||||||
|
|
||||||
|
# clean_bundled_libs
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_bundled_libs() {
|
||||||
|
ebegin 'Removing superfluous libraries'
|
||||||
|
cd lib/lib || die
|
||||||
|
ldconfig -p | \
|
||||||
|
sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
|
||||||
|
fgrep -vx 'libcrypto.so.0.9.8
|
||||||
|
libssl.so.0.9.8i
|
||||||
|
libgcr.so.0
|
||||||
|
libglib-2.0.so.0' |
|
||||||
|
xargs -d'\n' -r rm -rf
|
||||||
|
eend
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
local major_minor=$(get_version_component_range 1-2 "${PV}")
|
||||||
|
local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
|
||||||
|
local build=$(get_version_component_range 4 "${PV}")
|
||||||
|
|
||||||
|
# install the binaries
|
||||||
|
into "${VM_INSTALL_DIR}"
|
||||||
|
dobin bin/*
|
||||||
|
|
||||||
|
# install the libraries
|
||||||
|
insinto "${VM_INSTALL_DIR}"/lib/vmware
|
||||||
|
doins -r lib/*
|
||||||
|
|
||||||
|
# Bug 432918
|
||||||
|
dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
|
||||||
|
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
|
||||||
|
dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
|
||||||
|
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
|
||||||
|
|
||||||
|
# install the ancillaries
|
||||||
|
insinto /usr
|
||||||
|
doins -r share
|
||||||
|
|
||||||
|
if use cups; then
|
||||||
|
exeinto $(cups-config --serverbin)/filter
|
||||||
|
doexe extras/thnucups
|
||||||
|
|
||||||
|
insinto /etc/cups
|
||||||
|
doins -r etc/cups/*
|
||||||
|
fi
|
||||||
|
|
||||||
|
insinto /etc/xdg
|
||||||
|
doins -r etc/xdg/*
|
||||||
|
|
||||||
|
# install documentation
|
||||||
|
doman man/man1/vmware.1.gz
|
||||||
|
|
||||||
|
if use doc; then
|
||||||
|
dodoc doc/*
|
||||||
|
fi
|
||||||
|
|
||||||
|
insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
|
||||||
|
doins vmware-config
|
||||||
|
|
||||||
|
# install vmware workstation server
|
||||||
|
if use server; then
|
||||||
|
dosbin sbin/*
|
||||||
|
|
||||||
|
cd "${S}"/vmware-workstation-server
|
||||||
|
|
||||||
|
# install binaries
|
||||||
|
into "${VM_INSTALL_DIR}"/lib/vmware
|
||||||
|
dobin bin/*
|
||||||
|
|
||||||
|
dobin "${FILESDIR}"/configure-hostd.sh
|
||||||
|
|
||||||
|
dobin "${FILESDIR}"/configure-hostd.sh
|
||||||
|
|
||||||
|
# install the libraries
|
||||||
|
insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
|
||||||
|
doins -r lib/*
|
||||||
|
|
||||||
|
into "${VM_INSTALL_DIR}"
|
||||||
|
for tool in vmware-{hostd,wssc-adminTool} ; do
|
||||||
|
cat > "${T}/${tool}" <<-EOF
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
. /etc/vmware/bootstrap
|
||||||
|
|
||||||
|
exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
|
||||||
|
"${VM_INSTALL_DIR}/lib/vmware/lib" \\
|
||||||
|
"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
|
||||||
|
"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
|
||||||
|
EOF
|
||||||
|
dobin "${T}/${tool}"
|
||||||
|
done
|
||||||
|
|
||||||
|
insinto "${VM_INSTALL_DIR}"/lib/vmware
|
||||||
|
doins -r hostd
|
||||||
|
|
||||||
|
# create the configuration
|
||||||
|
insinto /etc/vmware/hostd
|
||||||
|
doins -r config/etc/vmware/hostd/*
|
||||||
|
doins -r etc/vmware/hostd/*
|
||||||
|
|
||||||
|
insinto /etc/vmware/ssl
|
||||||
|
doins etc/vmware/ssl/*
|
||||||
|
|
||||||
|
# pam
|
||||||
|
pamd_mimic_system vmware-authd auth account
|
||||||
|
|
||||||
|
# create directory for shared virtual machines.
|
||||||
|
keepdir "${VM_DATA_STORE_DIR}"
|
||||||
|
keepdir /var/log/vmware
|
||||||
|
fi
|
||||||
|
|
||||||
|
# install vmware-vix
|
||||||
|
if use vix; then
|
||||||
|
cd "${S}"/vmware-vix
|
||||||
|
|
||||||
|
# install the binary
|
||||||
|
into "${VM_INSTALL_DIR}"
|
||||||
|
dobin bin/*
|
||||||
|
|
||||||
|
# install the libraries
|
||||||
|
insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
|
||||||
|
doins -r lib/*
|
||||||
|
|
||||||
|
dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
|
||||||
|
|
||||||
|
# install headers
|
||||||
|
insinto /usr/include/vmware-vix
|
||||||
|
doins include/*
|
||||||
|
|
||||||
|
if use doc; then
|
||||||
|
dohtml -r doc/*
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# install ovftool
|
||||||
|
if use ovftool; then
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
|
||||||
|
doins -r vmware-ovftool/*
|
||||||
|
|
||||||
|
chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
|
||||||
|
dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
|
||||||
|
fi
|
||||||
|
|
||||||
|
# create symlinks for the various tools
|
||||||
|
local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
|
||||||
|
vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
|
||||||
|
dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
|
||||||
|
done
|
||||||
|
dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
|
||||||
|
dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
|
||||||
|
dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
|
||||||
|
|
||||||
|
# fix permissions
|
||||||
|
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
|
||||||
|
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
|
||||||
|
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
|
||||||
|
fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
|
||||||
|
fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
|
||||||
|
if use server; then
|
||||||
|
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
|
||||||
|
fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
|
||||||
|
fperms 1777 "${VM_DATA_STORE_DIR}"
|
||||||
|
fi
|
||||||
|
if use vix; then
|
||||||
|
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
|
||||||
|
fi
|
||||||
|
|
||||||
|
# create the environment
|
||||||
|
local envd="${T}/90vmware"
|
||||||
|
cat > "${envd}" <<-EOF
|
||||||
|
PATH='${VM_INSTALL_DIR}/bin'
|
||||||
|
ROOTPATH='${VM_INSTALL_DIR}/bin'
|
||||||
|
EOF
|
||||||
|
doenvd "${envd}"
|
||||||
|
|
||||||
|
# create the configuration
|
||||||
|
dodir /etc/vmware
|
||||||
|
|
||||||
|
cat > "${D}"/etc/vmware/bootstrap <<-EOF
|
||||||
|
BINDIR='${VM_INSTALL_DIR}/bin'
|
||||||
|
LIBDIR='${VM_INSTALL_DIR}/lib'
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat > "${D}"/etc/vmware/config <<-EOF
|
||||||
|
bindir = "${VM_INSTALL_DIR}/bin"
|
||||||
|
libdir = "${VM_INSTALL_DIR}/lib/vmware"
|
||||||
|
initscriptdir = "/etc/init.d"
|
||||||
|
authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
|
||||||
|
gksu.rootMethod = "su"
|
||||||
|
VMCI_CONFED = "yes"
|
||||||
|
VMBLOCK_CONFED = "yes"
|
||||||
|
VSOCK_CONFED = "yes"
|
||||||
|
NETWORKING = "yes"
|
||||||
|
player.product.version = "${major_minor_revision}"
|
||||||
|
product.version = "${major_minor_revision}"
|
||||||
|
product.buildNumber = "${build}"
|
||||||
|
product.name = "VMware Workstation"
|
||||||
|
workstation.product.version = "${major_minor_revision}"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
if use vix; then
|
||||||
|
cat >> "${D}"/etc/vmware/config <<-EOF
|
||||||
|
vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
|
||||||
|
vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
|
||||||
|
vix.config.version = "1"
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use server; then
|
||||||
|
cat >> "${D}"/etc/vmware/config <<-EOF
|
||||||
|
authd.client.port = "902"
|
||||||
|
authd.proxy.nfc = "vmware-hostd:ha-nfc"
|
||||||
|
authd.soapserver = "TRUE"
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
|
# install the init.d script
|
||||||
|
local initscript="${T}/vmware.rc"
|
||||||
|
sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
|
||||||
|
"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
|
||||||
|
newinitd "${initscript}" vmware
|
||||||
|
|
||||||
|
if use server; then
|
||||||
|
# install the init.d script
|
||||||
|
local initscript="${T}/vmware-workstation-server.rc"
|
||||||
|
sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
|
||||||
|
-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
|
||||||
|
-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
|
||||||
|
-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
|
||||||
|
"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
|
||||||
|
newinitd "${initscript}" vmware-workstation-server
|
||||||
|
fi
|
||||||
|
|
||||||
|
# fill in variable placeholders
|
||||||
|
sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
|
||||||
|
-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
|
||||||
|
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
|
||||||
|
-e "/^Encoding/d" \
|
||||||
|
-i "${D}/usr/share/applications/${PN}.desktop"
|
||||||
|
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
|
||||||
|
-e "/^Encoding/d" \
|
||||||
|
-i "${D}/usr/share/applications/vmware-player.desktop"
|
||||||
|
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
|
||||||
|
-e "/^Encoding/d" \
|
||||||
|
-i "${D}/usr/share/applications/vmware-netcfg.desktop"
|
||||||
|
|
||||||
|
if use server; then
|
||||||
|
# Configuration for vmware-workstation-server
|
||||||
|
local hostdUser="${VM_HOSTD_USER:-root}"
|
||||||
|
sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
|
||||||
|
-i "${D}/etc/vmware/hostd/authorization.xml" || die
|
||||||
|
|
||||||
|
# Shared VMs Path: [standard].
|
||||||
|
sed -e "s:##{DS_NAME}##:standard:g" \
|
||||||
|
-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
|
||||||
|
-i "${D}/etc/vmware/hostd/datastores.xml" || die
|
||||||
|
|
||||||
|
sed -e "s:##{HTTP_PORT}##:-1:g" \
|
||||||
|
-e "s:##{HTTPS_PORT}##:443:g" \
|
||||||
|
-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
|
||||||
|
-i "${D}/etc/vmware/hostd/proxy.xml" || die
|
||||||
|
|
||||||
|
# See vmware-workstation-server.py for more details.
|
||||||
|
sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
|
||||||
|
-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
|
||||||
|
-e "s:##{CFGDIR}##:/etc/vmware/:g" \
|
||||||
|
-e "s:##{ENABLE_AUTH}##:true:g" \
|
||||||
|
-e "s:##{HOSTDMODE}##:ws:g" \
|
||||||
|
-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
|
||||||
|
-e "s:##{HOSTD_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
|
||||||
|
-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
|
||||||
|
-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
|
||||||
|
-e "s:##{LOGLEVEL}##:verbose:g" \
|
||||||
|
-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
|
||||||
|
-e "s:##{PLUGINDIR}##:./:g" \
|
||||||
|
-e "s:##{SHLIB_PREFIX}##:lib:g" \
|
||||||
|
-e "s:##{SHLIB_SUFFIX}##:.so:g" \
|
||||||
|
-e "s:##{USE_BLKLISTSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_CBRCSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_CIMSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_DIRECTORYSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
|
||||||
|
-e "s:##{USE_DYNAMO}##:false:g" \
|
||||||
|
-e "s:##{USE_DYNSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_GUESTSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_HBRSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_HTTPNFCSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_NFCSVC}##:true:g" \
|
||||||
|
-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_OVFMGRSVC}##:true:g" \
|
||||||
|
-e "s:##{USE_PARTITIONSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_SECURESOAP}##:false:g" \
|
||||||
|
-e "s:##{USE_SNMPSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_VDISKSVC}##:false:g" \
|
||||||
|
-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
|
||||||
|
-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
|
||||||
|
-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
|
||||||
|
-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
|
||||||
|
-e "s:##{WORKINGDIR}##:./:g" \
|
||||||
|
-i "${D}/etc/vmware/hostd/config.xml" || die
|
||||||
|
|
||||||
|
sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
|
||||||
|
-i "${D}/etc/vmware/hostd/environments.xml" || die
|
||||||
|
|
||||||
|
# @@VICLIENT_URL@@=XXX
|
||||||
|
sed -e "s:@@AUTHD_PORT@@:902:g" \
|
||||||
|
-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
# install systemd unit files
|
||||||
|
systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_config() {
|
||||||
|
"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
gnome2_icon_savelist
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
fdo-mime_desktop_database_update
|
||||||
|
gnome2_icon_cache_update
|
||||||
|
|
||||||
|
ewarn "/etc/env.d was updated. Please run:"
|
||||||
|
ewarn "env-update && source /etc/profile"
|
||||||
|
ewarn ""
|
||||||
|
ewarn "Before you can use vmware workstation, you must configure a default network setup."
|
||||||
|
ewarn "You can do this by running 'emerge --config ${PN}'."
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_prerm() {
|
||||||
|
einfo "Stopping ${PN} for safe unmerge"
|
||||||
|
/etc/init.d/vmware stop
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postrm() {
|
||||||
|
fdo-mime_desktop_database_update
|
||||||
|
gnome2_icon_cache_update
|
||||||
|
}
|
@ -0,0 +1,69 @@
|
|||||||
|
libxl: fix vif rate parsing
|
||||||
|
|
||||||
|
strtok can return NULL here. We don't need to use strtok anyway, so just
|
||||||
|
use a simple strchr method.
|
||||||
|
|
||||||
|
Coverity-ID: 1055642
|
||||||
|
|
||||||
|
This is CVE-2013-4369 / XSA-68
|
||||||
|
|
||||||
|
Signed-off-by: Matthew Daley <mattjd@gmail.com>
|
||||||
|
|
||||||
|
Fix type. Add test case
|
||||||
|
|
||||||
|
Signed-off-by: Ian Campbell <Ian.campbell@citrix.com>
|
||||||
|
|
||||||
|
diff --git a/tools/libxl/check-xl-vif-parse b/tools/libxl/check-xl-vif-parse
|
||||||
|
index 0473182..02c6dba 100755
|
||||||
|
--- a/tools/libxl/check-xl-vif-parse
|
||||||
|
+++ b/tools/libxl/check-xl-vif-parse
|
||||||
|
@@ -206,4 +206,8 @@ expected </dev/null
|
||||||
|
one $e rate=4294967295GB/s@5us
|
||||||
|
one $e rate=4296MB/s@4294s
|
||||||
|
|
||||||
|
+# test include of single '@'
|
||||||
|
+expected </dev/null
|
||||||
|
+one $e rate=@
|
||||||
|
+
|
||||||
|
complete
|
||||||
|
diff --git a/tools/libxl/libxlu_vif.c b/tools/libxl/libxlu_vif.c
|
||||||
|
index 3b3de0f..0665e62 100644
|
||||||
|
--- a/tools/libxl/libxlu_vif.c
|
||||||
|
+++ b/tools/libxl/libxlu_vif.c
|
||||||
|
@@ -95,23 +95,30 @@ int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate, libxl_device_nic *nic)
|
||||||
|
uint64_t bytes_per_sec = 0;
|
||||||
|
uint64_t bytes_per_interval = 0;
|
||||||
|
uint32_t interval_usecs = 50000UL; /* Default to 50ms */
|
||||||
|
- char *ratetok, *tmprate;
|
||||||
|
+ char *p, *tmprate;
|
||||||
|
int rc = 0;
|
||||||
|
|
||||||
|
tmprate = strdup(rate);
|
||||||
|
+ if (tmprate == NULL) {
|
||||||
|
+ rc = ENOMEM;
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ p = strchr(tmprate, '@');
|
||||||
|
+ if (p != NULL)
|
||||||
|
+ *p++ = 0;
|
||||||
|
+
|
||||||
|
if (!strcmp(tmprate,"")) {
|
||||||
|
xlu__vif_err(cfg, "no rate specified", rate);
|
||||||
|
rc = EINVAL;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
- ratetok = strtok(tmprate, "@");
|
||||||
|
- rc = vif_parse_rate_bytes_per_sec(cfg, ratetok, &bytes_per_sec);
|
||||||
|
+ rc = vif_parse_rate_bytes_per_sec(cfg, tmprate, &bytes_per_sec);
|
||||||
|
if (rc) goto out;
|
||||||
|
|
||||||
|
- ratetok = strtok(NULL, "@");
|
||||||
|
- if (ratetok != NULL) {
|
||||||
|
- rc = vif_parse_rate_interval_usecs(cfg, ratetok, &interval_usecs);
|
||||||
|
+ if (p != NULL) {
|
||||||
|
+ rc = vif_parse_rate_interval_usecs(cfg, p, &interval_usecs);
|
||||||
|
if (rc) goto out;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,34 @@
|
|||||||
|
From 067c122873c67bd1d9620f8340f9c9c209135388 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matthew Daley <mattjd@gmail.com>
|
||||||
|
Date: Tue, 10 Sep 2013 23:12:45 +1200
|
||||||
|
Subject: [PATCH] tools/ocaml: fix erroneous free of cpumap in
|
||||||
|
stub_xc_vcpu_getaffinity
|
||||||
|
|
||||||
|
Not sure how it got there...
|
||||||
|
|
||||||
|
Coverity-ID: 1056196
|
||||||
|
|
||||||
|
This is CVE-2013-4370 / XSA-69
|
||||||
|
|
||||||
|
Signed-off-by: Matthew Daley <mattjd@gmail.com>
|
||||||
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||||||
|
---
|
||||||
|
tools/ocaml/libs/xc/xenctrl_stubs.c | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c
|
||||||
|
index df756ad..f5cf0ed 100644
|
||||||
|
--- a/tools/ocaml/libs/xc/xenctrl_stubs.c
|
||||||
|
+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
|
||||||
|
@@ -461,8 +461,6 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid,
|
||||||
|
|
||||||
|
retval = xc_vcpu_getaffinity(_H(xch), _D(domid),
|
||||||
|
Int_val(vcpu), c_cpumap);
|
||||||
|
- free(c_cpumap);
|
||||||
|
-
|
||||||
|
if (retval < 0) {
|
||||||
|
free(c_cpumap);
|
||||||
|
failwith_xc(_H(xch));
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
@ -0,0 +1,34 @@
|
|||||||
|
From 94db3e1cb356a0d2de1753888ceb0eb767404ec4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matthew Daley <mattjd@gmail.com>
|
||||||
|
Date: Tue, 10 Sep 2013 22:18:46 +1200
|
||||||
|
Subject: [PATCH] libxl: fix out-of-memory error handling in
|
||||||
|
libxl_list_cpupool
|
||||||
|
|
||||||
|
...otherwise it will return freed memory. All the current users of this
|
||||||
|
function check already for a NULL return, so use that.
|
||||||
|
|
||||||
|
Coverity-ID: 1056194
|
||||||
|
|
||||||
|
This is CVE-2013-4371 / XSA-70
|
||||||
|
|
||||||
|
Signed-off-by: Matthew Daley <mattjd@gmail.com>
|
||||||
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||||||
|
---
|
||||||
|
tools/libxl/libxl.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
|
||||||
|
index 0879f23..17653ef 100644
|
||||||
|
--- a/tools/libxl/libxl.c
|
||||||
|
+++ b/tools/libxl/libxl.c
|
||||||
|
@@ -651,6 +651,7 @@ libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool_out)
|
||||||
|
if (!tmp) {
|
||||||
|
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpupool info");
|
||||||
|
libxl_cpupoolinfo_list_free(ptr, i);
|
||||||
|
+ ptr = NULL;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
ptr = tmp;
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
@ -0,0 +1,74 @@
|
|||||||
|
tools: xenstored: if the reply is too big then send E2BIG error
|
||||||
|
|
||||||
|
This fixes the issue for both C and ocaml xenstored, however only the ocaml
|
||||||
|
xenstored is vulnerable in its default configuration.
|
||||||
|
|
||||||
|
Adding a new error appears to be safe, since bit libxenstore and the Linux
|
||||||
|
driver at least treat an unknown error code as EINVAL.
|
||||||
|
|
||||||
|
This is XSA-72
|
||||||
|
|
||||||
|
Original ocaml patch by Jerome Maloberti <jerome.maloberti@citrix.com>
|
||||||
|
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
|
||||||
|
Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
|
||||||
|
|
||||||
|
diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml
|
||||||
|
index 273fe4d..47695f8 100644
|
||||||
|
--- a/tools/ocaml/xenstored/connection.ml
|
||||||
|
+++ b/tools/ocaml/xenstored/connection.ml
|
||||||
|
@@ -18,6 +18,8 @@ exception End_of_file
|
||||||
|
|
||||||
|
open Stdext
|
||||||
|
|
||||||
|
+let xenstore_payload_max = 4096 (* xen/include/public/io/xs_wire.h *)
|
||||||
|
+
|
||||||
|
type watch = {
|
||||||
|
con: t;
|
||||||
|
token: string;
|
||||||
|
@@ -112,8 +114,15 @@ let restrict con domid =
|
||||||
|
let set_target con target_domid =
|
||||||
|
con.perm <- Perms.Connection.set_target (get_perm con) ~perms:[Perms.READ; Perms.WRITE] target_domid
|
||||||
|
|
||||||
|
+let is_backend_mmap con = match con.xb.Xenbus.Xb.backend with
|
||||||
|
+ | Xenbus.Xb.Xenmmap _ -> true
|
||||||
|
+ | _ -> false
|
||||||
|
+
|
||||||
|
let send_reply con tid rid ty data =
|
||||||
|
- Xenbus.Xb.queue con.xb (Xenbus.Xb.Packet.create tid rid ty data)
|
||||||
|
+ if (String.length data) > xenstore_payload_max && (is_backend_mmap con) then
|
||||||
|
+ Xenbus.Xb.queue con.xb (Xenbus.Xb.Packet.create tid rid Xenbus.Xb.Op.Error "E2BIG\000")
|
||||||
|
+ else
|
||||||
|
+ Xenbus.Xb.queue con.xb (Xenbus.Xb.Packet.create tid rid ty data)
|
||||||
|
|
||||||
|
let send_error con tid rid err = send_reply con tid rid Xenbus.Xb.Op.Error (err ^ "\000")
|
||||||
|
let send_ack con tid rid ty = send_reply con tid rid ty "OK\000"
|
||||||
|
diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
|
||||||
|
index 0f8ba64..ccfdaa3 100644
|
||||||
|
--- a/tools/xenstore/xenstored_core.c
|
||||||
|
+++ b/tools/xenstore/xenstored_core.c
|
||||||
|
@@ -629,6 +629,11 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type,
|
||||||
|
{
|
||||||
|
struct buffered_data *bdata;
|
||||||
|
|
||||||
|
+ if ( len > XENSTORE_PAYLOAD_MAX ) {
|
||||||
|
+ send_error(conn, E2BIG);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* Message is a child of the connection context for auto-cleanup. */
|
||||||
|
bdata = new_buffer(conn);
|
||||||
|
bdata->buffer = talloc_array(bdata, char, len);
|
||||||
|
diff --git a/xen/include/public/io/xs_wire.h b/xen/include/public/io/xs_wire.h
|
||||||
|
index 99d24e3..585f0c8 100644
|
||||||
|
--- a/xen/include/public/io/xs_wire.h
|
||||||
|
+++ b/xen/include/public/io/xs_wire.h
|
||||||
|
@@ -83,7 +83,8 @@ __attribute__((unused))
|
||||||
|
XSD_ERROR(EROFS),
|
||||||
|
XSD_ERROR(EBUSY),
|
||||||
|
XSD_ERROR(EAGAIN),
|
||||||
|
- XSD_ERROR(EISCONN)
|
||||||
|
+ XSD_ERROR(EISCONN),
|
||||||
|
+ XSD_ERROR(E2BIG)
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1 @@
|
|||||||
|
DIST elasticsearch-0.90.6.tar.gz 17854568 SHA256 2ff87847e993d52723b4e789db3cbba887f414b85bf04fd897032bc52fe0ad3a SHA512 8c1d3003ac1e75389d8fec78bd281f21738f18e4f2dd5518c7568173eb527c1d0cbb21344012bd4806c51027717ed8de0b2275703e876c7bd0028369507c9838 WHIRLPOOL 652b563edb80c3126cd230cd3b78f38b65af9ddfe966ab940f8d0850672156e17378ba8a75c6a0e2d9a7b154165bb47cfac1f619fd3092b40372e89125ccabd9
|
@ -0,0 +1,86 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild,v 1.1 2013/11/07 09:19:22 chainsaw Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit eutils systemd
|
||||||
|
|
||||||
|
MY_PN="${PN%-bin}"
|
||||||
|
DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
|
||||||
|
HOMEPAGE="http://www.elasticsearch.org/"
|
||||||
|
SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64"
|
||||||
|
|
||||||
|
RESTRICT="strip"
|
||||||
|
QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
|
||||||
|
|
||||||
|
RDEPEND="virtual/jre"
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
enewgroup ${MY_PN}
|
||||||
|
enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
|
||||||
|
rm lib/sigar/libsigar-ia64-linux.so
|
||||||
|
rm LICENSE.txt
|
||||||
|
|
||||||
|
mv bin/${MY_PN}.in.sh bin/${MY_PN}.in.sh.sample
|
||||||
|
for file in config/* ; do
|
||||||
|
mv ${file} ${file}.sample
|
||||||
|
done
|
||||||
|
|
||||||
|
use amd64 && {
|
||||||
|
rm lib/sigar/libsigar-x86-linux.so
|
||||||
|
}
|
||||||
|
|
||||||
|
use x86 && {
|
||||||
|
rm lib/sigar/libsigar-amd64-linux.so
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dodir /etc/${MY_PN}
|
||||||
|
insinto /etc/${MY_PN}
|
||||||
|
doins bin/${MY_PN}.in.sh.sample
|
||||||
|
doins config/*
|
||||||
|
rm bin/${MY_PN}.in.sh.sample
|
||||||
|
rm -rf config
|
||||||
|
|
||||||
|
insinto /usr/share/${MY_PN}
|
||||||
|
doins -r ./*
|
||||||
|
chmod +x "${D}"/usr/share/${MY_PN}/bin/*
|
||||||
|
|
||||||
|
keepdir /var/{lib,log}/${MY_PN}
|
||||||
|
|
||||||
|
local rcscript=elasticsearch.init
|
||||||
|
local eshome="/usr/share/${MY_PN}"
|
||||||
|
local jarfile="${MY_PN}-${PV}.jar"
|
||||||
|
local esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"
|
||||||
|
|
||||||
|
cp "${FILESDIR}/${rcscript}" "${T}" || die
|
||||||
|
sed -i \
|
||||||
|
-e "s|@ES_CLASS_PATH@|${esclasspath}|" \
|
||||||
|
"${T}/${rcscript}" \
|
||||||
|
|| die "failed to filter ${rcscript}"
|
||||||
|
|
||||||
|
newinitd "${T}/${rcscript}" "${MY_PN}"
|
||||||
|
newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
|
||||||
|
systemd_dounit "${FILESDIR}"/${PN}.service
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
elog
|
||||||
|
elog "You may create multiple instances of ${MY_PN} by"
|
||||||
|
elog "symlinking the init script ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
|
||||||
|
elog
|
||||||
|
elog "Each of the *.sample files in /etc/${MY_PN} should be copied"
|
||||||
|
elog "to the proper configuration directory:"
|
||||||
|
elog "/etc/${MY_PN} (for standard init)"
|
||||||
|
elog "/etc/${MY_PN}/instance (for symlinked init)"
|
||||||
|
elog
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
# please modify/copy
|
||||||
|
# /etc/elasticsearch/elasticsearch.in.sh.sample
|
||||||
|
# to
|
||||||
|
# /etc/elasticsearch/[instance/]elasticsearch.in.sh
|
||||||
|
#
|
||||||
|
# many variables/options are available in this file
|
||||||
|
|
||||||
|
# ES_USER="elasticsearch:elasticsearch"
|
||||||
|
## set max fds (ulimit -n X)
|
||||||
|
# ES_MAX_FD=""
|
||||||
|
|
||||||
|
## override elasticsearch.in.sh
|
||||||
|
#
|
||||||
|
# ES_CLASSPATH=""
|
||||||
|
# JAVA_OPTS=""
|
||||||
|
# ES_JAVA_OPTS=""
|
||||||
|
# ES_HEAP_SIZE=""
|
||||||
|
# ES_HEAP_NEWSIZE=""
|
||||||
|
# ES_DIRECT_SIZE=""
|
||||||
|
# ES_USE_IPV4=""
|
@ -0,0 +1,86 @@
|
|||||||
|
#!/sbin/runscript
|
||||||
|
|
||||||
|
name="ElasticSearch"
|
||||||
|
description=""
|
||||||
|
|
||||||
|
ES_USER=${ES_USER:="elasticsearch"}
|
||||||
|
ES_INSTANCE=${SVCNAME#*.}
|
||||||
|
export ES_CLASSPATH="@ES_CLASS_PATH@"
|
||||||
|
|
||||||
|
if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
|
||||||
|
PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
|
||||||
|
ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
|
||||||
|
ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
|
||||||
|
ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
|
||||||
|
else
|
||||||
|
PIDFILE="/run/elasticsearch/elasticsearch.pid"
|
||||||
|
ES_BASE_PATH="/var/lib/elasticsearch/_default"
|
||||||
|
ES_CONF_PATH="/etc/elasticsearch"
|
||||||
|
ES_LOG_PATH="/var/log/elasticsearch/_default"
|
||||||
|
fi
|
||||||
|
|
||||||
|
ES_DATA_PATH="${ES_BASE_PATH}/data"
|
||||||
|
ES_WORK_PATH="${ES_BASE_PATH}/work"
|
||||||
|
|
||||||
|
export ES_INCLUDE="${ES_CONF_PATH}/elasticsearch.in.sh"
|
||||||
|
export JAVA_OPTS
|
||||||
|
export ES_JAVA_OPTS
|
||||||
|
export ES_HEAP_SIZE
|
||||||
|
export ES_HEAP_NEWSIZE
|
||||||
|
export ES_DIRECT_SIZE
|
||||||
|
export ES_USE_IPV4
|
||||||
|
|
||||||
|
server_command="/usr/share/elasticsearch/bin/elasticsearch"
|
||||||
|
server_args=" -p ${PIDFILE} -Des.path.conf=\"${ES_CONF_PATH}\" -Des.path.data=\"${ES_DATA_PATH}\" -Des.path.work=\"${ES_WORK_PATH}\" -Des.path.logs=\"${ES_LOG_PATH}\""
|
||||||
|
|
||||||
|
depend() {
|
||||||
|
use net
|
||||||
|
}
|
||||||
|
|
||||||
|
start() {
|
||||||
|
# elasticsearch -f -Des.config=/path/to/config/file
|
||||||
|
# elasticsearch -f -Des.network.host=10.0.0.4
|
||||||
|
|
||||||
|
[ ! -f "${ES_INCLUDE}" ] && {
|
||||||
|
eerror "${ES_INCLUDE} must be copied into place"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
local conf
|
||||||
|
local conf_file
|
||||||
|
for conf in elasticsearch.yml logging.yml; do
|
||||||
|
conf_file="${ES_CONF_PATH}/${conf}"
|
||||||
|
if [ ! -f "${conf_file}" ]; then
|
||||||
|
eerror "${conf_file} must be copied into place"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
ebegin "Starting ${SVCNAME}"
|
||||||
|
|
||||||
|
if [ -n "${ES_MAX_FD}" ]; then
|
||||||
|
ulimit -n ${ES_MAX_FD}
|
||||||
|
einfo "Max open filedescriptors : ${ES_MAX_FD}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
|
||||||
|
checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
|
||||||
|
checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
|
||||||
|
checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
|
||||||
|
checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
|
||||||
|
|
||||||
|
start-stop-daemon --start \
|
||||||
|
--chdir "${ES_BASE_PATH}" \
|
||||||
|
--user="${ES_USER}" \
|
||||||
|
--pidfile="${PIDFILE}" \
|
||||||
|
--exec ${server_command} -- ${server_args}
|
||||||
|
eend $?
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
ebegin "Stopping ${SVCNAME}"
|
||||||
|
start-stop-daemon --stop \
|
||||||
|
--pidfile=${PIDFILE}
|
||||||
|
eend $?
|
||||||
|
}
|
@ -0,0 +1,11 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=ElasticSearch
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
User=elasticsearch
|
||||||
|
Environment=ES_INCLUDE=/etc/elasticsearch/elasticsearch.in.sh
|
||||||
|
ExecStart=/usr/share/elasticsearch/bin/elasticsearch -f -Des.path.conf=/etc/elasticsearch
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<maintainer>
|
||||||
|
<email>chainsaw@gentoo.org</email>
|
||||||
|
<name>Tony Vroon</name>
|
||||||
|
</maintainer>
|
||||||
|
</pkgmetadata>
|
@ -1 +1 @@
|
|||||||
DIST jvmstat-3_0.zip 153629 RMD160 cde842c4365be658fbcd06eb840bad268719e5e6 SHA1 e537c53fa9629742a0569643fd45e489a93b6a2f SHA256 3d3fad22aa65f356f6ecca050216f814fcdf20c0611a1f689969991d7a1ccb79
|
DIST jvmstat-3_0.zip 153629 SHA256 3d3fad22aa65f356f6ecca050216f814fcdf20c0611a1f689969991d7a1ccb79
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
DIST Maude-2.3.tar.gz 1441239 SHA256 67e88d8440fafc67e1121139de496c70844279291e37ba9bee369d113a92fddb SHA512 ceab62c4faa87760af0cb6f7c5a3e024b48b92e3a7071afa0f7838a2885ada6de94d5c055c78278cbb86887e516b761b0852dde0c2c239a83d609069b8d3e00c WHIRLPOOL c7834fc1d5e28ba474e7995db4dea4e15ea78790bed11097a1e362e41e3b36055bf2a65befca553bc2d1668fa06b6ab36aed7ad6559ee96660ba79d30aa4d84d
|
|
||||||
DIST Maude-2.5.tar.gz 1574038 SHA256 dc5d4a6426b48a2b9810335a69a14064843f457f89cf9fd941ff1411fdb27b99 SHA512 e2463917ab4568d57dbcb45554dc22d1964d447b0fd53b2f2a759f5bec1880910c4dd1f6c25768d776bbbc697deb4c8fe61aecdd74f0f24b13bd50d0833a6a9c WHIRLPOOL e1dcb63c7267dc683bfa287ff9e9de2ebea91be756cd08a7314c04fecd3a1f471280a5be261e2cd98437ed13bbe1fbe64030789dfcf1f8bc2132f008a982ea61
|
|
||||||
DIST Maude-2.6.tar.gz 1600026 SHA256 a5ba79bf3d30565c874e80b3531b51a7e835b600e86cac82508a6eb9e15f4aa0 SHA512 3931a540f72acdf2de532eff7b55ba4c9496b38a4b036f4e37d16b860f87728d6df5b9e377fd3489e55f7c369bca5eb9cded9b7a75032c410eff9a6e85da3fab WHIRLPOOL 9bc2011cb167ac5a451fc043fcaccbbfbfb5cb71bbb804021c7286a6f315d8c6778b6a385c5c6e5566db18051e8c817f93f099f39e3077bd414b83cc8e78be9b
|
DIST Maude-2.6.tar.gz 1600026 SHA256 a5ba79bf3d30565c874e80b3531b51a7e835b600e86cac82508a6eb9e15f4aa0 SHA512 3931a540f72acdf2de532eff7b55ba4c9496b38a4b036f4e37d16b860f87728d6df5b9e377fd3489e55f7c369bca5eb9cded9b7a75032c410eff9a6e85da3fab WHIRLPOOL 9bc2011cb167ac5a451fc043fcaccbbfbfb5cb71bbb804021c7286a6f315d8c6778b6a385c5c6e5566db18051e8c817f93f099f39e3077bd414b83cc8e78be9b
|
||||||
DIST maude-2.3.0-extras.tar.bz2 2871587 SHA256 0dd0d71cb5a1463c9888303c1ed74c6d373d6aa60a9a45660e92f3308730a54d SHA512 c0bc49a6e13c91c99c5884a7627c368188ee5e245ae0aec7ef1105903e3c935341439139bf144a666a0f6ae709933db70bf72dc502344c4e6e299d47be236b5b WHIRLPOOL 2fa267156a375496bb846befbe47acbe824f2961a29beb3d9bddc8969ae0c5215f66048b6286c045a03a11edde35c10c2da060efebf840c3736659660b7f92a0
|
|
||||||
DIST maude-2.5.0-extras.tar.bz2 3202095 SHA256 4eaa9c7ddea3742aef90e5de16aec193e2f2821d9d3b28759b889d219add54c4 SHA512 363b27d513c8a0ab669254abdb513df6c08a7c1dc86966c8210aa9e7031e1ee58d8c269a5ae3669fc3a4e11d1a599fb2aade78700a7a977ea11e375d07f2bdc4 WHIRLPOOL 888f5db57b9d09769b4f61b918a4bb526f67543a893aee89857d8c1a8e572aa57c099daa31c83cfd81eca72aa9af225cf0d86b22e87697b7f16892d357fc4153
|
|
||||||
DIST maude-2.6-extras.tar.xz 3157004 SHA256 64cd72026c345ff1c1edeca64f9a9fce8067e6df5eccdaeee4bfe7a0f07d3102 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd WHIRLPOOL 7a5ea0bf49132ecb3b88f26432c8aedb7ce2f9632f4e9cbb5fa08ab36b65c9a165d58e4a880e8ea97eff91280e28fb01e224a61539b73b898f3e9b4cba34ce44
|
DIST maude-2.6-extras.tar.xz 3157004 SHA256 64cd72026c345ff1c1edeca64f9a9fce8067e6df5eccdaeee4bfe7a0f07d3102 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd WHIRLPOOL 7a5ea0bf49132ecb3b88f26432c8aedb7ce2f9632f4e9cbb5fa08ab36b65c9a165d58e4a880e8ea97eff91280e28fb01e224a61539b73b898f3e9b4cba34ce44
|
||||||
|
@ -1,260 +0,0 @@
|
|||||||
diff -ru maude-2.1.1/src/Core/argVec.hh maude-2.1.1-new/src/Core/argVec.hh
|
|
||||||
--- maude-2.1.1/src/Core/argVec.hh 2003-06-01 06:50:02.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/Core/argVec.hh 2004-10-09 01:12:28.000000000 +0200
|
|
||||||
@@ -41,6 +41,7 @@
|
|
||||||
//
|
|
||||||
#ifndef _argVec_hh_
|
|
||||||
#define _argVec_hh_
|
|
||||||
+#include <dagNode.hh>
|
|
||||||
|
|
||||||
template<class T>
|
|
||||||
class ArgVec
|
|
||||||
diff -ru maude-2.1.1/src/Core/checkedArgVecConstIterator.hh maude-2.1.1-new/src/Core/checkedArgVecConstIterator.hh
|
|
||||||
--- maude-2.1.1/src/Core/checkedArgVecConstIterator.hh 2003-06-01 06:50:02.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/Core/checkedArgVecConstIterator.hh 2004-10-09 01:10:37.000000000 +0200
|
|
||||||
@@ -205,7 +205,7 @@
|
|
||||||
inline typename ArgVec<T>::const_iterator
|
|
||||||
ArgVec<T>::const_iterator::operator++(int)
|
|
||||||
{
|
|
||||||
- ArgVec::const_iterator tmp(*this);
|
|
||||||
+ typename ArgVec::const_iterator tmp(*this);
|
|
||||||
operator++();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -225,7 +225,7 @@
|
|
||||||
inline typename ArgVec<T>::const_iterator
|
|
||||||
ArgVec<T>::const_iterator::operator--(int)
|
|
||||||
{
|
|
||||||
- ArgVec::const_iterator tmp(*this);
|
|
||||||
+ typename ArgVec::const_iterator tmp(*this);
|
|
||||||
operator--();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -245,7 +245,7 @@
|
|
||||||
inline typename ArgVec<T>::const_iterator
|
|
||||||
ArgVec<T>::const_iterator::operator+(difference_type delta) const
|
|
||||||
{
|
|
||||||
- ArgVec::const_iterator tmp(*this);
|
|
||||||
+ typename ArgVec::const_iterator tmp(*this);
|
|
||||||
return tmp += delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -264,7 +264,7 @@
|
|
||||||
inline typename ArgVec<T>::const_iterator
|
|
||||||
ArgVec<T>::const_iterator::operator-(difference_type delta) const
|
|
||||||
{
|
|
||||||
- ArgVec::const_iterator tmp(*this);
|
|
||||||
+ typename ArgVec::const_iterator tmp(*this);
|
|
||||||
return tmp -= delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -ru maude-2.1.1/src/Core/checkedArgVecIterator.hh maude-2.1.1-new/src/Core/checkedArgVecIterator.hh
|
|
||||||
--- maude-2.1.1/src/Core/checkedArgVecIterator.hh 2003-06-01 06:50:02.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/Core/checkedArgVecIterator.hh 2004-10-09 01:10:37.000000000 +0200
|
|
||||||
@@ -194,7 +194,7 @@
|
|
||||||
inline typename ArgVec<T>::iterator
|
|
||||||
ArgVec<T>::iterator::operator++(int)
|
|
||||||
{
|
|
||||||
- ArgVec::iterator tmp(*this);
|
|
||||||
+ typename ArgVec::iterator tmp(*this);
|
|
||||||
operator++();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -214,7 +214,7 @@
|
|
||||||
inline typename ArgVec<T>::iterator
|
|
||||||
ArgVec<T>::iterator::operator--(int)
|
|
||||||
{
|
|
||||||
- ArgVec::iterator tmp(*this);
|
|
||||||
+ typename ArgVec::iterator tmp(*this);
|
|
||||||
operator--();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -234,7 +234,7 @@
|
|
||||||
inline typename ArgVec<T>::iterator
|
|
||||||
ArgVec<T>::iterator::operator+(difference_type delta) const
|
|
||||||
{
|
|
||||||
- ArgVec::iterator tmp(*this);
|
|
||||||
+ typename ArgVec::iterator tmp(*this);
|
|
||||||
return tmp += delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -253,7 +253,7 @@
|
|
||||||
inline typename ArgVec<T>::iterator
|
|
||||||
ArgVec<T>::iterator::operator-(difference_type delta) const
|
|
||||||
{
|
|
||||||
- ArgVec::iterator tmp(*this);
|
|
||||||
+ typename ArgVec::iterator tmp(*this);
|
|
||||||
return tmp -= delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -ru maude-2.1.1/src/FreeTheory/freeDagNode.hh maude-2.1.1-new/src/FreeTheory/freeDagNode.hh
|
|
||||||
--- maude-2.1.1/src/FreeTheory/freeDagNode.hh 2003-06-01 06:49:16.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/FreeTheory/freeDagNode.hh 2004-10-09 01:11:44.000000000 +0200
|
|
||||||
@@ -87,7 +87,7 @@
|
|
||||||
if (nrArgs > nrWords)
|
|
||||||
{
|
|
||||||
setCallDtor(); // need our dtor called when garbage collected so we can free arg array
|
|
||||||
- external = new (DagNode*)[nrArgs];
|
|
||||||
+ external = new DagNode*[nrArgs];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -ru maude-2.1.1/src/Interface/dagNode.hh maude-2.1.1-new/src/Interface/dagNode.hh
|
|
||||||
--- maude-2.1.1/src/Interface/dagNode.hh 2004-02-06 02:13:02.000000000 +0100
|
|
||||||
+++ maude-2.1.1-new/src/Interface/dagNode.hh 2004-10-09 01:13:10.000000000 +0200
|
|
||||||
@@ -25,6 +25,7 @@
|
|
||||||
//
|
|
||||||
#ifndef _dagNode_hh_
|
|
||||||
#define _dagNode_hh_
|
|
||||||
+#include "symbol.hh"
|
|
||||||
#include "redexPosition.hh"
|
|
||||||
|
|
||||||
class DagNode
|
|
||||||
diff -ru maude-2.1.1/src/Mixfix/lexer.cc maude-2.1.1-new/src/Mixfix/lexer.cc
|
|
||||||
--- maude-2.1.1/src/Mixfix/lexer.cc 2004-05-26 04:04:40.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/Mixfix/lexer.cc 2004-10-09 01:26:59.000000000 +0200
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
#define YY_FLEX_MINOR_VERSION 5
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
|
|
||||||
|
|
||||||
/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
|
|
||||||
@@ -22,7 +23,6 @@
|
|
||||||
#ifdef __cplusplus
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
-#include <unistd.h>
|
|
||||||
|
|
||||||
/* Use prototypes in function declarations. */
|
|
||||||
#define YY_USE_PROTOS
|
|
||||||
@@ -2000,7 +2000,7 @@
|
|
||||||
YY_DECL
|
|
||||||
{
|
|
||||||
register yy_state_type yy_current_state;
|
|
||||||
- register char *yy_cp, *yy_bp;
|
|
||||||
+ register char *yy_cp = NULL, *yy_bp = NULL;
|
|
||||||
register int yy_act;
|
|
||||||
|
|
||||||
#line 83 "../../../src/Mixfix/lexer.ll"
|
|
||||||
@@ -3367,6 +3367,7 @@
|
|
||||||
#endif /* ifndef YY_NO_UNPUT */
|
|
||||||
|
|
||||||
|
|
||||||
+#ifndef YY_NO_INPUT
|
|
||||||
#ifdef __cplusplus
|
|
||||||
static int yyinput()
|
|
||||||
#else
|
|
||||||
@@ -3438,7 +3439,7 @@
|
|
||||||
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+#endif /* YY_NO_INPUT */
|
|
||||||
|
|
||||||
#ifdef YY_USE_PROTOS
|
|
||||||
void yyrestart( FILE *input_file )
|
|
||||||
@@ -3549,11 +3550,6 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
-#ifndef YY_ALWAYS_INTERACTIVE
|
|
||||||
-#ifndef YY_NEVER_INTERACTIVE
|
|
||||||
-extern int isatty YY_PROTO(( int ));
|
|
||||||
-#endif
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
#ifdef YY_USE_PROTOS
|
|
||||||
void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
|
|
||||||
|
|
||||||
diff -ru maude-2.1.1/src/Utility/checkedConstIterator.hh maude-2.1.1-new/src/Utility/checkedConstIterator.hh
|
|
||||||
--- maude-2.1.1/src/Utility/checkedConstIterator.hh 2003-06-01 06:29:22.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/Utility/checkedConstIterator.hh 2004-10-09 01:08:34.000000000 +0200
|
|
||||||
@@ -209,7 +209,7 @@
|
|
||||||
inline typename Vector<T>::const_iterator
|
|
||||||
Vector<T>::const_iterator::operator++(int)
|
|
||||||
{
|
|
||||||
- Vector::const_iterator tmp(*this);
|
|
||||||
+ typename Vector::const_iterator tmp(*this);
|
|
||||||
operator++();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -229,7 +229,7 @@
|
|
||||||
inline typename Vector<T>::const_iterator
|
|
||||||
Vector<T>::const_iterator::operator--(int)
|
|
||||||
{
|
|
||||||
- Vector::const_iterator tmp(*this);
|
|
||||||
+ typename Vector::const_iterator tmp(*this);
|
|
||||||
operator--();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -249,7 +249,7 @@
|
|
||||||
inline typename Vector<T>::const_iterator
|
|
||||||
Vector<T>::const_iterator::operator+(difference_type delta) const
|
|
||||||
{
|
|
||||||
- Vector::const_iterator tmp(*this);
|
|
||||||
+ typename Vector::const_iterator tmp(*this);
|
|
||||||
return tmp += delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -268,7 +268,7 @@
|
|
||||||
inline typename Vector<T>::const_iterator
|
|
||||||
Vector<T>::const_iterator::operator-(difference_type delta) const
|
|
||||||
{
|
|
||||||
- Vector::const_iterator tmp(*this);
|
|
||||||
+ typename Vector::const_iterator tmp(*this);
|
|
||||||
return tmp -= delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -ru maude-2.1.1/src/Utility/checkedIterator.hh maude-2.1.1-new/src/Utility/checkedIterator.hh
|
|
||||||
--- maude-2.1.1/src/Utility/checkedIterator.hh 2003-06-01 06:29:22.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/Utility/checkedIterator.hh 2004-10-09 01:08:34.000000000 +0200
|
|
||||||
@@ -198,7 +198,7 @@
|
|
||||||
inline typename Vector<T>::iterator
|
|
||||||
Vector<T>::iterator::operator++(int)
|
|
||||||
{
|
|
||||||
- Vector::iterator tmp(*this);
|
|
||||||
+ typename Vector::iterator tmp(*this);
|
|
||||||
operator++();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -218,7 +218,7 @@
|
|
||||||
inline typename Vector<T>::iterator
|
|
||||||
Vector<T>::iterator::operator--(int)
|
|
||||||
{
|
|
||||||
- Vector::iterator tmp(*this);
|
|
||||||
+ typename Vector::iterator tmp(*this);
|
|
||||||
operator--();
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
@@ -238,7 +238,7 @@
|
|
||||||
inline typename Vector<T>::iterator
|
|
||||||
Vector<T>::iterator::operator+(difference_type delta) const
|
|
||||||
{
|
|
||||||
- Vector::iterator tmp(*this);
|
|
||||||
+ typename Vector::iterator tmp(*this);
|
|
||||||
return tmp += delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -257,7 +257,7 @@
|
|
||||||
inline typename Vector<T>::iterator
|
|
||||||
Vector<T>::iterator::operator-(difference_type delta) const
|
|
||||||
{
|
|
||||||
- Vector::iterator tmp(*this);
|
|
||||||
+ typename Vector::iterator tmp(*this);
|
|
||||||
return tmp -= delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -ru maude-2.1.1/src/Utility/indexedSet.hh maude-2.1.1-new/src/Utility/indexedSet.hh
|
|
||||||
--- maude-2.1.1/src/Utility/indexedSet.hh 2003-06-01 06:29:22.000000000 +0200
|
|
||||||
+++ maude-2.1.1-new/src/Utility/indexedSet.hh 2004-10-09 01:08:34.000000000 +0200
|
|
||||||
@@ -79,7 +79,7 @@
|
|
||||||
IndexedSet<T>::insert(const T& element)
|
|
||||||
{
|
|
||||||
pair<typename EltMap::iterator, bool> p =
|
|
||||||
- eltMap.insert(EltMap::value_type(element, indexMap.size()));
|
|
||||||
+ eltMap.insert(typename EltMap::value_type(element, indexMap.size()));
|
|
||||||
if (p.second)
|
|
||||||
indexMap.push_back(p.first);
|
|
||||||
return p.first->second;
|
|
@ -1 +0,0 @@
|
|||||||
MAUDE_LIB=/usr/share/maude
|
|
@ -1,107 +0,0 @@
|
|||||||
--- Maude-2.3/src/BuiltIn/stringOpSymbol.cc 2003-11-10 18:33:00.000000000 -0600
|
|
||||||
+++ Maude-2.4/src/BuiltIn/stringOpSymbol.cc 2008-09-11 19:03:36.000000000 -0600
|
|
||||||
@@ -220,7 +220,9 @@ StringOpSymbol::eqRewrite(DagNode* subje
|
|
||||||
case CODE('f', 'l'):
|
|
||||||
{
|
|
||||||
bool error;
|
|
||||||
- //double fl = stringToDouble(left.c_str(), error);
|
|
||||||
+#ifdef ROPE_C_STR_BROKEN
|
|
||||||
+ //
|
|
||||||
+ // This kudge doesn't seem to be need nowadays, but copy() doesn't work.
|
|
||||||
//
|
|
||||||
// This messing about is needed because Rope::c_str()
|
|
||||||
// fails in libstdc++-v3
|
|
||||||
@@ -231,7 +233,9 @@ StringOpSymbol::eqRewrite(DagNode* subje
|
|
||||||
t[len] = '\0';
|
|
||||||
double fl = stringToDouble(t, error);
|
|
||||||
delete [] t;
|
|
||||||
- //
|
|
||||||
+#else
|
|
||||||
+ double fl = stringToDouble(left.c_str(), error);
|
|
||||||
+#endif
|
|
||||||
if (error)
|
|
||||||
goto fail;
|
|
||||||
return floatSymbol->rewriteToFloat(subject, context, fl);
|
|
||||||
@@ -282,6 +286,7 @@ StringOpSymbol::eqRewrite(DagNode* subje
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
CantHappen("bad string op");
|
|
||||||
+ r = false; // avoid compiler warning
|
|
||||||
}
|
|
||||||
Assert(trueTerm.getTerm() != 0 && falseTerm.getTerm() != 0,
|
|
||||||
"null true/false for relational op");
|
|
||||||
@@ -358,6 +363,7 @@ StringOpSymbol::eqRewrite(DagNode* subje
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
CantHappen("bad string op");
|
|
||||||
+ r = 0; // avoid compiler warning
|
|
||||||
}
|
|
||||||
Assert(notFoundTerm.getTerm() != 0, "null notFound for find op");
|
|
||||||
if (r == NONE)
|
|
||||||
@@ -591,6 +597,13 @@ StringOpSymbol::ropeToNumber(const crope
|
|
||||||
if (!isalnum(subject[j]))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
+ //
|
|
||||||
+ // We have detected a fraction form.
|
|
||||||
+ //
|
|
||||||
+#ifdef ROPE_C_STR_BROKEN
|
|
||||||
+ //
|
|
||||||
+ // This kudge doesn't seem to be need nowadays, but copy() doesn't work.
|
|
||||||
+ //
|
|
||||||
char* t = new char[len]; // longer than needed but who cares
|
|
||||||
int dLen = len - (i + 1);
|
|
||||||
subject.copy(i + 1, dLen, t);
|
|
||||||
@@ -609,20 +622,34 @@ StringOpSymbol::ropeToNumber(const crope
|
|
||||||
}
|
|
||||||
delete [] t;
|
|
||||||
return true;
|
|
||||||
+#else
|
|
||||||
+ return mpz_set_str(denominator.get_mpz_t(), subject.substr(i + 1).c_str(), base) == 0 &&
|
|
||||||
+ mpz_set_str(numerator.get_mpz_t(), subject.substr(0,i).c_str(), base) == 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ //
|
|
||||||
+ // We have a regular integer form.
|
|
||||||
+ //
|
|
||||||
+ denominator = 0;
|
|
||||||
+#ifdef ROPE_C_STR_BROKEN
|
|
||||||
+ //
|
|
||||||
+ // This kudge doesn't seem to be need nowadays, but copy() doesn't work.
|
|
||||||
+ //
|
|
||||||
char* t = new char[len + 1];
|
|
||||||
subject.copy(t);
|
|
||||||
t[len] = '\0';
|
|
||||||
if (mpz_set_str(numerator.get_mpz_t(), t, base) == 0)
|
|
||||||
{
|
|
||||||
delete [] t;
|
|
||||||
- denominator = 0;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
delete [] t;
|
|
||||||
- return false;
|
|
||||||
+ return false;
|
|
||||||
+#else
|
|
||||||
+ return mpz_set_str(numerator.get_mpz_t(), subject.c_str(), base) == 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
--- Maude-2.3/src/Utility/macros.hh 2007-01-11 21:13:21.000000000 -0600
|
|
||||||
+++ Maude-2.4/src/Utility/macros.hh 2008-09-04 13:52:55.000000000 -0600
|
|
||||||
@@ -50,10 +50,10 @@
|
|
||||||
#if HAVE_CTYPE_H
|
|
||||||
#include <ctype.h>
|
|
||||||
#endif
|
|
||||||
-#if HAVE_STRINGS_H
|
|
||||||
-#include <strings.h>
|
|
||||||
-#elif HAVE_STRING_H
|
|
||||||
+#if HAVE_STRING_H
|
|
||||||
#include <string.h>
|
|
||||||
+#elif HAVE_STRINGS_H
|
|
||||||
+#include <strings.h>
|
|
||||||
#endif
|
|
||||||
#if HAVE_UNISTD_H
|
|
||||||
#include <unistd.h> // needed by solaris
|
|
@ -0,0 +1,25 @@
|
|||||||
|
Get maude to compile on amd64 with g++ 4.7
|
||||||
|
bicatali@gentoo.org nov 2013
|
||||||
|
|
||||||
|
--- Maude-2.6.orig/src/Mixfix/lexerAux.cc 2013-11-06 09:41:00.821049550 -0800
|
||||||
|
+++ Maude-2.6/src/Mixfix/lexerAux.cc 2013-11-06 09:41:33.174247429 -0800
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
bool fakeNewlineStack[MAX_IN_DEPTH];
|
||||||
|
|
||||||
|
void
|
||||||
|
-getInput(char* buf, int& result, int max_size)
|
||||||
|
+getInput(char* buf, size_t& result, int max_size)
|
||||||
|
{
|
||||||
|
result = YY_NULL;
|
||||||
|
if (UserLevelRewritingContext::interrupted())
|
||||||
|
--- Maude-2.6.orig/src/Mixfix/lexerAux.hh 2013-11-06 09:41:00.821049550 -0800
|
||||||
|
+++ Maude-2.6/src/Mixfix/lexerAux.hh 2013-11-06 09:41:23.466187406 -0800
|
||||||
|
@@ -27,7 +27,7 @@
|
||||||
|
//extern int inStackPtr;
|
||||||
|
//extern YY_BUFFER_STATE inStack[];
|
||||||
|
|
||||||
|
-void getInput(char* buf, int& result, int max_size);
|
||||||
|
+void getInput(char* buf, size_t& result, int max_size);
|
||||||
|
void lexerIdMode();
|
||||||
|
void lexerTokenTreeMode(int terminatingTokens);
|
||||||
|
void lexerCmdMode();
|
@ -0,0 +1,37 @@
|
|||||||
|
Have maude search in datadir for its files.
|
||||||
|
--- a/src/Main/main.cc
|
||||||
|
+++ b/src/Main/main.cc
|
||||||
|
@@ -263,6 +263,11 @@
|
||||||
|
{
|
||||||
|
if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK))
|
||||||
|
return true;
|
||||||
|
+ if (directoryManager.checkAccess(DATADIR, fileName, R_OK))
|
||||||
|
+ {
|
||||||
|
+ directory = DATADIR;
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
if (!(executableDirectory.empty()) &&
|
||||||
|
directoryManager.checkAccess(executableDirectory, fileName, R_OK))
|
||||||
|
{
|
||||||
|
--- a/src/Mixfix/global.cc
|
||||||
|
+++ b/src/Mixfix/global.cc
|
||||||
|
@@ -83,6 +83,9 @@
|
||||||
|
return true;
|
||||||
|
if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK, ext))
|
||||||
|
return true;
|
||||||
|
+ directory = DATADIR;
|
||||||
|
+ if (directoryManager.checkAccess(directory, fileName, R_OK, ext))
|
||||||
|
+ return true;
|
||||||
|
if (!(executableDirectory.empty()) &&
|
||||||
|
directoryManager.checkAccess(executableDirectory, fileName, R_OK, ext))
|
||||||
|
{
|
||||||
|
--- a/src/Mixfix/global.hh
|
||||||
|
+++ b/src/Mixfix/global.hh
|
||||||
|
@@ -36,6 +36,7 @@
|
||||||
|
|
||||||
|
#define PRELUDE_NAME "prelude.maude"
|
||||||
|
#define MAUDE_LIB "MAUDE_LIB"
|
||||||
|
+#define DATADIR "/usr/share/maude"
|
||||||
|
|
||||||
|
bool
|
||||||
|
findPrelude(string& directory, string& fileName);
|
@ -1,67 +0,0 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.3.0.ebuild,v 1.4 2010/06/23 14:24:31 jlec Exp $
|
|
||||||
|
|
||||||
inherit toolchain-funcs eutils versionator
|
|
||||||
|
|
||||||
MY_PN="${PN/m/M}"
|
|
||||||
MY_PV=$(get_version_component_range 1-2)
|
|
||||||
|
|
||||||
DESCRIPTION="Maude - A high-level specification language"
|
|
||||||
HOMEPAGE="http://maude.cs.uiuc.edu/"
|
|
||||||
SRC_URI="http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
|
|
||||||
mirror://gentoo/${P}-extras.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~ppc ~x86"
|
|
||||||
|
|
||||||
IUSE="doc"
|
|
||||||
|
|
||||||
RDEPEND="sci-libs/buddy
|
|
||||||
dev-libs/libtecla
|
|
||||||
>=dev-libs/gmp-4.1.3"
|
|
||||||
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-devel/bison
|
|
||||||
sys-devel/flex"
|
|
||||||
|
|
||||||
S="${WORKDIR}"/${MY_PN}-${MY_PV}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
unpack ${A}
|
|
||||||
cd "${S}"
|
|
||||||
|
|
||||||
epatch "${FILESDIR}"/${P}-gcc43.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
econf || die "econf failed"
|
|
||||||
emake -j1 || die "emake failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
make install DESTDIR="${D}" || die "make install failed"
|
|
||||||
dodoc AUTHORS ChangeLog NEWS README
|
|
||||||
|
|
||||||
insinto /usr/share/${PN}
|
|
||||||
doins -r src/Main/*.maude \
|
|
||||||
|| die "failed to install data files"
|
|
||||||
|
|
||||||
# Sets the full maude library path.
|
|
||||||
doenvd "${FILESDIR}"/23maude
|
|
||||||
|
|
||||||
# install full maude
|
|
||||||
cd "${WORKDIR}"/${P}-extras
|
|
||||||
doins full-maude.maude
|
|
||||||
|
|
||||||
# install docs and examples
|
|
||||||
if use doc; then
|
|
||||||
insinto /usr/share/doc/${P}
|
|
||||||
doins -r pdfs/* || die "failed to install pdf files"
|
|
||||||
|
|
||||||
insinto /usr/share/${PN}/
|
|
||||||
doins -r manual-examples primer-examples \
|
|
||||||
|| die "failed to install example files"
|
|
||||||
fi
|
|
||||||
}
|
|
@ -1,67 +0,0 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.5.0.ebuild,v 1.2 2010/06/23 14:28:14 jlec Exp $
|
|
||||||
|
|
||||||
EAPI="3"
|
|
||||||
|
|
||||||
inherit autotools eutils toolchain-funcs versionator
|
|
||||||
|
|
||||||
MY_PN="${PN/m/M}"
|
|
||||||
MY_PV=$(get_version_component_range 1-2)
|
|
||||||
|
|
||||||
DESCRIPTION="Maude - A high-level specification language"
|
|
||||||
HOMEPAGE="http://maude.cs.uiuc.edu/"
|
|
||||||
SRC_URI="http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
|
|
||||||
mirror://gentoo/${P}-extras.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~ppc ~x86"
|
|
||||||
|
|
||||||
IUSE="doc"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/gmp-4.1.3
|
|
||||||
dev-libs/libsigsegv
|
|
||||||
dev-libs/libtecla
|
|
||||||
sci-libs/buddy"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-devel/bison
|
|
||||||
sys-devel/flex"
|
|
||||||
|
|
||||||
S="${WORKDIR}"/${MY_PN}-${MY_PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${P}-prll.patch
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf --datadir="${EPREFIX}/usr/share/${PN}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
make install DESTDIR="${D}" || die "make install failed"
|
|
||||||
dodoc AUTHORS ChangeLog NEWS README
|
|
||||||
|
|
||||||
insinto /usr/share/${PN}
|
|
||||||
doins -r src/Main/*.maude \
|
|
||||||
|| die "failed to install data files"
|
|
||||||
|
|
||||||
# Sets the full maude library path.
|
|
||||||
doenvd "${FILESDIR}"/23maude || die
|
|
||||||
|
|
||||||
# install full maude
|
|
||||||
cd "${WORKDIR}"/${P}-extras
|
|
||||||
doins full-maude.maude || die
|
|
||||||
|
|
||||||
# install docs and examples
|
|
||||||
if use doc; then
|
|
||||||
insinto /usr/share/doc/${P}
|
|
||||||
doins -r pdfs/* || die "failed to install pdf files"
|
|
||||||
|
|
||||||
insinto /usr/share/${PN}/
|
|
||||||
doins -r manual-examples primer-examples \
|
|
||||||
|| die "failed to install example files"
|
|
||||||
fi
|
|
||||||
}
|
|
@ -0,0 +1,64 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.6-r1.ebuild,v 1.1 2013/11/06 18:01:37 bicatali Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
AUTOTOOLS_AUTORECONF=1
|
||||||
|
AUTOTOOLS_IN_SOURCE_BUILD=1
|
||||||
|
|
||||||
|
inherit autotools-utils versionator
|
||||||
|
|
||||||
|
MYP="${PN/m/M}-$(get_version_component_range 1-2)"
|
||||||
|
|
||||||
|
DESCRIPTION="High-level specification language for equational and logic programming"
|
||||||
|
HOMEPAGE="http://maude.cs.uiuc.edu/"
|
||||||
|
SRC_URI="
|
||||||
|
http://maude.cs.uiuc.edu/download/current/${MYP}.tar.gz
|
||||||
|
http://dev.gentoo.org/~jlec/distfiles/${P}-extras.tar.xz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
|
||||||
|
IUSE="doc examples"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
>=dev-libs/gmp-4.1.3
|
||||||
|
dev-libs/libsigsegv
|
||||||
|
dev-libs/libtecla
|
||||||
|
sci-libs/buddy"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
sys-devel/bison
|
||||||
|
sys-devel/flex"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${MYP}"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-2.5.0-prll.patch
|
||||||
|
"${FILESDIR}"/${PN}-2.6-search-datadir.patch
|
||||||
|
"${FILESDIR}"/${PN}-2.6-gcc47.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
local myeconfargs=(
|
||||||
|
--datadir="${EPREFIX}/usr/share/${PN}"
|
||||||
|
)
|
||||||
|
sed -i -e "s:/usr:${EPREFIX}/usr:g" src/Mixfix/global.hh || die
|
||||||
|
autotools-utils_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
autotools-utils_src_install
|
||||||
|
|
||||||
|
# install data and full maude
|
||||||
|
insinto /usr/share/${PN}
|
||||||
|
doins -r src/Main/*.maude
|
||||||
|
doins "${WORKDIR}"/${P}-extras/full-maude.maude
|
||||||
|
|
||||||
|
# install docs and examples
|
||||||
|
use doc && doins -r "${WORKDIR}"/${P}-extras/pdfs/*
|
||||||
|
if use examples; then
|
||||||
|
insinto /usr/share/doc/${PF}/examples
|
||||||
|
doins -r "${WORKDIR}"/${P}-extras/{manual,primer}-examples
|
||||||
|
fi
|
||||||
|
}
|
@ -1,70 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.6.ebuild,v 1.1 2012/01/26 17:51:48 jlec Exp $
|
|
||||||
|
|
||||||
EAPI=4
|
|
||||||
|
|
||||||
AUTOTOOLS_AUTORECONF=true
|
|
||||||
|
|
||||||
inherit autotools-utils eutils toolchain-funcs versionator
|
|
||||||
|
|
||||||
MY_PN="${PN/m/M}"
|
|
||||||
MY_PV=$(get_version_component_range 1-2)
|
|
||||||
|
|
||||||
DESCRIPTION="Maude - A high-level specification language"
|
|
||||||
HOMEPAGE="http://maude.cs.uiuc.edu/"
|
|
||||||
SRC_URI="
|
|
||||||
http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
|
|
||||||
http://dev.gentoo.org/~jlec/distfiles/${P}-extras.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~ppc ~x86"
|
|
||||||
IUSE="doc"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/gmp-4.1.3
|
|
||||||
dev-libs/libsigsegv
|
|
||||||
dev-libs/libtecla
|
|
||||||
sci-libs/buddy"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-devel/bison
|
|
||||||
sys-devel/flex"
|
|
||||||
|
|
||||||
S="${WORKDIR}"/${MY_PN}-${MY_PV}
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-2.5.0-prll.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
--datadir="${EPREFIX}/usr/share/${PN}"
|
|
||||||
)
|
|
||||||
autotools-utils_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
autotools-utils_src_install
|
|
||||||
|
|
||||||
insinto /usr/share/${PN}
|
|
||||||
doins -r src/Main/*.maude \
|
|
||||||
|| die "failed to install data files"
|
|
||||||
|
|
||||||
# Sets the full maude library path.
|
|
||||||
doenvd "${FILESDIR}"/23maude || die
|
|
||||||
|
|
||||||
# install full maude
|
|
||||||
cd "${WORKDIR}"/${P}-extras
|
|
||||||
doins full-maude.maude || die
|
|
||||||
|
|
||||||
# install docs and examples
|
|
||||||
if use doc; then
|
|
||||||
insinto /usr/share/doc/${P}
|
|
||||||
doins -r pdfs/* || die "failed to install pdf files"
|
|
||||||
|
|
||||||
insinto /usr/share/${PN}/
|
|
||||||
doins -r manual-examples primer-examples \
|
|
||||||
|| die "failed to install example files"
|
|
||||||
fi
|
|
||||||
}
|
|
@ -1,13 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
<pkgmetadata>
|
<pkgmetadata>
|
||||||
<herd>sci</herd>
|
<herd>sci</herd>
|
||||||
<longdescription>
|
<longdescription>
|
||||||
Maude is a high-performance reflective language and system supporting
|
Maude is a high-performance reflective language and system supporting
|
||||||
both equational and rewriting logic specification and programming for a
|
both equational and rewriting logic specification and programming for a
|
||||||
wide range of applications. Maude has been influenced in important ways
|
wide range of applications. Maude has been influenced in important ways
|
||||||
by the OBJ3 language, which can be regarded as an equational logic
|
by the OBJ3 language, which can be regarded as an equational logic
|
||||||
sublanguage. Besides supporting equational specification and
|
sublanguage. Besides supporting equational specification and
|
||||||
programming, Maude also supports rewriting logic computation.
|
programming, Maude also supports rewriting logic computation.
|
||||||
</longdescription>
|
</longdescription>
|
||||||
</pkgmetadata>
|
</pkgmetadata>
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
DIST Term-ReadLine-TTYtter-1.4.tar.gz 52093 SHA256 ac373133cee1b2122a8273fe7b4244613d0eecefe88b668bd98fe71d1ec4ac93 SHA512 6e49c78a935259e99cabe5c9750fd5e90e205c754955d23c50227bbfe3dcb40d56ccc447d3f516ff34195d3fb411b13ae61a6c32c776231f794d2fca9da8fd1a WHIRLPOOL 191b42388e319b6ee76f8ae01bfe4c18f395c5335c220b2d765252f59b0c858a1283bc1ea1e388cfcfa940a54615314e5c25e8c639e5ad01aca1379edf0d72ab
|
@ -0,0 +1,20 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild,v 1.1 2013/11/06 17:42:47 hwoarang Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
MODULE_AUTHOR=CKAISER
|
||||||
|
MODULE_VERSION=1.4
|
||||||
|
|
||||||
|
inherit perl-module
|
||||||
|
|
||||||
|
DESCRIPTION="Quick implementation of readline utilities for ttytter."
|
||||||
|
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="dev-perl/TermReadKey"
|
||||||
|
|
||||||
|
SRC_TEST="do parallel"
|
@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<herd>perl</herd>
|
||||||
|
<herd>proxy-maintainers</herd>
|
||||||
|
<maintainer>
|
||||||
|
<email>gentoo@nephros.org</email>
|
||||||
|
<name>Peter Gantner</name>
|
||||||
|
</maintainer>
|
||||||
|
</pkgmetadata>
|
@ -0,0 +1,29 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.26.ebuild,v 1.1 2013/11/07 06:11:56 patrick Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
|
||||||
|
|
||||||
|
inherit distutils-r1
|
||||||
|
|
||||||
|
DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
|
||||||
|
HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
|
||||||
|
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="MPL-2.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||||
|
RDEPEND=">=dev-python/mozinfo-0.3.3[${PYTHON_USEDEP}]
|
||||||
|
>=dev-python/mozprofile-0.10[${PYTHON_USEDEP}]
|
||||||
|
>=dev-python/mozprocess-0.10[${PYTHON_USEDEP}]
|
||||||
|
dev-python/simplejson[${PYTHON_USEDEP}]
|
||||||
|
dev-python/mozfile[${PYTHON_USEDEP}]"
|
||||||
|
|
||||||
|
python_prepare_all() {
|
||||||
|
sed -e 's/\(moz.*\) ==/\1 >=/' -i setup.py
|
||||||
|
distutils-r1_python_prepare_all
|
||||||
|
}
|
@ -0,0 +1,55 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.3.2.ebuild,v 1.1 2013/11/07 06:59:30 patrick Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
|
||||||
|
|
||||||
|
inherit distutils-r1
|
||||||
|
|
||||||
|
MY_PN="amqp"
|
||||||
|
MY_P="${MY_PN}-${PV}"
|
||||||
|
|
||||||
|
DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
|
||||||
|
HOMEPAGE="https://github.com/celery/py-amqp http://pypi.python.org/pypi/amqp/"
|
||||||
|
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
|
||||||
|
LICENSE="LGPL-3"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="doc examples extras test"
|
||||||
|
|
||||||
|
RDEPEND=""
|
||||||
|
DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
|
RESTRICT="test" # don't work, and fail quietly
|
||||||
|
|
||||||
|
python_compile_all() {
|
||||||
|
use doc && emake -C docs html
|
||||||
|
}
|
||||||
|
|
||||||
|
python_test() {
|
||||||
|
cp -r -l funtests "${BUILD_DIR}"/lib/ || die
|
||||||
|
cd "${BUILD_DIR}"/lib || die
|
||||||
|
if [[ ${EPYTHON:6:1} == 3 ]]; then
|
||||||
|
# Notes:
|
||||||
|
# -W is not supported by python3.1
|
||||||
|
# -n causes Python to write into hardlinked files
|
||||||
|
2to3 --no-diffs -w funtests || die
|
||||||
|
fi
|
||||||
|
"${PYTHON}" funtests/run_all.py || ewarn "Tests fail with ${EPYTHON}"
|
||||||
|
rm -rf funtests/ || die
|
||||||
|
}
|
||||||
|
|
||||||
|
python_install_all() {
|
||||||
|
use examples && local EXAMPLES=( demo/. )
|
||||||
|
use doc && local HTML_DOCS=( docs/.build/html/. )
|
||||||
|
if use extras; then
|
||||||
|
insinto /usr/share/${PF}/extras
|
||||||
|
doins -r extra
|
||||||
|
fi
|
||||||
|
distutils-r1_python_install_all
|
||||||
|
}
|
@ -1,3 +1,4 @@
|
|||||||
DIST pyopencl-2011.2.tar.gz 1293749 SHA256 44e63472cfd3783e60c4c5a7f0ae3537fb95ffd6034ca3db226f5ca5a726d9b9 SHA512 ca0b74ca4d5a85e5aae25183156784740d278d1c111d71f4d57cfefb36daa5971d60562ce10355f5b77dcaf7b916a1208ee1cc09c273b7287a8d10e42607793b WHIRLPOOL aa1e61de187ee709b63ab09c02edeea36b7df2a8509f0589ce7450bc5e86a70069c4da745e3e4b6ba2dc96449fb70b16cfd89254d73a869c05c11bdc98c43004
|
DIST pyopencl-2011.2.tar.gz 1293749 SHA256 44e63472cfd3783e60c4c5a7f0ae3537fb95ffd6034ca3db226f5ca5a726d9b9 SHA512 ca0b74ca4d5a85e5aae25183156784740d278d1c111d71f4d57cfefb36daa5971d60562ce10355f5b77dcaf7b916a1208ee1cc09c273b7287a8d10e42607793b WHIRLPOOL aa1e61de187ee709b63ab09c02edeea36b7df2a8509f0589ce7450bc5e86a70069c4da745e3e4b6ba2dc96449fb70b16cfd89254d73a869c05c11bdc98c43004
|
||||||
DIST pyopencl-2012.1.tar.gz 1416097 SHA256 823c9af3540ab84221acf7978bf688d98c7635e19d6bdb4d6818c48235184297 SHA512 4f96703a3905049db5fa3217a053df7d37b7a875e71322ee8782862ec19631e6c93bd77bb281f26a66f4308bb951a7bca9eba6369e83321b9d19f67ce194e4c4 WHIRLPOOL 2542ce021a7df003fd6c01da9e94a64c50fe42c621b8ab92ffe12831d861e67f25b6149b475db0834225a1f4de2ef86f2a118686b83a52b3dc1160f23dd2c9a8
|
DIST pyopencl-2012.1.tar.gz 1416097 SHA256 823c9af3540ab84221acf7978bf688d98c7635e19d6bdb4d6818c48235184297 SHA512 4f96703a3905049db5fa3217a053df7d37b7a875e71322ee8782862ec19631e6c93bd77bb281f26a66f4308bb951a7bca9eba6369e83321b9d19f67ce194e4c4 WHIRLPOOL 2542ce021a7df003fd6c01da9e94a64c50fe42c621b8ab92ffe12831d861e67f25b6149b475db0834225a1f4de2ef86f2a118686b83a52b3dc1160f23dd2c9a8
|
||||||
DIST pyopencl-2013.1.tar.gz 1657749 SHA256 5c1360a27bdc12ca9868158cc8eb3daa93d0efb05ad6f27f47a8bb4e4c9c5403 SHA512 665550f4b4a50d3f42218b371b260bd50789be6e699edb96598c58589746f64b4191dbd1803443f6254fb906e513411c7a51cb846b37f2efedcc3c7df9c2bca6 WHIRLPOOL a8aaa15c30377e9105a5acff6195f9507cb50489f8ff600b7eeb58988ccde4048110d1e8ef108faa15be768598448fd9f88f16a5fe8fbf0cfa209d7de97eedca
|
DIST pyopencl-2013.1.tar.gz 1657749 SHA256 5c1360a27bdc12ca9868158cc8eb3daa93d0efb05ad6f27f47a8bb4e4c9c5403 SHA512 665550f4b4a50d3f42218b371b260bd50789be6e699edb96598c58589746f64b4191dbd1803443f6254fb906e513411c7a51cb846b37f2efedcc3c7df9c2bca6 WHIRLPOOL a8aaa15c30377e9105a5acff6195f9507cb50489f8ff600b7eeb58988ccde4048110d1e8ef108faa15be768598448fd9f88f16a5fe8fbf0cfa209d7de97eedca
|
||||||
|
DIST pyopencl-2013.2.tar.gz 1637274 SHA256 f8e4218e4e47d397886f5dabde16a4d8dcc12caa0cb16ec68cae31f89c94d918 SHA512 1b5d1aa7421025dbbd06e7b58cac1e42eca24d55e3c24dc526a8b95f5b302c5d5553fcf615241abf6d9089c939980e912b5416a94290633704ef998509afddb7 WHIRLPOOL 8a868a72764b0b7d3fb8fa9d056f1be2329a70a4c5752bc4cc88ef6826b3349b15badfc3fce05a95dff62ce989297a51c5555bb892c08873c1c887f1e9b8dc23
|
||||||
|
@ -0,0 +1,65 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2013.2.ebuild,v 1.1 2013/11/07 06:45:05 patrick Exp $
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
PYTHON_DEPEND="2"
|
||||||
|
SUPPORT_PYTHON_ABIS="1"
|
||||||
|
RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
|
||||||
|
|
||||||
|
inherit distutils
|
||||||
|
|
||||||
|
DESCRIPTION="Python wrapper for OpenCL"
|
||||||
|
HOMEPAGE="http://mathema.tician.de/software/pyopencl http://pypi.python.org/pypi/pyopencl"
|
||||||
|
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="examples opengl"
|
||||||
|
|
||||||
|
RDEPEND=">=dev-libs/boost-1.48[python]
|
||||||
|
dev-python/decorator
|
||||||
|
dev-python/numpy
|
||||||
|
dev-python/mako
|
||||||
|
dev-python/pytools
|
||||||
|
>=virtual/opencl-0-r1"
|
||||||
|
DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
|
DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
|
||||||
|
|
||||||
|
src_configure()
|
||||||
|
{
|
||||||
|
configuration() {
|
||||||
|
local myconf=()
|
||||||
|
|
||||||
|
if use opengl; then
|
||||||
|
myconf+=(--cl-enable-gl)
|
||||||
|
fi
|
||||||
|
|
||||||
|
"$(PYTHON)" configure.py \
|
||||||
|
--boost-compiler=gcc \
|
||||||
|
--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
|
||||||
|
--no-use-shipped-boost \
|
||||||
|
"${myconf[@]}"
|
||||||
|
}
|
||||||
|
python_execute_function -s configuration
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install()
|
||||||
|
{
|
||||||
|
distutils_src_install
|
||||||
|
|
||||||
|
if use examples; then
|
||||||
|
insinto /usr/share/doc/${PF}
|
||||||
|
doins -r examples
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst()
|
||||||
|
{
|
||||||
|
distutils_pkg_postinst
|
||||||
|
if use examples; then
|
||||||
|
elog "Some of the examples provided by this package require dev-python/matplotlib."
|
||||||
|
fi
|
||||||
|
}
|
@ -1 +1,2 @@
|
|||||||
DIST flog-4.1.2.gem 24064 SHA256 ba4c25662c5d7cfb94fbf1b7ed4c368440df7e5583d5fa66d8077f54552b24ef SHA512 3f7b95d4bbd946b257f404fb29df5c9abc1c0aa976fcd8cc4218450d6aa3deff123400c11b14810b3d8e3743add3ad7b5b6729a4d4ffae75ba368a3b2ac31969 WHIRLPOOL 659054bc2288a9a98aeff3a725b0efe9594fedb0b841bcaef2d2813985e0ebb766f246fd5d1ac34525c1220f78741a02338fc2155f33bd74e22f66c7c00677bc
|
DIST flog-4.1.2.gem 24064 SHA256 ba4c25662c5d7cfb94fbf1b7ed4c368440df7e5583d5fa66d8077f54552b24ef SHA512 3f7b95d4bbd946b257f404fb29df5c9abc1c0aa976fcd8cc4218450d6aa3deff123400c11b14810b3d8e3743add3ad7b5b6729a4d4ffae75ba368a3b2ac31969 WHIRLPOOL 659054bc2288a9a98aeff3a725b0efe9594fedb0b841bcaef2d2813985e0ebb766f246fd5d1ac34525c1220f78741a02338fc2155f33bd74e22f66c7c00677bc
|
||||||
|
DIST flog-4.2.0.gem 23552 SHA256 e468f3c42a32389c6ee5fdbd339cf86b308a482dd45669024ebd31ef7fd82ada SHA512 4f819ae28b5480651fd04580fbcb5a47336767a4711837b8be17219f0e92bdc2d4602675f66b06fe0ed89b0d495cea55d38a9cddd92f8984cf14160c067280b6 WHIRLPOOL f15f0ac852e1376225339bfd469dc5a427e124db027b85b4cb06a12b5fd6cdb75a7775346fffead0562cae03735cee2919c29145bde862640834d774c0da3dc9
|
||||||
|
@ -0,0 +1,28 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/flog-4.2.0.ebuild,v 1.1 2013/11/07 06:30:48 graaff Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
USE_RUBY="ruby18 ruby19 ruby20 jruby"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
|
||||||
|
RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
|
||||||
|
|
||||||
|
inherit ruby-fakegem
|
||||||
|
|
||||||
|
DESCRIPTION="Flog reports the most tortured code in an easy to read pain report."
|
||||||
|
HOMEPAGE="http://ruby.sadi.st/"
|
||||||
|
LICENSE="MIT"
|
||||||
|
|
||||||
|
KEYWORDS="~x86 ~amd64"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
ruby_add_bdepend "test? ( dev-ruby/minitest )"
|
||||||
|
|
||||||
|
ruby_add_rdepend ">dev-ruby/ruby_parser-3.1.0:3
|
||||||
|
>=dev-ruby/sexp_processor-4.4:4"
|
||||||
|
|
||||||
|
each_ruby_test() {
|
||||||
|
${RUBY} -Ilib test/test_flog.rb || die
|
||||||
|
}
|
@ -1,2 +1,3 @@
|
|||||||
DIST Domination_1.1.1.2.zip 5998523 SHA256 edd8eab16d4d66f1365ba7aa1696b536458762962a61423a34b0e3a47b4f94bf SHA512 7058c17cef649e5149dd1a10e3cd3283d927998f07761a7f8078058d6776e0234ac798f47f1aa15f9980defbda006b3dbe7bd07e8633c9139aa7ce6cc152615e WHIRLPOOL 107e853d8063881cecc89b4a5a2712443f9d933fec1b28cf419267f93e05d2e9d46352bd2aeaf0fb25fefb497f0adab3a819241ba56eb0a92c470fc8db3d8201
|
DIST Domination_1.1.1.2.zip 5998523 SHA256 edd8eab16d4d66f1365ba7aa1696b536458762962a61423a34b0e3a47b4f94bf SHA512 7058c17cef649e5149dd1a10e3cd3283d927998f07761a7f8078058d6776e0234ac798f47f1aa15f9980defbda006b3dbe7bd07e8633c9139aa7ce6cc152615e WHIRLPOOL 107e853d8063881cecc89b4a5a2712443f9d933fec1b28cf419267f93e05d2e9d46352bd2aeaf0fb25fefb497f0adab3a819241ba56eb0a92c470fc8db3d8201
|
||||||
DIST Domination_1.1.1.4.zip 6333966 SHA256 22427a038a462184ee0f6533627a903423a5c1e3f3ce5da02cb77753f7ae441f SHA512 831b80a86a5e4f6559adb1b6f8549e851c989b6f42ecfbb8a0fd579827ce3d15725348a825bbcec083a62631b381d0b9b7913a22b0ed6b4bbfc4d8ff66987ff7 WHIRLPOOL d3bee221240ae043efc1e60f8d00d7569a6bb56375550b9ad30e1bd8fcb16055c874eef12da8656835dda402630d1574d3be1fb9619802de243293a6fa9ae21c
|
DIST Domination_1.1.1.4.zip 6333966 SHA256 22427a038a462184ee0f6533627a903423a5c1e3f3ce5da02cb77753f7ae441f SHA512 831b80a86a5e4f6559adb1b6f8549e851c989b6f42ecfbb8a0fd579827ce3d15725348a825bbcec083a62631b381d0b9b7913a22b0ed6b4bbfc4d8ff66987ff7 WHIRLPOOL d3bee221240ae043efc1e60f8d00d7569a6bb56375550b9ad30e1bd8fcb16055c874eef12da8656835dda402630d1574d3be1fb9619802de243293a6fa9ae21c
|
||||||
|
DIST Domination_1.1.1.5.zip 6390032 SHA256 6e0dd1c869679cc80c7904d6512cf9f6fc858a985b60c5a33f3f3291d716f740 SHA512 116d96aded29f60e71eacc8069c6b9ad3b2e8b7e44ed06c730cdaf8e1de4b95650e928e1876feb6bcb08697cd6eaedf1529cf323855e2da652855d07e8337360 WHIRLPOOL cd3de0950075f6330931f0847bd048d9919afc6009bfe99b7f3f6bed09a1b7ade30ad918af23139db2b15baacfe79845d3ce75c42463c5aa59603d141639b251
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue