Hello community,

here is the log from the commit of package imapfilter for openSUSE:Factory 
checked in at 2013-12-06 09:43:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/imapfilter (Old)
 and      /work/SRC/openSUSE:Factory/.imapfilter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "imapfilter"

Changes:
--------
--- /work/SRC/openSUSE:Factory/imapfilter/imapfilter.changes    2013-08-04 
16:49:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.imapfilter.new/imapfilter.changes       
2013-12-06 09:43:19.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Dec  5 16:52:22 UTC 2013 - a...@gmx.de
+
+- update to IMAPFilter 2.5.6 - 27 Oct 2013
+  * Possible to build again with OpenSSL older than version 1.0.1 (was a
+    requirement for the previous release due to new protocols TLS 1.1/1.2).
+  * Support for reading the configuration from the standard input stream.
+  * New makefile dist target, which can be used to create distribution 
archives. 
+
+-------------------------------------------------------------------

Old:
----
  imapfilter-2.5.5.tar.gz

New:
----
  imapfilter-2.5.6.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ imapfilter.spec ++++++
--- /var/tmp/diff_new_pack.Qn4jYh/_old  2013-12-06 09:43:19.000000000 +0100
+++ /var/tmp/diff_new_pack.Qn4jYh/_new  2013-12-06 09:43:19.000000000 +0100
@@ -21,7 +21,7 @@
 License:        MIT
 Group:          Productivity/Networking/Email/Utilities
 Url:            https://github.com/lefcha/imapfilter
-Version:        2.5.5
+Version:        2.5.6
 Release:        0
 Source:         %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ imapfilter-2.5.5.tar.gz -> imapfilter-2.5.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/imapfilter-2.5.5/Makefile 
new/imapfilter-2.5.6/Makefile
--- old/imapfilter-2.5.5/Makefile       2013-06-08 11:25:04.000000000 +0200
+++ new/imapfilter-2.5.6/Makefile       2013-10-27 23:46:05.000000000 +0100
@@ -1,2 +1,20 @@
 all install uninstall clean:
        cd src && $(MAKE) $@
+
+TAG = $(shell git describe --abbrev=0 --tags)
+VERSION = $(shell echo $(TAG) | sed s/^v//)
+FORMAT = tar.gz
+
+dist:
+       @ if [ -n "`git tag --list $(TAG)`" ]; \
+       then \
+               git archive --verbose --format=$(FORMAT) \
+               --prefix=imapfilter-$(VERSION)/ \
+               --output=imapfilter-$(VERSION).$(FORMAT) v$(VERSION); \
+               echo "Created Git archive: imapfilter-$(VERSION).$(FORMAT)"; \
+       else \
+               echo "No such tag in the Git repository: $(TAG)"; \
+       fi
+
+distclean:
+       rm -f imapfilter-*.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/imapfilter-2.5.5/NEWS new/imapfilter-2.5.6/NEWS
--- old/imapfilter-2.5.5/NEWS   2013-06-08 11:25:04.000000000 +0200
+++ new/imapfilter-2.5.6/NEWS   2013-10-27 23:46:05.000000000 +0100
@@ -1,3 +1,9 @@
+IMAPFilter 2.5.6 - 27 Oct 2013
+  - Possible to build again with OpenSSL older than version 1.0.1 (was a
+    requirement for the previous release due to new protocols TLS 1.1/1.2).
+  - Support for reading the configuration from the standard input stream.
+  - New makefile dist target, which can be used to create distribution 
archives.
+
 IMAPFilter 2.5.5 - 8 Jun 2013
   - Work-around for some servers that send an unexpected APPEND response.
   - The serial number of the certificates is taken into account, because some
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/imapfilter-2.5.5/doc/imapfilter.1 
new/imapfilter-2.5.6/doc/imapfilter.1
--- old/imapfilter-2.5.5/doc/imapfilter.1       2013-06-08 11:25:04.000000000 
+0200
+++ new/imapfilter-2.5.6/doc/imapfilter.1       2013-10-27 23:46:05.000000000 
+0100
@@ -1,4 +1,4 @@
-.Dd May 20, 2013
+.Dd Oct 15, 2013
 .Dt IMAPFILTER 1
 .Os
 .Sh NAME
@@ -24,7 +24,10 @@
 are as follows:
 .Bl -tag -width Ds
 .It Fl c Ar configfile
-Path to the configuration file.  The default is
+Path to the configuration file to read, or the
+.Sq -
+character to read the configuration from the standard input stream.  The
+default is
 .Pa $HOME/.imapfilter/config.lua .
 .It Fl d Ar debugfile
 File that contains debugging information about the full communication with the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/imapfilter-2.5.5/src/imapfilter.c 
new/imapfilter-2.5.6/src/imapfilter.c
--- old/imapfilter-2.5.5/src/imapfilter.c       2013-06-08 11:25:04.000000000 
+0200
+++ new/imapfilter-2.5.6/src/imapfilter.c       2013-10-27 23:46:05.000000000 
+0100
@@ -21,7 +21,10 @@
 
 extern buffer ibuf, obuf, nbuf, cbuf;
 extern regexp responses[];
-extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx, *tls11ctx, *tls12ctx;
+extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
+extern SSL_CTX *tls11ctx, *tls12ctx;
+#endif
 
 options opts;                  /* Program options. */
 environment env;               /* Environment variables. */
@@ -104,8 +107,10 @@
        ssl3ctx = SSL_CTX_new(SSLv3_client_method());
        ssl23ctx = SSL_CTX_new(SSLv23_client_method());
        tls1ctx = SSL_CTX_new(TLSv1_client_method());
+#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
        tls11ctx = SSL_CTX_new(TLSv1_1_client_method());
        tls12ctx = SSL_CTX_new(TLSv1_2_client_method());
+#endif
 
        start_lua();
 #if LUA_VERSION_NUM < 502
@@ -127,8 +132,10 @@
        SSL_CTX_free(ssl3ctx);
        SSL_CTX_free(ssl23ctx);
        SSL_CTX_free(tls1ctx);
+#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
        SSL_CTX_free(tls11ctx);
        SSL_CTX_free(tls12ctx);
+#endif
        ERR_free_strings();
 
        regexp_free(responses);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/imapfilter-2.5.5/src/lua.c 
new/imapfilter-2.5.6/src/lua.c
--- old/imapfilter-2.5.5/src/lua.c      2013-06-08 11:25:04.000000000 +0200
+++ new/imapfilter-2.5.6/src/lua.c      2013-10-27 23:46:05.000000000 +0100
@@ -78,7 +78,8 @@
                    "=<command line>") || lua_pcall(lua, 0, LUA_MULTRET, 0))
                        fatal(ERROR_CONFIG, "%s\n", lua_tostring(lua, -1));
        } else {
-               if (luaL_loadfile(lua, opts.config))
+               if (luaL_loadfile(lua, strcmp(opts.config, "-") == 0 ? NULL :
+                   opts.config))
                        fatal(ERROR_CONFIG, "%s\n", lua_tostring(lua, -1));
                lua_pushcfunction(lua, traceback_handler);
                lua_insert(lua, 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/imapfilter-2.5.5/src/socket.c 
new/imapfilter-2.5.6/src/socket.c
--- old/imapfilter-2.5.5/src/socket.c   2013-06-08 11:25:04.000000000 +0200
+++ new/imapfilter-2.5.6/src/socket.c   2013-10-27 23:46:05.000000000 +0100
@@ -17,7 +17,10 @@
 #include "session.h"
 
 
-SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx, *tls11ctx, *tls12ctx;
+SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
+SSL_CTX *tls11ctx, *tls12ctx;
+#endif
 
 
 /*
@@ -96,9 +99,17 @@
        } else if (!strcasecmp(ssn->sslproto, "tls1")) {
                ctx = tls1ctx;
        } else if (!strcasecmp(ssn->sslproto, "tls1.1")) {
+#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
                ctx = tls11ctx;
+#else
+               ctx = tls1ctx;
+#endif
        } else if (!strcasecmp(ssn->sslproto, "tls1.2")) {
+#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
                ctx = tls12ctx;
+#else
+               ctx = tls1ctx;
+#endif
        } else {
                ctx = ssl23ctx;
        }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/imapfilter-2.5.5/src/version.h 
new/imapfilter-2.5.6/src/version.h
--- old/imapfilter-2.5.5/src/version.h  2013-06-08 11:25:04.000000000 +0200
+++ new/imapfilter-2.5.6/src/version.h  2013-10-27 23:46:05.000000000 +0100
@@ -3,7 +3,7 @@
 
 
 /* Program's version number. */
-#define VERSION                "2.5.5"
+#define VERSION                "2.5.6"
 
 /* Program's copyright. */
 #define COPYRIGHT      "Copyright (c) 2001-2013 Eleftherios Chatzimparmpas"

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to