rpms/beagle/FC-5 beagle-0.2.5-crawl.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 beagle.spec, 1.50, 1.51 sources, 1.11, 1.12

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 21 10:50:57 UTC 2006


Author: alexl

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

Modified Files:
	.cvsignore beagle.spec sources 
Added Files:
	beagle-0.2.5-crawl.patch 
Log Message:
* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-1.fc5.1
- update to 0.2.5
- Contains fix for command line injection security problem (#189282)



beagle-0.2.5-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    2 +-
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE beagle-0.2.5-crawl.patch ---
--- beagle-0.2.5/tools/crawl-rules/crawl-applications.crawl	2006-03-22 16:09:41.000000000 +0100
+++ beagle-0.2.5/tools/crawl-rules/crawl-applications	2006-04-21 09:23:26.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" 
 
 CRAWL_RECURSIVE="yes"
 
--- beagle-0.2.5/tools/crawl-rules/crawl-documentation.crawl	2006-04-12 21:41:03.000000000 +0200
+++ beagle-0.2.5/tools/crawl-rules/crawl-documentation	2006-04-21 09:27:23.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help"
+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 
--- beagle-0.2.5/tools/Makefile.am.crawl	2006-04-19 02:30:36.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.am	2006-04-21 09:23:26.000000000 +0200
@@ -35,7 +35,6 @@
 	chmod +x $(CRAWL_WRAPPER)
 
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 
--- beagle-0.2.5/tools/Makefile.in.crawl	2006-04-20 17:57:24.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.in	2006-04-21 09:23:26.000000000 +0200
@@ -366,7 +366,6 @@
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Mar 2006 15:48:12 -0000	1.8
+++ .cvsignore	21 Apr 2006 10:50:55 -0000	1.9
@@ -1 +1,2 @@
 beagle-0.2.2.tar.bz2
+beagle-0.2.5.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- beagle.spec	8 Apr 2006 03:15:36 -0000	1.50
+++ beagle.spec	21 Apr 2006 10:50:55 -0000	1.51
@@ -1,5 +1,5 @@
 Name:           beagle
-Version:        0.2.4
+Version:        0.2.5
 Release:        1.fc5.1
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
@@ -7,7 +7,6 @@
 URL:            http://beagle-project.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:	beagle.desktop
-Source2:	beagle-crawl-system.cron
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-data mono-data-sqlite
@@ -23,9 +22,8 @@
 BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
 Requires: zip unzip sed grep mono-core poppler-utils
-Patch2: beagle-0.2.4-crawl.patch
+Patch2: beagle-0.2.5-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
-Patch4: beagle-0.2.2-crawl-system-cron.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -61,7 +59,6 @@
 %setup -q
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
-%patch4 -p1 -b .crawl-system-cron
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -87,13 +84,6 @@
 #mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart
 #cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
 
-# use anacron instead of cron, so beagle-crawl-system has 
-# a reasonable chance to run
-rm -rf $RPM_BUILD_ROOT/etc/cron.d
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-cp %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
-chmod +x $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
-
 # TODO: Isn't there a better place to install this?
 install -m 644 mozilla-extension/beagle.xpi $RPM_BUILD_ROOT%{_libdir}/beagle/
 
@@ -184,7 +174,6 @@
 %{_sysconfdir}/beagle
 %{_bindir}/*
 %{_sbindir}/*
-%{_libexecdir}/*
 %{_libdir}/pkgconfig/beagle*.pc
 %{_libdir}/beagle
 %{_datadir}/beagle
@@ -209,6 +198,10 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-1.fc5.1
+- update to 0.2.5
+- Contains fix for command line injection security problem (#189282)
+
 * Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> 0.2.4-1.fc5.1
 - Update to 0.2.4
 - Update patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Apr 2006 03:15:37 -0000	1.11
+++ sources	21 Apr 2006 10:50:55 -0000	1.12
@@ -1,3 +1,2 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
-777250265dc910964f5acd9da29cc64c  beagle-crawl-system.cron
-bd915b5f7de56c91dae2c26121c586fa  beagle-0.2.4.tar.bz2
+7a7965768643045f7e6f362f9bba1af4  beagle-0.2.5.tar.bz2




More information about the fedora-cvs-commits mailing list