rpms/beagle/devel beagle-0.2.3-security-fix.patch, NONE, 1.1 beagle.spec, 1.45, 1.46 sources, 1.9, 1.10

Tue Mar 21 15:37:06 UTC 2006

Author: alexl

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

Modified Files:
	beagle.spec sources 
Added Files:
	beagle-0.2.3-security-fix.patch 
Log Message:
Update from fc5


beagle-0.2.3-security-fix.patch:
 ImLogViewer/beagle-imlogviewer.in |    7 -------
 beagled/beagled-index-helper.in   |   33 ++-------------------------------
 beagled/beagled.in                |   32 --------------------------------
 beagled/wrapper.in                |   17 -----------------
 bludgeon/bludgeon.in              |   14 --------------
 search/beagle-search.in           |    6 ------
 tools/beagle-index-info           |    4 ----
 tools/beagle-ping                 |    4 ----
 tools/beagle-status               |    4 ----
 tools/wrapper.in                  |    7 -------
 10 files changed, 2 insertions(+), 126 deletions(-)

--- NEW FILE beagle-0.2.3-security-fix.patch ---
--- beagle-0.2.3/beagled/beagled.in.security-fix	2006-03-03 20:13:30.000000000 +0100
+++ beagle-0.2.3/beagled/beagled.in	2006-03-21 14:40:51.000000000 +0100
@@ -1,36 +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
-
-    # Ditto BEAGLE_BACKEND_PATH.
-    if [ -n "$BEAGLE_BACKEND_PATH" ]; then
-	export BEAGLE_BACKEND_PATH=".:$BEAGLE_BACKEND_PATH"
-    else
-	export BEAGLE_BACKEND_PATH="."
-    fi
-else
-
     # Otherwise default to running in the background
     fg_default=0
 
@@ -39,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"
 
--- beagle-0.2.3/beagled/wrapper.in.security-fix	2006-03-21 14:47:37.000000000 +0100
+++ beagle-0.2.3/beagled/wrapper.in	2006-03-21 14:47:47.000000000 +0100
@@ -1,27 +1,10 @@
 #!@bash@
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
-    THIS_PATH="../Util:../BeagleClient:."
-    THIS_EXE="./@target@"
-
-    export MONO_PATH="../Util:../BeagleClient:$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
     THIS_PATH="@pkglibdir@"
     THIS_EXE="@pkglibdir@/@target@"
 
     export MONO_PATH="@pkglibdir@:$MONO_PATH"
     export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-fi
 
 MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a @wrapper@ mono --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.3/beagled/beagled-index-helper.in.security-fix	2006-03-03 20:13:30.000000000 +0100
+++ beagle-0.2.3/beagled/beagled-index-helper.in	2006-03-21 14:40:51.000000000 +0100
@@ -1,36 +1,7 @@
 #!@bash@
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
-    THIS_PATH="../Util:../BeagleClient:."
-    THIS_EXE="./@target@"
-
-    export MONO_PATH="../Util:../BeagleClient:$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
-    THIS_PATH="@pkglibdir@"
-    THIS_EXE="@pkglibdir@/@target@"
-fi
-
-if [ -n "$_GET_ON_THE_HEAP_BUDDY_BANDWAGON" ]; then
-   n=1
-   while [ -e $BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n ]; do
-	 n=$(($n+1))
-   done	
-   MONO_EXTRA_ARGS="--profile=heap-buddy:$BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n $MONO_EXTRA_ARGS"
-fi
-
-if [ -n "$BEAGLE_DEBUG_FLAG_IS_SET" ]; then
-   MONO_EXTRA_ARGS="--debug $MONO_EXTRA_ARGS"
-fi
+THIS_PATH="@pkglibdir@"
+THIS_EXE="@pkglibdir@/@target@"
 
 export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX"
 export MONO_PATH="$THIS_PATH:$MONO_PATH"
--- beagle-0.2.3/ImLogViewer/beagle-imlogviewer.in.security-fix	2006-03-21 14:49:53.000000000 +0100
+++ beagle-0.2.3/ImLogViewer/beagle-imlogviewer.in	2006-03-21 14:53:24.000000000 +0100
@@ -1,15 +1,8 @@
 #!/bin/sh
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
-    THIS_PATH="../Util:../images:../Lucene.Net"
-    THIS_EXE="./@target@"
-    export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH"
-else
     THIS_PATH="@pkglibdir@"
     THIS_EXE="@pkglibdir@/@target@"
     export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-fi
 
 MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@"
 
--- beagle-0.2.3/tools/beagle-index-info.security-fix	2006-03-21 14:56:02.000000000 +0100
+++ beagle-0.2.3/tools/beagle-index-info	2006-03-21 14:56:21.000000000 +0100
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-if [ -x "./beagle-info" ]; then
-    CMD="./beagle-info"
-else
     CMD="beagle-info"
-fi
 
 exec -a beagle-index-info $CMD --index-info
--- beagle-0.2.3/tools/wrapper.in.security-fix	2006-03-21 14:57:44.000000000 +0100
+++ beagle-0.2.3/tools/wrapper.in	2006-03-21 14:57:50.000000000 +0100
@@ -1,14 +1,7 @@
 #!@bash@
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
-    THIS_PATH="../Util:../BeagleClient:../beagled"
-    THIS_EXE="./@target@"
-    THIS_FILTERS="../Filters"
-else
     THIS_PATH="@pkglibdir@:@libdir@"
     THIS_EXE="@pkglibdir@/@target@"
-fi
 
 if [ -z "$BEAGLE_MONO_RUNTIME" ]; then
    export BEAGLE_MONO_RUNTIME="mono"
--- beagle-0.2.3/tools/beagle-ping.security-fix	2006-03-21 14:56:50.000000000 +0100
+++ beagle-0.2.3/tools/beagle-ping	2006-03-21 14:56:57.000000000 +0100
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-if [ -x "./beagle-info" ]; then
-    CMD="./beagle-info"
-else
     CMD="beagle-info"
-fi
 
 exec -a beagle-ping $CMD --daemon-version
--- beagle-0.2.3/tools/beagle-status.security-fix	2006-03-21 14:57:14.000000000 +0100
+++ beagle-0.2.3/tools/beagle-status	2006-03-21 14:57:23.000000000 +0100
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-if [ -x "./beagle-info" ]; then
-    CMD="./beagle-info"
-else
     CMD="beagle-info"
-fi
 
 while [ 1 ]; do
     str=`$CMD --status | head -n 20`
--- beagle-0.2.3/bludgeon/bludgeon.in.security-fix	2006-03-21 14:48:42.000000000 +0100
+++ beagle-0.2.3/bludgeon/bludgeon.in	2006-03-21 14:48:54.000000000 +0100
@@ -1,18 +1,5 @@
 #!@bash@
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
-    THIS_PATH="../Util:../BeagleClient:."
-    THIS_EXE="./@target@"
-
-    export BEAGLED_COMMAND="./beagled.dummy"
-
-    export MONO_PATH="../Util:../BeagleClient:$MONO_PATH"
-    export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH"
-
-    export BEAGLE_FILTER_PATH="../Filters"
-
-else
     THIS_PATH="@pkglibdir@"
     THIS_EXE="@pkglibdir@/@target@"
 
@@ -20,7 +7,6 @@
 
     export MONO_PATH="@pkglibdir@:$MONO_PATH"
     export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-fi
 
 if [ -z "$BEAGLE_MONO_RUNTIME" ]; then
    BEAGLE_MONO_RUNTIME="mono"
--- beagle-0.2.3/search/beagle-search.in.security-fix	2006-03-21 15:25:35.000000000 +0100
+++ beagle-0.2.3/search/beagle-search.in	2006-03-21 15:26:04.000000000 +0100
@@ -1,10 +1,4 @@
 #!/bin/sh
 
-if [ -f Search.exe -a -f ../glue/.libs/libbeagleuiglue.so ]; then
-    export LD_LIBRARY_PATH="../glue/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-    export MONO_PATH="../BeagleClient:../images:../Util${MONO_PATH+:MONO_PATH}"
-    mono --debug $MONO_EXTRA_ARGS Search.exe "$@"
-else
     export LD_LIBRARY_PATH="@PKGLIBDIR@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
     mono --debug $MONO_EXTRA_ARGS @PKGLIBDIR@/Search.exe "$@"
-fi


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- beagle.spec	8 Mar 2006 15:23:21 -0000	1.45
+++ beagle.spec	21 Mar 2006 15:37:04 -0000	1.46
@@ -1,6 +1,6 @@
 Name:           beagle
-Version:        0.2.2
-Release:        3
+Version:        0.2.3
+Release:        5
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -24,8 +24,7 @@
 BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
 Requires: zip unzip sed grep mono-core poppler-utils
-Patch0: beagle-0.2.2-security-fix.patch
-Patch1: beagle-0.2.2-textcache-crash.patch
+Patch0: beagle-0.2.3-security-fix.patch
 Patch2: beagle-0.2.1-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
 Patch4: beagle-0.2.2-crawl-system-cron.patch
@@ -63,7 +62,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .security-fix
-%patch1 -p1 -b .textcache-crash
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
 %patch4 -p1 -b .crawl-system-cron
@@ -140,7 +138,7 @@
 %define beagle_user_uid 58
 
 /usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || :
-/usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/false -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
+/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
 
 %post 
 if rpm -q firefox > /dev/null; then
@@ -214,6 +212,24 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Tue Mar 21 2006 Alexander Larsson <alexl at redhat.com> 0.2.3-5
+- Rebuild fc5 update in rawhide
+
+* Tue Mar 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.3-4
+- Remove more instances of wrapper scripts starting apps in cwd.
+  Fixes bug #185981, and CVE-2006-1296
+
+* Fri Mar 17 2006 Ray Strode <rstrode at redhat.com> - 0.2.3-3
+- use /sbin/nologin instead of /bin/nologin for beagle user
+  shell
+
+* Fri Mar 17 2006 Ray Strode <rstrode at redhat.com> - 0.2.3-2
+- use /bin/nologin instead of /bin/false for beagle user
+  shell
+
+* Fri Mar 17 2006 Ray Strode <rstrode at redhat.com> - 0.2.3-1
+- Update to 0.2.3
+
 * Wed Mar  8 2006 Ray Strode <rstrode at redhat.com> - 0.2.2-3
 - turn off beagle by default to limit the severity of
   bug 183898


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Mar 2006 15:54:55 -0000	1.9
+++ sources	21 Mar 2006 15:37:04 -0000	1.10
@@ -1,3 +1,3 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
 777250265dc910964f5acd9da29cc64c  beagle-crawl-system.cron
-d8c4765a30b9bf989a769f4337f35b3f  beagle-0.2.2.tar.bz2
+4519156a909e8371c59454cab882c616  beagle-0.2.3.tar.bz2


