[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.2.10-dfsg-1-6-g434d8c2
Felix Geyer
fgeyer at debian.org
Sun Jul 14 16:34:11 UTC 2013
The following commit has been merged in the master branch:
commit 434d8c25ef260a01dd362164d0ae83609cf2b82e
Author: Felix Geyer <fgeyer at debian.org>
Date: Sun Jul 14 18:19:54 2013 +0200
Drop 36-python-multiarch.patch and 37-wheezy-kernel-drm.patch, fixed upstream.
diff --git a/debian/changelog b/debian/changelog
index 753421f..c8d0060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ virtualbox (4.2.16-dfsg-1) UNRELEASED; urgency=low
* New upstream release.
- Fixes CVE-2013-3792: virtio-net host DoS (Closes: #715327)
+ * Drop 36-python-multiarch.patch and 37-wheezy-kernel-drm.patch,
+ fixed upstream.
-- Felix Geyer <fgeyer at debian.org> Sun, 14 Jul 2013 17:52:45 +0200
diff --git a/debian/patches/36-python-multiarch.patch b/debian/patches/36-python-multiarch.patch
deleted file mode 100644
index 2fd02b8..0000000
--- a/debian/patches/36-python-multiarch.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Fix detection of python in multiarch paths using pkg-config.
-Author: Rico Tzschichholz <ricotz at ubuntu.com>, Felix Geyer <fgeyer at debian.org>
-
---- a/configure
-+++ b/configure
-@@ -1884,32 +1884,32 @@
- found=
- # For Solaris we use libpython2.4 for compatibility with Solaris 10 and passing IPS pkg audit
- if [ "$OS" != "solaris" ]; then
-- SUPPYTHONLIBS="python2.7 python2.6 python2.5 python2.4 python2.3"
-+ SUPPYTHONLIBS="2.7 2.6 2.5 2.4 2.3"
- else
-- SUPPYTHONLIBS="python2.4"
-+ SUPPYTHONLIBS="2.4"
- fi
-- for p in $PYTHONDIR; do
-+ PYTHON_CXX_LIBS=""
-+ PYTHON_CXX_CFLAGS=""
- for d in $SUPPYTHONLIBS; do
-- for b in lib64 lib/64 lib; do
- echo "compiling the following source file:" >> $LOG
- cat $ODIR.tmp_src.cc >> $LOG
- echo "using the following command line:" >> $LOG
-- echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" >> $LOG
-- $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1
-+ PYTHON_CXX_LIBS=`pkg-config python-$d --libs`
-+ PYTHON_CXX_CFLAGS=`pkg-config python-$d --cflags`
-+ echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $PYTHON_CXX_CFLAGS $PYTHON_CXX_LIBS" >> $LOG
-+ $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $PYTHON_CXX_CFLAGS $PYTHON_CXX_LIBS >> $LOG 2>&1
- if [ $? -eq 0 ]; then
- found=1
- break
- fi
-- done
-- if [ -n "$found" ]; then break; fi
- done
-- if [ -n "$found" ]; then break; fi
-- done
- if [ -n "$found" ]; then
- if test_execute; then
- cnf_append "VBOX_WITH_PYTHON" "1"
-- cnf_append "VBOX_PATH_PYTHON_INC" "$p/include/$d"
-- cnf_append "VBOX_LIB_PYTHON" "$p/$b/lib$d.so"
-+ cnf_append "VBOX_PYTHONDEF_INC" "`strip_I $PYTHON_CXX_CFLAGS`"
-+ cnf_append "VBOX_PYTHONDEF_LIBS" "$PYTHON_CXX_LIBS"
-+ cnf_append "VBOX_PYTHON`echo $d | sed 's/\.//'`_INC" "`strip_I $PYTHON_CXX_CFLAGS`"
-+ cnf_append "VBOX_PYTHON`echo $d | sed 's/\.//'`_LIBS" "$PYTHON_CXX_LIBS"
- else
- log_failure "Python not working"
- fail
---- a/src/libs/xpcom18a4/python/Makefile.kmk
-+++ b/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -46,13 +46,6 @@
- VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
- endif
-
--else
-- # Use the script.
-- $(eval $(subst |,$(NL),$(shell $(VBOX_BLD_PYTHON) \
-- $(PATH_SUB_CURRENT)/gen_python_deps.py \
-- $(KBUILD_TARGET) \
-- $(KBUILD_TARGET_ARCH) \
-- $(VBOX_MULTIPYTHON) )))
- endif
-
- ifndef VBOX_ONLY_SDK
diff --git a/debian/patches/37-wheezy-kernel-drm.patch b/debian/patches/37-wheezy-kernel-drm.patch
deleted file mode 100644
index dc74d04..0000000
--- a/debian/patches/37-wheezy-kernel-drm.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix build failure with the Debian wheezy kernel which backports the drm subsystem from Linux 3.4.
-Bug-Debian: http://bugs.debian.org/703358
-Author: Felix Geyer <fgeyer at debian.org>
-
-diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
---- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-+++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-@@ -76,6 +76,12 @@
- #include "drm/drmP.h"
- #include "vboxvideo_drm.h"
-
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+# ifdef DRM_IOCTL_MODE_GETPLANE
-+# define DRM_DEBIAN70
-+# endif
-+# endif
-+
- static struct pci_device_id pciidlist[] = {
- vboxvideo_PCI_IDS
- };
-@@ -88,7 +94,7 @@ int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
- return 0;
- #endif
- }
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN70)
- /* since linux-3.3.0-rc1 drm_driver::fops is pointer */
- static struct file_operations driver_fops =
- {
-@@ -114,7 +120,7 @@ static struct drm_driver driver =
- .get_map_ofs = drm_core_get_map_ofs,
- .get_reg_ofs = drm_core_get_reg_ofs,
- #endif
--# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63) && !defined(DRM_DEBIAN70)
- .fops =
- {
- .owner = THIS_MODULE,
-@@ -131,7 +137,7 @@ static struct drm_driver driver =
- .poll = drm_poll,
- .fasync = drm_fasync,
- },
--#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) */
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN70) */
- .fops = &driver_fops,
- #endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
diff --git a/debian/patches/series b/debian/patches/series
index e29a2cc..32a41e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,5 +13,3 @@
30-usb-warning-filters.patch
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
-36-python-multiarch.patch
-37-wheezy-kernel-drm.patch
--
virtualbox Debian packaging
More information about the Pkg-virtualbox-commits
mailing list