rpms/beagle/devel beagle-0.2.0-security-fix.patch, NONE, 1.1 beagle.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17559

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.2.0-security-fix.patch 
Log Message:
- don't blindly run beagled in current working directory 
  (bug 177675)


beagle-0.2.0-security-fix.patch:
 beagled.in |   25 -------------------------
 1 files changed, 25 deletions(-)

--- NEW FILE beagle-0.2.0-security-fix.patch ---
--- beagle-0.2.0/beagled/beagled.in.security-fix	2006-01-31 14:42:48.000000000 -0500
+++ beagle-0.2.0/beagled/beagled.in	2006-01-31 14:44:41.000000000 -0500
@@ -1,29 +1,5 @@
 #!@bash@
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
-
-    # When we run uninstalled, run in the foreground by default.
-    fg_default=1
-
-    TARGET_EXE="./@target@"
-
-    export _BEAGLED_INDEX_HELPER_PATH="."
-
-    # The stuff in webserver, Tiles and images is only needed when
-    # web services are enabled.
-    export MONO_PATH="../Util:../BeagleClient:./webserver:../Tiles:../images:$MONO_PATH"
-
-    export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH"
-
-    # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path".
-    if [ -n "$BEAGLE_FILTER_PATH" ]; then
-	export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH"
-    else
-	export BEAGLE_FILTER_PATH="../Filters"
-    fi
-else
-
     # Otherwise default to running in the background
     fg_default=0
 
@@ -32,7 +8,6 @@
     export _BEAGLED_INDEX_HELPER_PATH="@pkglibdir@"
     export MONO_PATH="@pkglibdir@:$MONO_PATH"
     export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-fi
 
 export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX"
 


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- beagle.spec	24 Jan 2006 16:58:56 -0000	1.18
+++ beagle.spec	31 Jan 2006 19:46:55 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.0
-Release:        3
+Release:        4
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -17,6 +17,8 @@
 BuildRequires:  libXScrnSaver-devel
 Requires: sqlite2 zip mono-core poppler-utils
 
+Patch0: beagle-0.2.0-security-fix.patch
+
 # Mono only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
 
@@ -49,6 +51,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .security-fix
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -142,7 +145,11 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
-* Tue Jan 24 2006 Than Ngo <than at redhat.com> 0.2.0-3 
+* Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> 0.2.0-4 
+- don't blindly run beagled in current working directory 
+  (bug 177675)
+
+ * Tue Jan 24 2006 Than Ngo <than at redhat.com> 0.2.0-3 
 - added --add-only-show-in=gnome to the desktop-file-install calls
  
 * Tue Jan 24 2006 Than Ngo <than at redhat.com> 0.2.0-2