* [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox: ChangeLog virtualbox-4.1.22.ebuild virtualbox-4.2.0-r1.ebuild
@ 2012-09-14 10:47 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler (polynomial-c) @ 2012-09-14 10:47 UTC (permalink / raw
To: gentoo-commits
polynomial-c 12/09/14 10:47:28
Modified: ChangeLog virtualbox-4.1.22.ebuild
virtualbox-4.2.0-r1.ebuild
Log:
Fixed separators in sed substitute commands to not collide with path separators (bug #435000)
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Revision Changes Path
1.129 app-emulation/virtualbox/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?r1=1.128&r2=1.129
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- ChangeLog 14 Sep 2012 06:01:15 -0000 1.128
+++ ChangeLog 14 Sep 2012 10:47:27 -0000 1.129
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/virtualbox
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.128 2012/09/14 06:01:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.129 2012/09/14 10:47:27 polynomial-c Exp $
+
+ 14 Sep 2012; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.1.22.ebuild,
+ virtualbox-4.2.0-r1.ebuild:
+ Fixed separators in sed substitute commands to not collide with path
+ separators. Thanks to Zabuldon for reporting this in bug #435000.
*virtualbox-4.2.0-r1 (14 Sep 2012)
1.2 app-emulation/virtualbox/virtualbox-4.1.22.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?r1=1.1&r2=1.2
Index: virtualbox-4.1.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtualbox-4.1.22.ebuild 9 Sep 2012 15:23:01 -0000 1.1
+++ virtualbox-4.1.22.ebuild 14 Sep 2012 10:47:27 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.1 2012/09/09 15:23:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.2 2012/09/14 10:47:27 polynomial-c Exp $
EAPI=4
@@ -138,7 +138,7 @@
rm -rf kBuild/bin tools
# Disable things unused or split into separate ebuilds
- sed -e "s/MY_LIBDIR/$(get_libdir)/" \
+ sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
# unset useless/problematic checks in configure
@@ -150,7 +150,7 @@
epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
# Respect LDFLAGS
- sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+ sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
@@ -162,14 +162,14 @@
# Use PAM only when pam USE flag is enbaled (bug #376531)
if ! use pam ; then
elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
- sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+ sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+ sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
src/VBox/HostServices/Makefile.kmk || die
fi
# add correct java path
if use java ; then
- sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
+ sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-i "${S}"/Config.kmk || die
java-pkg-opt-2_src_prepare
fi
@@ -232,7 +232,7 @@
# Set the right libdir
sed -i \
- -e "s/MY_LIBDIR/$(get_libdir)/" \
+ -e "s@MY_LIBDIR@$(get_libdir)@" \
"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
# Symlink binaries to the shipped wrapper
1.2 app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?r1=1.1&r2=1.2
Index: virtualbox-4.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtualbox-4.2.0-r1.ebuild 14 Sep 2012 06:01:15 -0000 1.1
+++ virtualbox-4.2.0-r1.ebuild 14 Sep 2012 10:47:27 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v 1.1 2012/09/14 06:01:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v 1.2 2012/09/14 10:47:27 polynomial-c Exp $
EAPI=4
@@ -140,7 +140,7 @@
rm -rf kBuild/bin tools
# Disable things unused or split into separate ebuilds
- sed -e "s/MY_LIBDIR/$(get_libdir)/" \
+ sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
# unset useless/problematic checks in configure
@@ -152,7 +152,7 @@
epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
# Respect LDFLAGS
- sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+ sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
@@ -164,14 +164,14 @@
# Use PAM only when pam USE flag is enbaled (bug #376531)
if ! use pam ; then
elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
- sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+ sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+ sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
src/VBox/HostServices/Makefile.kmk || die
fi
# add correct java path
if use java ; then
- sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
+ sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-i "${S}"/Config.kmk || die
java-pkg-opt-2_src_prepare
fi
@@ -234,7 +234,7 @@
# Set the right libdir
sed -i \
- -e "s/MY_LIBDIR/$(get_libdir)/" \
+ -e "s@MY_LIBDIR@$(get_libdir)@" \
"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
# Symlink binaries to the shipped wrapper
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox: ChangeLog virtualbox-4.1.22.ebuild virtualbox-4.2.0-r1.ebuild
@ 2012-10-01 9:25 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler (polynomial-c) @ 2012-10-01 9:25 UTC (permalink / raw
To: gentoo-commits
polynomial-c 12/10/01 09:25:39
Modified: ChangeLog virtualbox-4.1.22.ebuild
virtualbox-4.2.0-r1.ebuild
Log:
Moved all patches into separate tar archives. Added a patch to fix compilation with =dev-libs/libxslt-1.1.27 (bug #435994 and bug #436246)
(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)
Revision Changes Path
1.133 app-emulation/virtualbox/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/ChangeLog?r1=1.132&r2=1.133
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- ChangeLog 18 Sep 2012 05:36:39 -0000 1.132
+++ ChangeLog 1 Oct 2012 09:25:39 -0000 1.133
@@ -1,6 +1,22 @@
# ChangeLog for app-emulation/virtualbox
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.132 2012/09/18 05:36:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.133 2012/10/01 09:25:39 polynomial-c Exp $
+
+ 01 Oct 2012; Lars Wendler <polynomial-c@gentoo.org>
+ -files/virtualbox-ose-3.2.8-mesa-check.patch,
+ -files/virtualbox-4.0.2-restore_old_machines_dir.patch,
+ -files/virtualbox-4.1.2-vboxpci-build.patch,
+ -files/virtualbox-4.1.4-asneeded.patch,
+ -files/virtualbox-4.1.6-yasm120-fix.patch,
+ -files/virtualbox-4.1.8-nopie.patch,
+ -files/virtualbox-4.1.10-libgsoapssl.patch,
+ -files/virtualbox-4.1.20-nopie.patch, virtualbox-4.1.22.ebuild,
+ virtualbox-4.2.0-r1.ebuild, -files/virtualbox-4.2.0-nopie.patch,
+ -files/virtualbox-4-asneeded.patch, -files/virtualbox-4-makeself-check.patch,
+ -files/virtualbox-4-mkisofs-check.patch:
+ Moved all patches into separate tar archives. Added a patch to fix
+ compilation with =dev-libs/libxslt-1.1.27 (bug #435994 and bug #436246).
+ Thanks to Jouni Kosonen for providing a patch.
18 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
-virtualbox-4.1.12.ebuild, -virtualbox-4.1.18.ebuild:
1.5 app-emulation/virtualbox/virtualbox-4.1.22.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild?r1=1.4&r2=1.5
Index: virtualbox-4.1.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- virtualbox-4.1.22.ebuild 17 Sep 2012 20:17:37 -0000 1.4
+++ virtualbox-4.1.22.ebuild 1 Oct 2012 09:25:39 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.4 2012/09/17 20:17:37 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.5 2012/10/01 09:25:39 polynomial-c Exp $
EAPI=4
@@ -18,6 +18,8 @@
DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="${SRC_URI}
+ http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.1.22-patches-01.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -141,24 +143,10 @@
sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
- # unset useless/problematic checks in configure
- epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
- "${FILESDIR}/${PN}-4-makeself-check.patch" \
- "${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
- # fix build with --as-needed (bug #249295 and bug #350907)
- epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
# Respect LDFLAGS
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
- # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
- epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
- # Don't build vboxpci.ko module (D'oh!)
- epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
# Use PAM only when pam USE flag is enbaled (bug #376531)
if ! use pam ; then
elog "Disabling PAM removes the possibility to use the VRDP features."
@@ -174,10 +162,13 @@
java-pkg-opt-2_src_prepare
fi
- # Fix compile error on hardened bug 339914 (disable PIE)
- if gcc-specs-pie ; then
- epatch "${FILESDIR}"/${PN}-4.1.20-nopie.patch
+ if ! gcc-specs-pie ; then
+ EPATCH_EXCLUDE="050_${PN}-4.1.20-nopie.patch"
fi
+
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/patches
}
src_configure() {
1.3 app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild?r1=1.2&r2=1.3
Index: virtualbox-4.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- virtualbox-4.2.0-r1.ebuild 14 Sep 2012 10:47:27 -0000 1.2
+++ virtualbox-4.2.0-r1.ebuild 1 Oct 2012 09:25:39 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v 1.2 2012/09/14 10:47:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v 1.3 2012/10/01 09:25:39 polynomial-c Exp $
EAPI=4
@@ -20,6 +20,8 @@
DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="${SRC_URI}
+ http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.2.0-patches-01.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -143,24 +145,10 @@
sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
- # unset useless/problematic checks in configure
- epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
- "${FILESDIR}/${PN}-4-makeself-check.patch" \
- "${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
- # fix build with --as-needed (bug #249295 and bug #350907)
- epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
# Respect LDFLAGS
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
- # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
- epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
- # Don't build vboxpci.ko module (D'oh!)
- epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
# Use PAM only when pam USE flag is enbaled (bug #376531)
if ! use pam ; then
elog "Disabling PAM removes the possibility to use the VRDP features."
@@ -176,10 +164,13 @@
java-pkg-opt-2_src_prepare
fi
- # Fix compile error on hardened bug 339914 (disable PIE)
- if gcc-specs-pie ; then
- epatch "${FILESDIR}"/virtualbox-4.2.0-nopie.patch
+ if ! gcc-specs-pie ; then
+ EPATCH_EXCLUDE="050_${PN}-4.2.0-nopie.patch"
fi
+
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/patches"
}
src_configure() {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-01 9:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-01 9:25 [gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox: ChangeLog virtualbox-4.1.22.ebuild virtualbox-4.2.0-r1.ebuild Lars Wendler (polynomial-c)
-- strict thread matches above, loose matches on Subject: below --
2012-09-14 10:47 Lars Wendler (polynomial-c)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox