rpms/beagle/devel beagle-0.2.1-spew.patch, NONE, 1.1 beagle-0.2.0-security-fix.patch, 1.1, 1.2 beagle.spec, 1.34, 1.35
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 24 06:34:35 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31510
Modified Files:
beagle-0.2.0-security-fix.patch beagle.spec
Added Files:
beagle-0.2.1-spew.patch
Log Message:
Fix some issues
beagle-0.2.1-spew.patch:
BeagleDaemon.cs | 2 +-
IndexHelper/IndexHelper.cs | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
--- NEW FILE beagle-0.2.1-spew.patch ---
--- beagle-0.2.1/beagled/IndexHelper/IndexHelper.cs.spew 2006-02-24 01:19:59.000000000 -0500
+++ beagle-0.2.1/beagled/IndexHelper/IndexHelper.cs 2006-02-24 01:20:35.000000000 -0500
@@ -59,15 +59,13 @@
bool run_by_hand = (Environment.GetEnvironmentVariable ("BEAGLE_RUN_HELPER_BY_HAND") != null);
bool log_in_fg = (Environment.GetEnvironmentVariable ("BEAGLE_LOG_IN_THE_FOREGROUND_PLEASE") != null);
- // FIXME: We always turn on full debugging output! We are still
- // debugging this code, after all...
- //bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
+ bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
last_activity = DateTime.Now;
Log.Initialize (PathFinder.LogDir,
"IndexHelper",
- //debug ? LogLevel.Debug : LogLevel.Warn,
+ debug ? LogLevel.Debug : LogLevel.Warn,
LogLevel.Debug,
run_by_hand || log_in_fg);
--- beagle-0.2.1/beagled/BeagleDaemon.cs.spew 2006-02-24 01:26:56.000000000 -0500
+++ beagle-0.2.1/beagled/BeagleDaemon.cs 2006-02-24 01:28:44.000000000 -0500
@@ -377,7 +377,7 @@
// FIXME: We always turn on full debugging output! We are still
// debugging this code, after all...
//arg_debug ? LogLevel.Debug : LogLevel.Warn,
- LogLevel.Debug,
+ LogLevel.Warn,
arg_fg);
Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
beagle-0.2.0-security-fix.patch:
beagled-index-helper.in | 33 ++-------------------------------
beagled.in | 25 -------------------------
2 files changed, 2 insertions(+), 56 deletions(-)
Index: beagle-0.2.0-security-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.0-security-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beagle-0.2.0-security-fix.patch 31 Jan 2006 19:46:55 -0000 1.1
+++ beagle-0.2.0-security-fix.patch 24 Feb 2006 06:34:29 -0000 1.2
@@ -1,5 +1,5 @@
---- 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
+--- beagle-0.2.1/beagled/beagled.in.security-fix 2005-12-06 16:17:29.000000000 -0500
++++ beagle-0.2.1/beagled/beagled.in 2006-02-21 15:00:39.000000000 -0500
@@ -1,29 +1,5 @@
#!@bash@
@@ -38,3 +38,44 @@
export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX"
+--- beagle-0.2.1/beagled/beagled-index-helper.in.security-fix 2006-02-24 01:14:07.000000000 -0500
++++ beagle-0.2.1/beagled/beagled-index-helper.in 2006-02-24 01:15:05.000000000 -0500
+@@ -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"
Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- beagle.spec 22 Feb 2006 16:28:22 -0000 1.34
+++ beagle.spec 24 Feb 2006 06:34:29 -0000 1.35
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.2.1
-Release: 11
+Release: 12
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
@@ -27,6 +27,7 @@
Patch0: beagle-0.2.0-security-fix.patch
Patch1: beagle-0.2.1-sqlite3.patch
Patch2: beagle-0.2.1-crawl.patch
+Patch3: beagle-0.2.1-spew.patch
# Mono only available on these:
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -63,6 +64,7 @@
%patch0 -p1 -b .security-fix
%patch1 -p1 -b .sqlite3
%patch2 -p1 -b .crawl
+%patch3 -p1 -b .spew
%build
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -142,39 +144,41 @@
# install the firefox extension
# note that this code is duplicated below in a trigger
latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
- cd %{_libdir}/firefox-$latest/extensions
- mkdir beagle-extension
- unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
- id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
- if [ -e "$id" ]; then
- rm -rf beagle-extension
- else
- mv beagle-extension "$id"
+ if [ -d %{_libdir}/firefox-$latest/extensions ]; then
+ cd %{_libdir}/firefox-$latest/extensions
+ mkdir beagle-extension
+ unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
+ id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
+ if [ -e "$id" ]; then
+ rm -rf beagle-extension
+ else
+ mv beagle-extension "$id"
+ fi
fi
fi
-
%clean
rm -rf $RPM_BUILD_ROOT
%triggerin -- firefox
# install the firefox extension
latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
-if [ -d /usr/lib64 ]; then
+if [ -d /usr/lib64/firefox-$latest/extensions ]; then
libdir=/usr/lib64
else
libdir=/usr/lib
fi
-cd $libdir/firefox-$latest/extensions
-mkdir beagle-extension
-unzip -q -d beagle-extension $libdir/beagle/beagle.xpi
-id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
-if [ -e "$id" ]; then
- rm -rf beagle-extension
-else
- mv beagle-extension "$id"
+if [ -f $libdir/beagle/beagle.xpi ]; then
+ cd $libdir/firefox-$latest/extensions
+ mkdir beagle-extension
+ unzip -q -d beagle-extension $libdir/beagle/beagle.xpi
+ id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
+ if [ -e "$id" ]; then
+ rm -rf beagle-extension
+ else
+ mv beagle-extension "$id"
+ fi
fi
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README
@@ -207,6 +211,11 @@
%{_prefix}/lib/python*/site-packages/beagle.so
%changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-12
+- Remove more "run from ." nonsense (#182709)
+- Don't spew tons of debug output (#182660)
+- Try to make the trigger more robust (#182679)
+
* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-11
- Silence %%post
More information about the fedora-cvs-commits
mailing list