[gtk-vnc] Delete browser plugin



commit 771ec347bb6d234746ccecd516a8847c336e6dd5
Author: Daniel P. Berrange <berrange redhat com>
Date:   Fri Feb 22 12:35:40 2013 +0000

    Delete browser plugin
    
    The plugin code has been unmaintained for years and almost
    certainly has security problems. A pure HTML5 solution like
    noVNC is a far better approach to browser support for VNC.

 Makefile.am             |    2 +-
 configure.ac            |   23 --
 gtk-vnc.spec.in         |   43 +---
 plugin/Makefile.am      |   32 --
 plugin/README           |  123 --------
 plugin/gtk-vnc-plugin.c |  314 -------------------
 plugin/gtk-vnc-plugin.h |   89 ------
 plugin/npapi.h          |  766 -----------------------------------------------
 plugin/npshell.c        |  386 ------------------------
 plugin/npunix.c         |  537 ---------------------------------
 plugin/npupp.h          |  725 --------------------------------------------
 plugin/test.html        |   18 --
 12 files changed, 2 insertions(+), 3056 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f2c9c8..64d8ecf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src tools examples plugin po vapi
+SUBDIRS = src tools examples po vapi
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 
 pkgconfig_DATA = $(PACKAGE)-$(GTK_VNC_API_VERSION).pc gvnc-1.0.pc
diff --git a/configure.ac b/configure.ac
index 22402e1..108a971 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,6 @@ GTHREAD_REQUIRED=2.0.0
 PYTHON_REQUIRED=2.4
 CAIRO_REQUIRED=1.2.0
 
-FIREFOX_PLUGIN_REQUIRED=2.0.0
-MOZILLA_PLUGIN_REQUIRED=1.8
 GOBJECT_INTROSPECTION_REQUIRED=0.6.2
 GOBJECT_INTROSPECTION_DESIRED=0.9.4
 
@@ -369,23 +367,6 @@ if test "$WITH_PYTHON" = "yes"; then
   fi
 fi
 
-dnl --enable-plugin to enable the browser plugin.
-AC_ARG_ENABLE(plugin,
-       [  --enable-plugin=[no/yes] enable browser plugin [default=no]],,
-       enable_plugin=no)
-if test "x$enable_plugin" = "xyes"; then
-    dnl Check for Firefox plugin package (also includes NSPR cflags/libs).
-    PKG_CHECK_MODULES(FIREFOX_PLUGIN,
-                     firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED, ,[
-        PKG_CHECK_MODULES(MOZILLA_PLUGIN,
-                          mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED)
-        FIREFOX_PLUGIN_CFLAGS="$MOZILLA_PLUGIN_CFLAGS"
-        FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS"
-    ])
-    AC_SUBST(FIREFOX_PLUGIN_CFLAGS)
-    AC_SUBST(FIREFOX_PLUGIN_LIBS)
-fi
-
 dnl define a MAINT-like variable REBUILD which is set
 dnl if Perl, so autogenerated sources can be rebuilt
 AC_PATH_PROGS(PERL, perl5 perl)
@@ -403,8 +384,6 @@ AM_CONDITIONAL(WITH_PYTHON, [test "$WITH_PYTHON" = "yes"])
 
 AM_CONDITIONAL(WITH_EXAMPLES, [test "$WITH_EXAMPLES" = "yes"])
 
-AM_CONDITIONAL(ENABLE_PLUGIN, [test "$enable_plugin" = "yes"])
-
 AC_ARG_ENABLE([introspection],
         AS_HELP_STRING([--enable-introspection], [enable GObject introspection]),
         [], [enable_introspection=check])
@@ -484,7 +463,6 @@ AC_CONFIG_FILES(
   src/Makefile
   tools/Makefile
   examples/Makefile
-  plugin/Makefile
   po/Makefile.in
   vapi/Makefile
   gvnc-1.0.pc
@@ -507,7 +485,6 @@ Configure summary:
 
        Python binding .............:  ${WITH_PYTHON}
        Install example programs ...:  ${WITH_EXAMPLES}
-       Browser plugin .............:  ${enable_plugin}
        SASL support................:  ${enable_sasl}
        PulseAudio support..........:  ${HAVE_PULSEAUDIO}
        GTK+ version................:  ${GTK_API_VERSION}
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index 1628906..5575a39 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -1,9 +1,5 @@
 # -*- rpm-spec -*-
 
-# Plugin isn't ready for real world use yet - it needs
-# a security audit at very least
-%global with_plugin 0
-
 %global with_gir 0
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 7
 %global with_gir 1
@@ -40,13 +36,6 @@ BuildRequires: gobject-introspection-devel
 BuildRequires: gir-repository-devel
 %endif
 %endif
-%if %{with_plugin}
-%if 0%{?fedora} > 8
-BuildRequires: xulrunner-devel
-%else
-BuildRequires: firefox-devel
-%endif
-%endif
 %if %{with_gtk3}
 BuildRequires: gtk3-devel
 %endif
@@ -86,20 +75,6 @@ allowing it to be completely asynchronous while remaining single threaded.
 
 A module allowing use of the GTK-VNC widget from python
 
-%if %{with_plugin}
-%package plugin
-Summary: Mozilla plugin for the gtk-vnc library
-Group: Development/Libraries
-Requires: %{name} = %{version}
-
-%description plugin
-gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines
-allowing it to be completely asynchronous while remaining single threaded.
-
-This package provides a web browser plugin for Mozilla compatible
-browsers.
-%endif
-
 %package -n gvnc
 Summary: A GObject for VNC connections
 
@@ -190,14 +165,8 @@ cp -a gtk-vnc-%{version} gtk-vnc2-%{version}
 %define gir_arg --enable-introspection=no
 %endif
 
-%if %{with_plugin}
-%define plugin_arg --enable-plugin=yes
-%else
-%define plugin_arg --enable-plugin=no
-%endif
-
 cd gtk-vnc-%{version}
-%configure --with-gtk=2.0 %{plugin_arg} %{gir_arg}
+%configure --with-gtk=2.0 %{gir_arg}
 %__make %{?_smp_mflags} V=1
 cd ..
 
@@ -224,10 +193,6 @@ rm -f %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{_libdir}/python*/site-packages/*.a
 rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
-%if %{with_plugin}
-rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a
-rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
-%endif
 
 %find_lang %{name}
 
@@ -278,12 +243,6 @@ rm -fr %{buildroot}
 %doc gtk-vnc-%{version}/examples/gvncviewer-bindings.py
 %{_libdir}/python*/site-packages/gtkvnc.so
 
-%if %{with_plugin}
-%files plugin
-%defattr(-, root, root)
-%{_libdir}/mozilla/plugins/%{name}-plugin.so
-%endif
-
 %files -n gvnc -f %{name}.lang
 %defattr(-, root, root)
 %{_libdir}/libgvnc-1.0.so.*


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]