Hello community, here is the log from the commit of package imapfilter checked in at Wed Oct 3 00:57:26 CEST 2007. -------- --- imapfilter/imapfilter.changes 2007-07-31 08:11:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/imapfilter/imapfilter.changes 2007-09-28 08:54:17.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Sep 28 08:49:44 CEST 2007 - mskibbe@suse.de + +- update to version 2.0.4 which + * Bug fix; the send_query() method didn't return the special + form of table that the rest of the searching methods did. + * An additional searching method has been added to search for + keyword flags set. + * A new variable that was added to the Makefile makes it possible + to set an alternative environment for the installation path. +- delete obsolete patches + +------------------------------------------------------------------- Old: ---- imapfilter-1.2.1-makeinstall.patch imapfilter-2.0.3.tar.bz2 imapfilter-lua.patch New: ---- imapfilter-2.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imapfilter.spec ++++++ --- /var/tmp/diff_new_pack.X13336/_old 2007-10-03 00:57:13.000000000 +0200 +++ /var/tmp/diff_new_pack.X13336/_new 2007-10-03 00:57:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package imapfilter (Version 2.0.3) +# spec file for package imapfilter (Version 2.0.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,15 +14,13 @@ BuildRequires: lua-devel openssl-devel pcre-devel pkgconfig Requires: lua-libs >= 5.1 Summary: a mail filtering utility -Version: 2.0.3 +Version: 2.0.4 Release: 1 License: X11/MIT Group: Productivity/Networking/Email/Utilities Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -URL: http://imapfilter.hellug.gr -Patch1: %{name}-1.2.1-makeinstall.patch -Patch2: imapfilter-lua.patch +Url: http://imapfilter.hellug.gr %description IMAPFilter is a mail filtering utility. It connects to remote mail @@ -43,11 +41,9 @@ %prep %setup -%patch1 -%patch2 %build -./configure -d /usr -b %{_bindir} -m %{_mandir} -r %{buildroot} +./configure -d /usr -b %{_bindir} -m %{_mandir} make MYCFLAGS="$RPM_OPT_FLAGS" %install @@ -63,8 +59,16 @@ %{_datadir}/imapfilter/auxiliary.lua %{_mandir}/man1/imapfilter.1.gz %{_mandir}/man5/imapfilter_config.5.gz - %changelog +* Fri Sep 28 2007 - mskibbe@suse.de +- update to version 2.0.4 which + * Bug fix; the send_query() method didn't return the special + form of table that the rest of the searching methods did. + * An additional searching method has been added to search for + keyword flags set. + * A new variable that was added to the Makefile makes it possible + to set an alternative environment for the installation path. +- delete obsolete patches * Tue Jul 31 2007 - mskibbe@suse.de - update to version 2.0.3 which: * New, more powerful, feature rich and yet simpler configuration ++++++ imapfilter-2.0.3.tar.bz2 -> imapfilter-2.0.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/imapfilter-2.0.3/configure new/imapfilter-2.0.4/configure --- old/imapfilter-2.0.3/configure 2007-06-30 22:38:47.000000000 +0200 +++ new/imapfilter-2.0.4/configure 2007-09-28 00:03:58.000000000 +0200 @@ -2,10 +2,10 @@ # Default values -destdir="/usr/local" -bindir="$destdir/bin" -sharedir="$destdir/share/imapfilter" -mandir="$destdir/man" +prefix="/usr/local" +bindir="$prefix/bin" +sharedir="$prefix/share/imapfilter" +mandir="$prefix/man" ssltls="yes" crammd5="yes" @@ -27,14 +27,14 @@ # Get options and arguments -while getopts "d:b:s:m:o:h" opt +while getopts "d:p:b:s:m:o:h" opt do case $opt in - d) - destdir=$OPTARG - bindir=$destdir/bin - sharedir=$destdir/share/imapfilter - mandir=$destdir/man + d | p) + prefix=$OPTARG + bindir=$prefix/bin + sharedir=$prefix/share/imapfilter + mandir=$prefix/man ;; b) bindir=$OPTARG @@ -63,12 +63,12 @@ h | *) cat << EOF Usage: - configure [-h] [-d destdir] [-b bindir] [-s sharedir] [-m mandir] + configure [-h] [-p prefix] [-b bindir] [-s sharedir] [-m mandir] [-o option=argument] Description: -h This brief usage and description message. - -d destdir Installation path for program's files [$destdir] + -p prefix Installation path for program's files [$prefix] -b bindir Installation path for binaries [$bindir] -s sharedir Installation path for libraries [$sharedir] -m mandir Installation path for manual pages [$mandir] @@ -88,7 +88,7 @@ # Print values cat << EOF -Destination directory: $destdir +Installation directory: $prefix Binaries directory: $bindir Architecture independent libraries: $sharedir Manual pages directory: $mandir @@ -140,7 +140,7 @@ mv -f Makefile Makefile~ cat > Makefile << EOF -DESTDIR = $destdir +DESTDIR = BINDIR = $bindir SHAREDIR = $sharedir MANDIR = $mandir @@ -191,47 +191,52 @@ imapfilter.o: version.h install: \$(BIN) - if test ! -d \$(BINDIR); then mkdir -p \$(BINDIR); fi - cp -f \$(BIN) \$(BINDIR) && chmod 0755 \$(BINDIR)/\$(BIN) - if test ! -d \$(SHAREDIR); then mkdir -p \$(SHAREDIR); fi - cp -f \$(COMMON_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(COMMON_LUA) - cp -f \$(SET_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(SET_LUA) - cp -f \$(REGEX_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(REGEX_LUA) - cp -f \$(ACCOUNT_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(ACCOUNT_LUA) - cp -f \$(MAILBOX_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(MAILBOX_LUA) - cp -f \$(MESSAGE_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(MESSAGE_LUA) - cp -f \$(OPTIONS_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(OPTIONS_LUA) - cp -f \$(AUXILIARY_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(AUXILIARY_LUA) - cp -f \$(DEPRECATED_LUA) \$(SHAREDIR) && \\ - chmod 0644 \$(SHAREDIR)/\$(DEPRECATED_LUA) - if test ! -d \$(MANDIR)/man1; then mkdir -p \$(MANDIR)/man1; fi - cp -f \$(MAN_BIN) \$(MANDIR)/man1 && \\ - chmod 0644 \$(MANDIR)/man1/\$(MAN_BIN) - if test ! -d \$(MANDIR)/man5; then mkdir -p \$(MANDIR)/man5; fi - cp -f \$(MAN_CONFIG) \$(MANDIR)/man5 && \\ - chmod 0644 \$(MANDIR)/man5/\$(MAN_CONFIG) + if test ! -d \$(DESTDIR)\$(BINDIR); then \\ + mkdir -p \$(DESTDIR)\$(BINDIR); fi + cp -f \$(BIN) \$(DESTDIR)\$(BINDIR) && \\ + chmod 0755 \$(DESTDIR)\$(BINDIR)/\$(BIN) + if test ! -d \$(DESTDIR)\$(SHAREDIR); then \\ + mkdir -p \$(DESTDIR)\$(SHAREDIR); fi + cp -f \$(COMMON_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(COMMON_LUA) + cp -f \$(SET_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(SET_LUA) + cp -f \$(REGEX_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(REGEX_LUA) + cp -f \$(ACCOUNT_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(ACCOUNT_LUA) + cp -f \$(MAILBOX_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(MAILBOX_LUA) + cp -f \$(MESSAGE_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(MESSAGE_LUA) + cp -f \$(OPTIONS_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(OPTIONS_LUA) + cp -f \$(AUXILIARY_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(AUXILIARY_LUA) + cp -f \$(DEPRECATED_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ + chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(DEPRECATED_LUA) + if test ! -d \$(DESTDIR)\$(MANDIR)/man1; then \\ + mkdir -p \$(DESTDIR)\$(MANDIR)/man1; fi + cp -f \$(MAN_BIN) \$(DESTDIR)\$(MANDIR)/man1 && \\ + chmod 0644 \$(DESTDIR)\$(MANDIR)/man1/\$(MAN_BIN) + if test ! -d \$(DESTDIR)\$(MANDIR)/man5; then \\ + mkdir -p \$(DESTDIR)\$(MANDIR)/man5; fi + cp -f \$(MAN_CONFIG) \$(DESTDIR)\$(MANDIR)/man5 && \\ + chmod 0644 \$(DESTDIR)\$(MANDIR)/man5/\$(MAN_CONFIG) deinstall: - rm -f \$(BINDIR)/\$(BIN) \\ - \$(SHAREDIR)/\$(COMMON_LUA) \\ - \$(SHAREDIR)/\$(SET_LUA) \\ - \$(SHAREDIR)/\$(REGEX_LUA) \\ - \$(SHAREDIR)/\$(ACCOUNT_LUA) \\ - \$(SHAREDIR)/\$(MAILBOX_LUA) \\ - \$(SHAREDIR)/\$(MESSAGE_LUA) \\ - \$(SHAREDIR)/\$(OPTIONS_LUA) \\ - \$(SHAREDIR)/\$(AUXILIARY_LUA) \\ - \$(SHAREDIR)/\$(DEPRECATED_LUA) \\ - \$(MANDIR)/man1/\$(MAN_BIN) \\ - \$(MANDIR)/man5/\$(MAN_CONFIG) + rm -f \$(DESTDIR)\$(BINDIR)/\$(BIN) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(COMMON_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(SET_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(REGEX_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(ACCOUNT_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(MAILBOX_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(MESSAGE_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(OPTIONS_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(AUXILIARY_LUA) \\ + \$(DESTDIR)\$(SHAREDIR)/\$(DEPRECATED_LUA) \\ + \$(DESTDIR)\$(MANDIR)/man1/\$(MAN_BIN) \\ + \$(DESTDIR)\$(MANDIR)/man5/\$(MAN_CONFIG) uninstall: deinstall diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/imapfilter-2.0.3/imapfilter_config.5 new/imapfilter-2.0.4/imapfilter_config.5 --- old/imapfilter-2.0.3/imapfilter_config.5 2007-06-30 22:38:47.000000000 +0200 +++ new/imapfilter-2.0.4/imapfilter_config.5 2007-09-28 00:03:58.000000000 +0200 @@ -1,4 +1,4 @@ -.Dd June 29, 2007 +.Dd September 27, 2007 .Dt IMAPFILTER_CONFIG 5 .Os .Sh NAME @@ -67,7 +67,7 @@ .Ed .Pp Available options are: -.Bl -tag +.Bl -tag -width Ds .It Va create According to the IMAP specification, when trying to write a message to a non-existent mailbox, the server must send a hint to the client, whether it @@ -147,7 +147,7 @@ An account .Vt table must have the following elements: -.Bl -tag +.Bl -tag -width Ds .It Va server The hostname of the IMAP server to connect to. It takes a .Vt string @@ -161,7 +161,7 @@ An account .Vt table can also have the following optional elements: -.Bl -tag +.Bl -tag -width Ds .It Va password User's secret keyword. If a password wasn't supplied the user will be asked to enter one interactively the first time it will be needed. It takes a @@ -445,14 +445,28 @@ Messages that have not been read. .El .Pp +The following method can be used to search for messages that have a specific +flag set: +.Pp +.Bl -tag -width Ds -compact +.It Fn has_flag keyword +Messages with the specified keyword flag +.Pq Vt string +set. +.El +.Pp The following methods can be used to search for messages based on their size: .Pp .Bl -tag -width Ds -compact .It Fn is_larger size -Messages that are larger than the size (number) in octets (bytes). +Messages that are larger than the size +.Pq Vt number +in octets (bytes). .Pp .It Fn is_smaller size -Messages that are smaller than the size (number) in octets (bytes). +Messages that are smaller than the size +.Pq Vt number +in octets (bytes). .El .Pp The following methods can be used to search for messages based on their age: @@ -688,6 +702,7 @@ messages = myaccount.mymailbox:is_recent() messages = myaccount.mymailbox:is_larger(100000) messages = myaccount.mymailbox:is_older(10) +messages = mymailbox.mymailbox:has_flag('MyFlag') messages = myaccount.mymailbox:arrived_before('01-Jan-2007') messages = myaccount.mymailbox:sent_since('01-Jan-2007') messages = myaccount.mymailbox:contain_subject('test') @@ -844,8 +859,8 @@ .Ed .Ss FETCHING .Pp -The following methods can be used to fetch parts of messages or details about -the state messages. The methods return a +The following methods can be used to fetch parts of messages. The methods +return a .Vt table, which for each message contains a .Vt string , @@ -872,21 +887,39 @@ Fetches the header fields of the .Fa messages .Pq Vt table . +.El .Pp +The following methods can be used to fetch details about the state of messages: +.Pp +.Bl -tag -width Ds -compact .It Fn fetch_flags messages Fetches the flags of the .Fa messages .Pq Vt table . +Returns a +.Vt table , +which for each message contains a +.Vt table +of +.Vt strings . .Pp .It Fn fetch_date messages Fetches the internal date of the .Fa messages .Pq Vt table . +Returns a +.Vt table +which for each message contains a +.Vt string . .Pp .It Fn fetch_size messages Fetches the size of the .Fa messages .Pq Vt table . +Returns a +.Vt table +which for each message contains a +.Vt number . .El .Pp Examples: @@ -978,7 +1011,7 @@ and .Pa sample.extend.lua . .Sh ENVIRONMENT -.Bl -tag +.Bl -tag -width Ds .It Ev HOME User's home directory. .El diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/imapfilter-2.0.3/mailbox.lua new/imapfilter-2.0.4/mailbox.lua --- old/imapfilter-2.0.3/mailbox.lua 2007-07-27 08:42:58.000000000 +0200 +++ new/imapfilter-2.0.4/mailbox.lua 2007-09-28 00:03:58.000000000 +0200 @@ -55,6 +55,53 @@ end +function Mailbox._send_query(self, criteria, charset) + _check_optional(criteria, { 'string', 'table' }) + _check_optional(charset, 'string') + + if (criteria == nil) then + criteria = '' + end + + if (charset == nil) then + charset = '' + end + + if (self._account._login_user(self._account) ~= true) then + return + end + + if (self._cached_select(self, self._account._imap, self._mailbox) ~= + true) then + return {} + end + + local query + if (type(criteria) == 'string') then + query = 'ALL ' .. criteria + else + query = _make_query(criteria) + end + + local _, results = ifcore.search(self._account._imap, query, charset) + + if (type(options) == 'table' and options.close == true) then + self._cached_close(self, self._account._imap) + end + + if (results == nil) then + return {} + end + + local t = {} + for n in string.gmatch(results, '%d+') do + table.insert(t, tonumber(n)) + end + + return t +end + + function Mailbox._flag_messages(self, mode, flags, messages) if (#messages == 0) then return @@ -426,53 +473,11 @@ function Mailbox.send_query(self, criteria, charset) - _check_optional(criteria, { 'string', 'table' }) - _check_optional(charset, 'string') - - if (criteria == nil) then - criteria = '' - end - - if (charset == nil) then - charset = '' - end - - if (self._account._login_user(self._account) ~= true) then - return - end - - if (self._cached_select(self, self._account._imap, self._mailbox) ~= - true) then - return {} - end - - local query - if (type(criteria) == 'string') then - query = 'ALL ' .. criteria - else - query = _make_query(criteria) - end - - local _, results = ifcore.search(self._account._imap, query, charset) - - if (type(options) == 'table' and options.close == true) then - self._cached_close(self, self._account._imap) - end - - if (results == nil) then - return {} - end - - local t = {} - for n in string.gmatch(results, '%d+') do - table.insert(t, tonumber(n)) - end - - return t + return Set(self._send_query(self, criteria, charset)) end function Mailbox.select_all(self) - return Set(self.send_query(self)) + return self.send_query(self) end @@ -821,116 +826,123 @@ function Mailbox.is_answered(self) - return Set(self.send_query(self, 'ANSWERED')) + return self.send_query(self, 'ANSWERED') end function Mailbox.is_deleted(self) - return Set(self.send_query(self, 'DELETED')) + return self.send_query(self, 'DELETED') end function Mailbox.is_draft(self) - return Set(self.send_query(self, 'DRAFT')) + return self.send_query(self, 'DRAFT') end function Mailbox.is_flagged(self) - return Set(self.send_query(self, 'FLAGGED')) + return self.send_query(self, 'FLAGGED') end function Mailbox.is_new(self) - return Set(self.send_query(self, 'NEW')) + return self.send_query(self, 'NEW') end function Mailbox.is_old(self) - return Set(self.send_query(self, 'OLD')) + return self.send_query(self, 'OLD') end function Mailbox.is_recent(self) - return Set(self.send_query(self, 'RECENT')) + return self.send_query(self, 'RECENT') end function Mailbox.is_seen(self) - return Set(self.send_query(self, 'SEEN')) + return self.send_query(self, 'SEEN') end function Mailbox.is_unanswered(self) - return Set(self.send_query(self, 'UNANSWERED')) + return self.send_query(self, 'UNANSWERED') end function Mailbox.is_undeleted(self) - return Set(self.send_query(self, 'UNDELETED')) + return self.send_query(self, 'UNDELETED') end function Mailbox.is_undraft(self) - return Set(self.send_query(self, 'UNDRAFT')) + return self.send_query(self, 'UNDRAFT') end function Mailbox.is_unflagged(self) - return Set(self.send_query(self, 'UNFLAGGED')) + return self.send_query(self, 'UNFLAGGED') end function Mailbox.is_unseen(self) - return Set(self.send_query(self, 'UNSEEN')) + return self.send_query(self, 'UNSEEN') end function Mailbox.is_larger(self, size) _check_required(size, 'number') - return Set(self.send_query(self, 'LARGER ' .. tostring(size))) + return self.send_query(self, 'LARGER ' .. tostring(size)) end function Mailbox.is_smaller(self, size) _check_required(size, 'number') - return Set(self.send_query(self, 'SMALLER ' .. tostring(size))) + return self.send_query(self, 'SMALLER ' .. tostring(size)) end function Mailbox.arrived_on(self, date) _check_required(date, 'string') - return Set(self.send_query(self, 'ON ' .. date)) + return self.send_query(self, 'ON ' .. date) end function Mailbox.arrived_before(self, date) _check_required(date, 'string') - return Set(self.send_query(self, 'BEFORE ' .. date)) + return self.send_query(self, 'BEFORE ' .. date) end function Mailbox.arrived_since(self, date) _check_required(date, 'string') - return Set(self.send_query(self, 'SINCE ' .. date)) + return self.send_query(self, 'SINCE ' .. date) end function Mailbox.sent_on(self, date) _check_required(date, 'string') - return Set(self.send_query(self, 'SENTON ' .. date)) + return self.send_query(self, 'SENTON ' .. date) end function Mailbox.sent_before(self, date) _check_required(date, 'string') - return Set(self.send_query(self, 'SENTBEFORE ' .. date)) + return self.send_query(self, 'SENTBEFORE ' .. date) end function Mailbox.sent_since(self, date) _check_required(date, 'string') - return Set(self.send_query(self, 'SENTSINCE ' .. date)) + return self.send_query(self, 'SENTSINCE ' .. date) end function Mailbox.is_newer(self, days) _check_required(days, 'number') - return Set(self.send_query(self, 'SINCE ' .. form_date(days))) + return self.send_query(self, 'SINCE ' .. form_date(days)) end function Mailbox.is_older(self, days) _check_required(days, 'number') - return Set(self.send_query(self, 'BEFORE ' .. form_date(days))) + return self.send_query(self, 'BEFORE ' .. form_date(days)) +end + + +function Mailbox.has_flag(self, flag) + _check_required(flag, 'string') + + return self.send_query(self, 'KEYWORD "' .. flag .. '"') end @@ -938,57 +950,56 @@ _check_required(field, 'string') _check_required(string, 'string') - return Set(self.send_query(self, 'HEADER ' .. field .. ' "' .. - string .. '"')) + return self.send_query(self, 'HEADER ' .. field .. ' "' .. string .. '"') end function Mailbox.contain_bcc(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'BCC "' .. string .. '"')) + return self.send_query(self, 'BCC "' .. string .. '"') end function Mailbox.contain_cc(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'CC "' .. string .. '"')) + return self.send_query(self, 'CC "' .. string .. '"') end function Mailbox.contain_from(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'FROM "' .. string .. '"')) + return self.send_query(self, 'FROM "' .. string .. '"') end function Mailbox.contain_subject(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'SUBJECT "' .. string .. '"')) + return self.send_query(self, 'SUBJECT "' .. string .. '"') end function Mailbox.contain_to(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'TO "' .. string .. '"')) + return self.send_query(self, 'TO "' .. string .. '"') end function Mailbox.contain_header(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'TEXT "' .. string .. '" NOT BODY "' .. - string .. '"')) + return self.send_query(self, 'TEXT "' .. string .. '" NOT BODY "' .. + string .. '"') end function Mailbox.contain_body(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'BODY "' .. string .. '"')) + return self.send_query(self, 'BODY "' .. string .. '"') end function Mailbox.contain_message(self, string) _check_required(string, 'string') - return Set(self.send_query(self, 'TEXT "' .. string .. '"')) + return self.send_query(self, 'TEXT "' .. string .. '"') end @@ -996,7 +1007,7 @@ _check_required(field, 'string') _check_required(pattern, 'string') - local messages = self.send_query(self) + local messages = self._send_query(self) local mesgs = _make_normal(messages) local fields = self._fetch_fields(self, { field }, mesgs) @@ -1047,7 +1058,7 @@ function Mailbox.match_header(self, pattern) _check_required(pattern, 'string') - local messages = self.send_query(self) + local messages = self._send_query(self) local mesgs = _make_normal(messages) local header = self._fetch_header(self, mesgs) @@ -1068,7 +1079,7 @@ function Mailbox.match_body(self, pattern) _check_required(pattern, 'string') - local messages = self.send_query(self) + local messages = self._send_query(self) local mesgs = _make_normal(messages) local body = self._fetch_body(self, mesgs) @@ -1089,7 +1100,7 @@ function Mailbox.match_message(self, pattern) _check_required(pattern, 'string') - local messages = self.send_query(self) + local messages = self._send_query(self) local mesgs = _make_normal(messages) local full = self._fetch_message(self, mesgs) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/imapfilter-2.0.3/Makefile new/imapfilter-2.0.4/Makefile --- old/imapfilter-2.0.3/Makefile 2007-06-30 22:38:47.000000000 +0200 +++ new/imapfilter-2.0.4/Makefile 2007-09-28 00:03:58.000000000 +0200 @@ -1,4 +1,4 @@ -DESTDIR = /usr/local +DESTDIR = BINDIR = /usr/local/bin SHAREDIR = /usr/local/share/imapfilter MANDIR = /usr/local/man @@ -49,47 +49,52 @@ imapfilter.o: version.h install: $(BIN) - if test ! -d $(BINDIR); then mkdir -p $(BINDIR); fi - cp -f $(BIN) $(BINDIR) && chmod 0755 $(BINDIR)/$(BIN) - if test ! -d $(SHAREDIR); then mkdir -p $(SHAREDIR); fi - cp -f $(COMMON_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(COMMON_LUA) - cp -f $(SET_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(SET_LUA) - cp -f $(REGEX_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(REGEX_LUA) - cp -f $(ACCOUNT_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(ACCOUNT_LUA) - cp -f $(MAILBOX_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(MAILBOX_LUA) - cp -f $(MESSAGE_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(MESSAGE_LUA) - cp -f $(OPTIONS_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(OPTIONS_LUA) - cp -f $(AUXILIARY_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(AUXILIARY_LUA) - cp -f $(DEPRECATED_LUA) $(SHAREDIR) && \ - chmod 0644 $(SHAREDIR)/$(DEPRECATED_LUA) - if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi - cp -f $(MAN_BIN) $(MANDIR)/man1 && \ - chmod 0644 $(MANDIR)/man1/$(MAN_BIN) - if test ! -d $(MANDIR)/man5; then mkdir -p $(MANDIR)/man5; fi - cp -f $(MAN_CONFIG) $(MANDIR)/man5 && \ - chmod 0644 $(MANDIR)/man5/$(MAN_CONFIG) + if test ! -d $(DESTDIR)$(BINDIR); then \ + mkdir -p $(DESTDIR)$(BINDIR); fi + cp -f $(BIN) $(DESTDIR)$(BINDIR) && \ + chmod 0755 $(DESTDIR)$(BINDIR)/$(BIN) + if test ! -d $(DESTDIR)$(SHAREDIR); then \ + mkdir -p $(DESTDIR)$(SHAREDIR); fi + cp -f $(COMMON_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(COMMON_LUA) + cp -f $(SET_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(SET_LUA) + cp -f $(REGEX_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(REGEX_LUA) + cp -f $(ACCOUNT_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(ACCOUNT_LUA) + cp -f $(MAILBOX_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(MAILBOX_LUA) + cp -f $(MESSAGE_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(MESSAGE_LUA) + cp -f $(OPTIONS_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(OPTIONS_LUA) + cp -f $(AUXILIARY_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(AUXILIARY_LUA) + cp -f $(DEPRECATED_LUA) $(DESTDIR)$(SHAREDIR) && \ + chmod 0644 $(DESTDIR)$(SHAREDIR)/$(DEPRECATED_LUA) + if test ! -d $(DESTDIR)$(MANDIR)/man1; then \ + mkdir -p $(DESTDIR)$(MANDIR)/man1; fi + cp -f $(MAN_BIN) $(DESTDIR)$(MANDIR)/man1 && \ + chmod 0644 $(DESTDIR)$(MANDIR)/man1/$(MAN_BIN) + if test ! -d $(DESTDIR)$(MANDIR)/man5; then \ + mkdir -p $(DESTDIR)$(MANDIR)/man5; fi + cp -f $(MAN_CONFIG) $(DESTDIR)$(MANDIR)/man5 && \ + chmod 0644 $(DESTDIR)$(MANDIR)/man5/$(MAN_CONFIG) deinstall: - rm -f $(BINDIR)/$(BIN) \ - $(SHAREDIR)/$(COMMON_LUA) \ - $(SHAREDIR)/$(SET_LUA) \ - $(SHAREDIR)/$(REGEX_LUA) \ - $(SHAREDIR)/$(ACCOUNT_LUA) \ - $(SHAREDIR)/$(MAILBOX_LUA) \ - $(SHAREDIR)/$(MESSAGE_LUA) \ - $(SHAREDIR)/$(OPTIONS_LUA) \ - $(SHAREDIR)/$(AUXILIARY_LUA) \ - $(SHAREDIR)/$(DEPRECATED_LUA) \ - $(MANDIR)/man1/$(MAN_BIN) \ - $(MANDIR)/man5/$(MAN_CONFIG) + rm -f $(DESTDIR)$(BINDIR)/$(BIN) \ + $(DESTDIR)$(SHAREDIR)/$(COMMON_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(SET_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(REGEX_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(ACCOUNT_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(MAILBOX_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(MESSAGE_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(OPTIONS_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(AUXILIARY_LUA) \ + $(DESTDIR)$(SHAREDIR)/$(DEPRECATED_LUA) \ + $(DESTDIR)$(MANDIR)/man1/$(MAN_BIN) \ + $(DESTDIR)$(MANDIR)/man5/$(MAN_CONFIG) uninstall: deinstall diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/imapfilter-2.0.3/NEWS new/imapfilter-2.0.4/NEWS --- old/imapfilter-2.0.3/NEWS 2007-07-27 09:20:33.000000000 +0200 +++ new/imapfilter-2.0.4/NEWS 2007-09-28 00:03:58.000000000 +0200 @@ -1,9 +1,20 @@ +Version 2.0.4 - 27 September 2007 +--------------------------------- +- Bug fix; the send_query() method didn't return the special form of table that + the rest of the searching methods did. +- An additional searching method has been added to search for keyword flags + set. +- A new variable that was added to the Makefile makes it possible to set an + alternative environment for the installation path. + + Version 2.0.3 - 27 July 2007 ---------------------------- - Bug fix; part of the program's functionality didn't seem to work at all (did nothing), due to problem when providing the results from searching methods to processing methods + Version 2.0.2 - 30 June 2007 ---------------------------- - Bug fix; message cache problem due to non-use of message UIDs diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/imapfilter-2.0.3/README new/imapfilter-2.0.4/README --- old/imapfilter-2.0.3/README 2007-07-27 08:44:46.000000000 +0200 +++ new/imapfilter-2.0.4/README 2007-09-28 00:03:58.000000000 +0200 @@ -1,4 +1,4 @@ -IMAPFilter Version 2.0.3 +IMAPFilter Version 2.0.4 ======================== Requirements diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/imapfilter-2.0.3/version.h new/imapfilter-2.0.4/version.h --- old/imapfilter-2.0.3/version.h 2007-07-27 08:44:09.000000000 +0200 +++ new/imapfilter-2.0.4/version.h 2007-09-28 00:03:58.000000000 +0200 @@ -3,7 +3,7 @@ /* Program's version number. */ -#define IMAPFILTER_VERSION "2.0.3" +#define IMAPFILTER_VERSION "2.0.4" /* Program's copyright. */ #define IMAPFILTER_COPYRIGHT "Copyright (c) 2001-2007 Lefteris Chatzimparmpas" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org