rpms/crm114/devel crm114-tre.patch,NONE,1.1 crm114.spec,1.11,1.12
Dominik Mierzejewski
rathann at fedoraproject.org
Sun Dec 6 13:49:10 UTC 2009
Author: rathann
Update of /cvs/pkgs/rpms/crm114/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2805
Modified Files:
crm114.spec
Added Files:
crm114-tre.patch
Log Message:
* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.12.20090807
- included missing shuffle.crm (rhbz#520397)
- rebuilt against new tre
- improved Summary:
crm114-tre.patch:
crm114_sysincludes.h | 2 +-
crmregex_tre.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
--- NEW FILE crm114-tre.patch ---
diff -up crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h.tre crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h
--- crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h.tre 2009-08-07 17:22:37.000000000 +0200
+++ crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h 2009-09-20 15:56:23.000000000 +0200
@@ -27,7 +27,7 @@
#include <sys/types.h>
// Only TRE regex library is currently supported
-#include <tre/regex.h>
+#include <tre/tre.h>
// Normally declared from tre/regex.h
//#ifndef REG_LITERAL
diff -up crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c.tre crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c
--- crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c.tre 2009-08-07 17:22:37.000000000 +0200
+++ crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c 2009-09-20 15:59:11.000000000 +0200
@@ -90,7 +90,7 @@ int crm_regcomp (regex_t *preg, char *re
// matches the same thing).
if (regex_len == 0)
{
- return (regncomp (preg, "()", 2, cflags));
+ return (tre_regncomp (preg, "()", 2, cflags));
};
// Are we cacheing compiled regexes? Maybe not...
@@ -99,7 +99,7 @@ int crm_regcomp (regex_t *preg, char *re
if (internal_trace)
fpe_regex("compiling regex ", regex, regex_len, "\n");
- return ( regncomp (preg, regex, regex_len, cflags));
+ return ( tre_regncomp (preg, regex, regex_len, cflags));
#else // !CRM_REGEX_CACHESIZE == 0
@@ -164,7 +164,7 @@ int crm_regcomp (regex_t *preg, char *re
new.regex_len = regex_len;
new.cflags = cflags;
new.status =
- regncomp (&new.reg, new.regex, new.regex_len, new.cflags);
+ tre_regncomp (&new.reg, new.regex, new.regex_len, new.cflags);
// i is the bucket to throw away, if any
// i may or may not be where new stuff will go
@@ -172,7 +172,7 @@ int crm_regcomp (regex_t *preg, char *re
{
if (internal_trace)
fpe_bucket("discarding ", i);
- regfree (®ex_cache[i].reg);
+ tre_regfree (®ex_cache[i].reg);
free (regex_cache[i].regex);
}
}
@@ -223,7 +223,7 @@ int crm_regexec ( regex_t *preg, char *s
if (aux_string == NULL
|| strlen (aux_string) < 1)
{
- return (regnexec (preg, string, string_len, nmatch, pmatch, eflags));
+ return (tre_regnexec (preg, string, string_len, nmatch, pmatch, eflags));
}
else
{
@@ -247,7 +247,7 @@ int crm_regexec ( regex_t *preg, char *s
pblock.cost_del);
// now we can run the actual match
- i = reganexec (preg, string, string_len, &mblock, pblock, eflags);
+ i = tre_reganexec (preg, string, string_len, &mblock, pblock, eflags);
if (user_trace)
fprintf (stderr, "approximate Regex match returned %d .\n", i);
return (i);
@@ -259,7 +259,7 @@ size_t crm_regerror (int errorcode, rege
size_t errbuf_size)
{
- return (regerror (errorcode, preg, errbuf, errbuf_size));
+ return (tre_regerror (errorcode, preg, errbuf, errbuf_size));
};
void crm_regfree (regex_t *preg)
@@ -269,7 +269,7 @@ void crm_regfree (regex_t *preg)
// till and unless we decache, so crm_regfree is a noop.
return;
#else // !CRM_REGEX_CACHESIZE > 0
- return (regfree (preg));
+ return (tre_regfree (preg));
#endif // !CRM_REGEX_CACHESIZE > 0
};
Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- crm114.spec 23 Aug 2009 16:13:07 -0000 1.11
+++ crm114.spec 6 Dec 2009 13:49:09 -0000 1.12
@@ -1,17 +1,18 @@
%define cvsver 20090807
%define codename BlameThorstenAndJenny
-Summary: CRM114 Bayesian Spam Detector
+Summary: Controllable Regex Mutilator: multi-method content classifier and filter
Name: crm114
Version: 0
-Release: 1.11.%{cvsver}%{?dist}
+Release: 1.12.%{cvsver}%{?dist}
URL: http://crm114.sourceforge.net/
License: GPLv3
Group: Applications/Text
Source0: http://crm114.sourceforge.net/tarballs/%{name}-%{cvsver}-%{codename}.src.tar.gz
Patch0: %{name}-rpm.patch
+Patch1: %{name}-tre.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: tre-devel
+BuildRequires: tre-devel >= 0.8.0
%description
CRM114 is a system to examine incoming e-mail, system log streams,
@@ -32,6 +33,7 @@ Major Emacs mode for editing crm114 scri
%prep
%setup -q -n %{name}-%{cvsver}-%{codename}.src
%patch0 -p1 -b .r
+%patch1 -p1 -b .tre
chmod 644 mailfilter.cf
%build
@@ -45,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},emacs/site-lisp}}
make DESTDIR=$RPM_BUILD_ROOT INSTALLFLAGS="-m 755 -p" install
install -pm 755 mail{filter,reaver,trainer}.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
-install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
+install -pm 644 maillib.crm shuffle.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
%check
make megatest
@@ -61,6 +63,11 @@ make megatest
%{_datadir}/emacs/site-lisp/*.el
%changelog
+* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.12.20090807
+- included missing shuffle.crm (rhbz#520397)
+- rebuilt against new tre
+- improved Summary:
+
* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.11.20090807
- updated to 20090807 "BlameThorstenAndJenny"
- dropped upstreamed patch hunks, rebased patch
More information about the fedora-extras-commits
mailing list