Hello community, here is the log from the commit of package nspluginwrapper for openSUSE:Factory checked in at Mon Sep 19 22:56:24 CEST 2011.
-------- --- nspluginwrapper/nspluginwrapper.changes 2011-05-25 23:01:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/nspluginwrapper/nspluginwrapper.changes 2011-09-16 19:47:27.000000000 +0200 @@ -1,0 +2,29 @@ +Fri Sep 16 17:47:08 UTC 2011 - [email protected] + +- fix linking with new ld + +------------------------------------------------------------------- +Fri Jul 1 18:58:02 CEST 2011 - [email protected] + +- Update to the version 1.4.4: + * Fix the private mode plugin escape (bnc#702034, CVE-2011-2486). + * Crash fixes. + * Fix compatibility with WebKit/GTK. + * Report capabilities over RPC to fix logic based on NULL + plugin/browser hooks. + * Fix initialization bug that causes Flash 10.3 to report a + version of 0. + * Implement ClearSiteData NPAPI extension for managing + Flash LSOs. + * Work around lack of client-side windows in Flash. + * Fix race condition when NPP_Destroy was called while viewer is + busy. + * Support NPAPI 0.24, in particular, Flash can now query for + private browsing. + * Support XEmbeding npplayer into another application. + * Fix initializing two wrapped plugins with the same name in the + same process. + * Release implicit grabs before forwarding events to fix Flash + context menu hang. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nspluginwrapper-1.4.0_git201105201955.tar.bz2 nspluginwrapper-silence.patch New: ---- fix-link.patch nspluginwrapper-1.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nspluginwrapper.spec ++++++ --- /var/tmp/diff_new_pack.txUUUB/_old 2011-09-19 22:56:19.000000000 +0200 +++ /var/tmp/diff_new_pack.txUUUB/_new 2011-09-19 22:56:19.000000000 +0200 @@ -15,20 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: nspluginwrapper -Version: 1.4.0_git201105201955 -Release: 1 +Version: 1.4.4 +Release: 0 Group: Productivity/Networking/Web/Utilities Summary: Compatibility Layer for Netscape 4 Plug-Ins License: GPLv2+ -Url: http://web.mit.edu/davidben/Public/nspluginwrapper/ +Url: http://nspluginwrapper.davidben.net/ Source: %{name}-%{version}.tar.bz2 -# Suppress error messages when trying to wrap native plugin (bnc#400194): -# (Now it's done differently, but still only a work-around.) -Patch: nspluginwrapper-silence.patch +Patch0: fix-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: curl-devel glib2-devel gtk2-devel BuildRequires: gcc-c++ @@ -56,20 +53,14 @@ * nspluginwrapper: a tool to manage plug-ins installation and update - - -Authors: --------- - Gwenole Beauchesne <[email protected]> - %prep %setup -q -#%patch +%patch0 -p1 %build # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below. -#export SUSE_ASNEEDED=0 +export SUSE_ASNEEDED=0 # # TODO: # There are three ways to compile 32 bit stuff. Decide, what is better: @@ -84,13 +75,9 @@ # lsb-build/stub_libs/libc_main.c export CFLAGS_32="-m32 ${RPM_OPT_FLAGS/-fstack-protector}" %endif -./configure \ - --prefix=%{_prefix} \ - --enable-viewer \ - --with-malloc=glib \ -%ifarch x86_64 - --enable-biarch -%endif +export CFLAGS="${CFLAGS:-%optflags}" +./configure\ + --prefix=%{_prefix} #sed -i "s/CC=.*/& $RPM_OPT_FLAGS/" config-host.mak make %{?jobs:-j%jobs} ++++++ fix-link.patch ++++++ Index: nspluginwrapper-1.4.4/Makefile =================================================================== --- nspluginwrapper-1.4.4.orig/Makefile 2011-07-01 05:18:57.000000000 +0200 +++ nspluginwrapper-1.4.4/Makefile 2011-09-16 19:45:36.636047114 +0200 @@ -142,7 +142,7 @@ npplayer_CFLAGS += $(GTK_CFLAGS) $(GLIB npplayer_LDFLAGS = $(LDFLAGS) npplayer_LDFLAGS += $(libpthread_LDFLAGS) npplayer_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS) -npplayer_LIBS += $(libpthread_LIBS) $(libsocket_LIBS) +npplayer_LIBS += $(libpthread_LIBS) $(libsocket_LIBS) $(libdl_LIBS) libnoxshm_LIBRARY = libnoxshm.so libnoxshm_RAWSRCS = libnoxshm.c ++++++ nspluginwrapper-1.4.0_git201105201955.tar.bz2 -> nspluginwrapper-1.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspluginwrapper-1.4.0_git201105201955/Makefile new/nspluginwrapper-1.4.4/Makefile --- old/nspluginwrapper-1.4.0_git201105201955/Makefile 2011-05-20 21:55:43.000000000 +0200 +++ new/nspluginwrapper-1.4.4/Makefile 2011-07-01 05:18:57.000000000 +0200 @@ -242,40 +242,40 @@ mkdir -p $(DESTDIR)$(nphostdir) || : mkdir -p $(DESTDIR)$(nptargetdir) || : ifeq ($(build_player),yes) -install.player: $(npplayer_PROGRAM) +install.player: install.dirs $(npplayer_PROGRAM) $(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM) mkdir -p $(DESTDIR)$(bindir) $(LN_S) $(nphostdir)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer else install.player: endif -install.wrapper: $(npwrapper_LIBRARY) +install.wrapper: install.dirs $(npwrapper_LIBRARY) $(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY) ifeq ($(build_viewer),yes) -install.viewer: install.viewer.bin install.viewer.glue -install.libnoxshm: do.install.libnoxshm +install.viewer: install.dirs install.viewer.bin install.viewer.glue +install.libnoxshm: install.dirs do.install.libnoxshm else install.viewer: install.libnoxshm: endif -install.viewer.bin: $(npviewer_PROGRAM) +install.viewer.bin: install.dirs $(npviewer_PROGRAM) $(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM) -install.viewer.glue:: +install.viewer.glue:: install.dirs p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \ echo "#!/bin/sh" > $$p; \ echo "TARGET_OS=$(TARGET_OS)" >> $$p; \ echo "TARGET_ARCH=$(TARGET_ARCH)" >> $$p; \ echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p; \ chmod 755 $$p -do.install.libnoxshm: $(libnoxshm_LIBRARY) +do.install.libnoxshm: install.dirs $(libnoxshm_LIBRARY) $(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY) -install.config: $(npconfig_PROGRAM) +install.config: install.dirs $(npconfig_PROGRAM) $(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM) mkdir -p $(DESTDIR)$(bindir) $(LN_S) $(nphostdir)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper -install.loader: $(nploader_PROGRAM) +install.loader: install.dirs $(nploader_PROGRAM) $(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM) -install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh +install.mkruntime: install.dirs $(SRC_PATH)/utils/mkruntime.sh $(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime $(archivedir):: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspluginwrapper-1.4.0_git201105201955/NEWS new/nspluginwrapper-1.4.4/NEWS --- old/nspluginwrapper-1.4.0_git201105201955/NEWS 2011-05-20 21:55:43.000000000 +0200 +++ new/nspluginwrapper-1.4.4/NEWS 2011-07-01 05:18:57.000000000 +0200 @@ -1,7 +1,15 @@ -nspluginwrapper NEWS -- history of user-visible changes. 2011-05-15 +nspluginwrapper NEWS -- history of user-visible changes. 2011-06-30 Copyright (C) 2005-2009 Gwenole Beauchesne (C) 2011 David Benjamin +Version 1.4.4 - 30.Jun.2011 +* Fix crash in some cases when the number of watched file descriptors decreases + +Version 1.4.2 - 04.Jun.2011 +* Fix crash in WebKit/GTK when npwrapper.so is incorrectly treated as a plugin +* Fix symbol versioning issues with _Unwind_GetIPInfo on some systems +* Fix install process with parallel make + Version 1.4.0 - 15.May.2011 * Report capabilities over RPC to fix logic based on NULL plugin/browser hooks * Fix initialization bug that causes Flash 10.3 to report a version of 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspluginwrapper-1.4.0_git201105201955/lsb-build/stub_libs/libgcc_s.Version new/nspluginwrapper-1.4.4/lsb-build/stub_libs/libgcc_s.Version --- old/nspluginwrapper-1.4.0_git201105201955/lsb-build/stub_libs/libgcc_s.Version 2011-05-20 21:55:43.000000000 +0200 +++ new/nspluginwrapper-1.4.4/lsb-build/stub_libs/libgcc_s.Version 2011-07-01 05:18:57.000000000 +0200 @@ -6,7 +6,6 @@ _Unwind_GetDataRelBase; _Unwind_GetGR; _Unwind_GetIP; - _Unwind_GetIPInfo; _Unwind_GetLanguageSpecificData; _Unwind_GetRegionStart; _Unwind_GetTextRelBase; @@ -21,3 +20,6 @@ _Unwind_GetCFA; _Unwind_Resume_or_Rethrow; }; +GCC_4.2.0 { + _Unwind_GetIPInfo; +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspluginwrapper-1.4.0_git201105201955/nspluginwrapper.spec new/nspluginwrapper-1.4.4/nspluginwrapper.spec --- old/nspluginwrapper-1.4.0_git201105201955/nspluginwrapper.spec 2011-05-20 21:55:43.000000000 +0200 +++ new/nspluginwrapper-1.4.4/nspluginwrapper.spec 2011-07-01 05:18:57.000000000 +0200 @@ -1,5 +1,5 @@ %define name nspluginwrapper -%define version 1.4.0 +%define version 1.4.4 %define release 1 #define svndate DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspluginwrapper-1.4.0_git201105201955/src/npw-viewer.c new/nspluginwrapper-1.4.4/src/npw-viewer.c --- old/nspluginwrapper-1.4.0_git201105201955/src/npw-viewer.c 2011-05-20 21:55:43.000000000 +0200 +++ new/nspluginwrapper-1.4.4/src/npw-viewer.c 2011-07-01 05:18:57.000000000 +0200 @@ -4934,15 +4934,22 @@ // Set error handler - stop plugin if there's a connection error rpc_connection_set_error_callback(g_rpc_connection, rpc_error_callback_cb, NULL); - // Cache an array for the FDs to poll. We always poll one extra: the - // RPC fd, which is treated special. - int nfds = 2; - GPollFD *fds = g_new0(GPollFD, nfds); - fds[0].fd = rpc_socket(g_rpc_connection); - fds[0].events = G_IO_IN; + // Cache the array of FDs to poll. + int fds_size = 2; + GPollFD *fds = g_new0(GPollFD, fds_size); g_is_running = true; GMainContext *context = g_main_context_default(); + + // We track the RPC source out-of-band so that we can integrate it + // with the remote main loop. Run it at high priority so we do not + // delay the browser on an RPC request; it's effectively the highest + // priority anyway from the sync mechanism. + GPollFD rpc_fd = { 0 }; + rpc_fd.fd = rpc_socket(g_rpc_connection); + rpc_fd.events = G_IO_IN; + g_main_context_add_poll(context, &rpc_fd, G_PRIORITY_HIGH); + while (g_is_running) { /* PREPARE */ int max_priority; @@ -4951,20 +4958,17 @@ /* QUERY */ int timeout, needed_fds; while ((needed_fds = g_main_context_query(context, max_priority, &timeout, - fds + 1, nfds - 1)) > nfds - 1) { + fds, fds_size)) > fds_size) { // Reallocate to make room - g_free(fds); - nfds = needed_fds + 1; - fds = g_new0(GPollFD, nfds); - fds[0].fd = rpc_socket(g_rpc_connection); - fds[0].events = G_IO_IN; + fds_size = needed_fds; + fds = g_renew(GPollFD, fds, fds_size); } /* POLL */ - (g_main_context_get_poll_func(context))(fds, nfds, timeout); + (g_main_context_get_poll_func(context))(fds, needed_fds, timeout); /* CHECK */ - bool ready = g_main_context_check(context, max_priority, fds + 1, nfds - 1); + bool ready = g_main_context_check(context, max_priority, fds, needed_fds); /* DISPATCH */ if (ready) { @@ -4973,12 +4977,13 @@ rpc_sync(g_rpc_connection); g_main_context_dispatch(context); rpc_end_sync(g_rpc_connection); - } else if (fds[0].revents & fds[0].events) { + } else if (rpc_fd.revents & rpc_fd.events) { // We don't have anything, but there is an incoming RPC // request. Just respond to it. No need to sync. rpc_dispatch(g_rpc_connection); } } + g_main_context_remove_poll(context, &rpc_fd); g_free(fds); D(bug("--- EXIT ---\n")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspluginwrapper-1.4.0_git201105201955/src/npw-wrapper.c new/nspluginwrapper-1.4.4/src/npw-wrapper.c --- old/nspluginwrapper-1.4.0_git201105201955/src/npw-wrapper.c 2011-05-20 21:55:43.000000000 +0200 +++ new/nspluginwrapper-1.4.4/src/npw-wrapper.c 2011-07-01 05:18:57.000000000 +0200 @@ -1256,9 +1256,7 @@ g_NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result) { D(bugiI("NPN_Evaluate instance=%p, npobj=%p\n", instance, npobj)); - gchar *script_str = g_strndup(script->UTF8Characters, script->UTF8Length); - D(bug("script = '%s'\n", script_str)); - g_free(script_str); + D(bug("script = '%.*s'\n", script->UTF8Length, script->UTF8Characters)); bool ret = mozilla_funcs.evaluate(instance, npobj, script, result); gchar *result_str = string_of_NPVariant(result); D(bugiD("NPN_Evaluate return: %d (%s)\n", ret, result_str)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
