packages: mozilla-firefox-bin/mozilla-firefox-bin.spec, mozilla-firefox-bin...

[glen]

Author: glen                         Date: Wed Aug 18 07:42:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid shell childs when running in non-debug mode

---- Files affected:
packages/mozilla-firefox-bin:
   mozilla-firefox-bin.spec (1.63 -> 1.64) , nochilds.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.spec
diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.63 packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.64
--- packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.63	Wed Aug 18 09:22:15 2010
+++ packages/mozilla-firefox-bin/mozilla-firefox-bin.spec	Wed Aug 18 09:42:05 2010
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
 Version:	3.6.8
-Release:	0.3
+Release:	0.4
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2
@@ -25,6 +25,7 @@
 Source2:	%{name}.sh
 Patch0:		%{name}-agent.patch
 Patch1:		%{name}-ti-agent.patch
+Patch2:		nochilds.patch
 URL:		http://www.mozilla.org/projects/firefox/
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	zip
@@ -62,12 +63,14 @@
 myślą o zgodności ze standardami, wydajnością i przenośnością.
 
 %prep
-%setup -q -n %{realname}
+%setup -qcT
+%{__tar} jxf %{SOURCE0} --strip-components=1
 %if "%{pld_release}" == "th"
 %patch0 -p0
 %endif
 %if "%{pld_release}" == "ti"
 %patch1 -p0
+%patch2 -p1
 %endif
 
 %install
@@ -165,6 +168,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2010/08/18 07:42:05  glen
+- avoid shell childs when running in non-debug mode
+
 Revision 1.63  2010/08/18 07:22:15  glen
 - drop pkill, its too evil this way (kills all processes from system which match proc name), like:
   13875 pts/3 T 0:00 vim /usr/lib/mozilla-firefox-bin/run-mozilla.sh

================================================================
Index: packages/mozilla-firefox-bin/nochilds.patch
diff -u /dev/null packages/mozilla-firefox-bin/nochilds.patch:1.1
--- /dev/null	Wed Aug 18 09:42:10 2010
+++ packages/mozilla-firefox-bin/nochilds.patch	Wed Aug 18 09:42:05 2010
@@ -0,0 +1,27 @@
+--- mozilla-firefox-bin-3.6.8/firefox	2010-07-23 01:31:13.000000000 +0300
++++ mozilla-firefox-bin-3.6.8/firefox	2010-08-18 10:26:59.365912397 +0300
+@@ -135,8 +135,11 @@
+ if [ $debugging = 1 ]
+ then
+   echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
++  "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++else
++  exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++  # NORETURN
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+ exitcode=$?
+ 
+ exit $exitcode
+--- mozilla-firefox-bin-3.6.8/run-mozilla.sh	2010-07-23 01:31:13.000000000 +0300
++++ mozilla-firefox-bin-3.6.8/run-mozilla.sh	2010-08-18 10:24:42.485849818 +0300
+@@ -140,7 +140,8 @@
+ 	##
+ 	## Run the program
+ 	##
+-	"$prog" ${1+"$@"}
++	exec "$prog" ${1+"$@"}
++	# NORETURN
+ 	exitcode=$?
+ }
+ ##########################################################################
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.spec?r1=1.63&r2=1.64&f=u