rpms/nspluginwrapper/F-8 plugin-config-exclude.patch, NONE, 1.1 nspluginwrapper.spec, 1.34, 1.35

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29693

Modified Files:
	nspluginwrapper.spec 
Added Files:
	plugin-config-exclude.patch 
Log Message:
Resolves: #426618

plugin-config-exclude.patch:

--- NEW FILE plugin-config-exclude.patch ---
diff -up nspluginwrapper-0.9.91.5/plugin-config-1.8/src/plugin-config.c.old nspluginwrapper-0.9.91.5/plugin-config-1.8/src/plugin-config.c
--- nspluginwrapper-0.9.91.5/plugin-config-1.8/src/plugin-config.c.old	2007-11-06 12:34:16.000000000 +0100
+++ nspluginwrapper-0.9.91.5/plugin-config-1.8/src/plugin-config.c	2008-01-22 12:15:33.000000000 +0100
@@ -171,11 +171,12 @@ int is_excluded_list(char *p_name, EXCLU
 {
   char *p_list = get_exclude_list(type);
   int ret = FALSE;
-  
+
   if(p_list) {
+    char *p_tmp = p_list;
     char *p_file = tail_get(p_name, '/');
     char *p_act;
-    while((p_act = strsep(&p_list, ":"))) {
+    while((p_act = strsep(&p_tmp, ":"))) {
       if(!fnmatch(p_act,p_file,0)) {
         ret = TRUE;
         break;


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-8/nspluginwrapper.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nspluginwrapper.spec	14 Jan 2008 13:25:31 -0000	1.34
+++ nspluginwrapper.spec	23 Jan 2008 09:27:43 -0000	1.35
@@ -14,7 +14,7 @@
 %define make_debug_package 	0
 
 # Excluded plugins
-%define exclude_list 		"libtotem-*"
+%define exclude_list 		"libtotem*:libjavaplugin*"
 
 # Target defines
 %if "%{_target_cpu}" == "i386"
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	16%{?dist}
+Release:	17%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -83,6 +83,7 @@
 Patch6:         plugin-config-setuid.patch
 Patch7:         nspluginwrapper-0.9.91.5-npviewer-gthread.patch
 Patch8:         nspluginwrapper-0.9.91.5-shutdown.patch
+Patch9:         plugin-config-exclude.patch
 License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -117,6 +118,7 @@
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 pushd %plugin_config_name
 %patch6 -p2
@@ -238,6 +240,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Wed Jan 23 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-17
+- added java to ignored plugins (#426618)
+
 * Mon Jan 14 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-16
 - fixed #426176 - Orphaned npviewer.bin processes