rpms/nspluginwrapper/devel plugin-config-print.patch, NONE, 1.1 nspluginwrapper.spec, 1.64, 1.65 plugin-config-umask.patch, 1.1, 1.2

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14747

Modified Files:
	nspluginwrapper.spec plugin-config-umask.patch 
Added Files:
	plugin-config-print.patch 
Log Message:
* Wed Oct 22 2008 Martin Stransky <stransky at redhat.com> 1.1.2-4
- Fixed #449338 - mozilla-plugin-config segfaults with -v argument



plugin-config-print.patch:

--- NEW FILE plugin-config-print.patch ---
diff -up nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c.old nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c
--- nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c.old	2008-10-22 13:35:55.000000000 +0200
+++ nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c	2008-10-22 13:37:23.000000000 +0200
@@ -453,7 +453,7 @@ int wrap_plugin_2(WRAP_PLUGIN *p_plugin,
         NULL
       };
     
-      info("Running: %s");
+      info("Running: %s", p_wrapper);
       for(i = 0; i < sizeof(params)/sizeof(params[0]); i++) {
         if(params[i]) {
           info("         %s",params[i]);


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nspluginwrapper.spec	21 Oct 2008 13:21:49 -0000	1.64
+++ nspluginwrapper.spec	22 Oct 2008 11:52:27 -0000	1.65
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -80,8 +80,9 @@
 Patch3:         nspluginwrapper-1.1.0-fork.patch
 Patch4:         nspluginwrapper-0.9.91.5-shutdown.patch
 Patch5:         nspluginwrapper-1.1.12-event.patch
-Patch6:         plugin-config-umask.patch
 Patch100:       plugin-config-setuid.patch
+Patch101:       plugin-config-umask.patch
+Patch102:       plugin-config-print.patch
 License:	GPLv2+
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -110,12 +111,15 @@
 %patch3 -p1 -b .fork
 %patch4 -p1 -b .shutdown
 %patch5 -p1 -b .event
-%patch6 -p1 -b .umask
 
+# Plugin-config patches
 pushd %plugin_config_name
 %patch100 -p2
+%patch101 -p2 -b .umask
+%patch102 -p2 -b .print
 popd
 
+
 # remove old/incompatibile stuff
 rm -rf npapi
 rm -rf lsb-build
@@ -241,6 +245,9 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Wed Oct 22 2008 Martin Stransky <stransky at redhat.com> 1.1.2-4
+- Fixed #449338 - mozilla-plugin-config segfaults with -v argument
+
 * Tue Oct 21 2008 Martin Stransky <stransky at redhat.com> 1.1.2-3
 - Removed event patch, it blocks X events and breaks Adobe pdf plugin
 - Removed event limit in xt_event_polling_timer_callback 

plugin-config-umask.patch:

Index: plugin-config-umask.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/plugin-config-umask.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin-config-umask.patch	17 Oct 2008 10:29:26 -0000	1.1
+++ plugin-config-umask.patch	22 Oct 2008 11:52:27 -0000	1.2
@@ -1,6 +1,5 @@
-diff -up nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c.old nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c
---- nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c.old	2008-02-26 12:52:02.000000000 +0100
-+++ nspluginwrapper-1.1.2/plugin-config-1.9/src/plugin-config.c	2008-10-17 12:18:39.000000000 +0200
+--- nspluginwrapper-1.1.0/plugin-config-1.9/src/plugin-config.c.old	2008-02-26 12:52:02.000000000 +0100
++++ nspluginwrapper-1.1.0/plugin-config-1.9/src/plugin-config.c	2008-10-17 12:18:39.000000000 +0200
 @@ -785,6 +785,8 @@ void configure(void)
    cfg.action = A_CHECK;