allow folders containing multiple item types; better detection of val…

…id internet headers

ChangeLog

@@ -1,3 +1,8 @@
+LibPST 0.6.68 (2016-08-29)
+===============================
+    * allow folders containing multiple item types, e.g. email and calendar
+    * better detection of valid internet headers
+
 LibPST 0.6.67 (2016-07-06)
 ===============================
     * Jeffrey Morlan - multiple bug fixes and an optimization
@@ -120,10 +125,10 @@ LibPST 0.6.44 (2009-09-20)
 LibPST 0.6.43 (2009-09-12)
 ===============================
     * patches from Justin Greer.
-	add code pages 1200 and 1201 to the list for iconv
-    	add support for 0x0201 indirect blocks that point to 0x0101 blocks
-	add readpst -t option to select output item types
-	fix (remove) extra new line inside headers
+    add code pages 1200 and 1201 to the list for iconv
+        add support for 0x0201 indirect blocks that point to 0x0101 blocks
+    add readpst -t option to select output item types
+    fix (remove) extra new line inside headers
     * cleanup base64 encoding to remove duplicate code.
     * patch from Chris White to avoid segfault with embedded appointments.
     * patch from Roberto Polli to add creation of some Thunderbird specific meta files.

NEWS

@@ -1,3 +1,4 @@
+0.6.68  2016-08-29 allow folders containing multiple item types;  better detection of valid internet headers
 0.6.67  2016-07-06 Jeffrey Morlan - multiple bug fixes and an optimization
 0.6.66  2015-12-21 Igor Stroh  - Added Content-ID header support
 0.6.65  2015-09-11 Jeffrey Morlan - fix multiple Content-Type headers; Hans Liss - debug level output

configure.in

@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(libpst,0.6.67,carl@five-ten-sg.com)
+AC_INIT(libpst,0.6.68,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([src/libpst.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -21,7 +21,7 @@ AC_USE_SYSTEM_EXTENSIONS
 #  6. libtool will build libpst.so.x.y.z where the SONAME is libpst.so.x
 #     and x=current-age, y=age, z=revision
 
-libpst_version_info='5:12:1'
+libpst_version_info='5:13:1'
 AC_SUBST(LIBPST_VERSION_INFO, [$libpst_version_info])
 libpst_so_major='4'
 AC_SUBST(LIBPST_SO_MAJOR, [$libpst_so_major])
@@ -52,6 +52,7 @@ AC_SUBST(LIBPST_SO_MAJOR, [$libpst_so_major])
 # 0.6.63    libpst.so.4     libpst.so.4.1.10
 # 0.6.66    libpst.so.4     libpst.so.4.1.11
 # 0.6.67    libpst.so.4     libpst.so.4.1.12
+# 0.6.68    libpst.so.4     libpst.so.4.1.13
 
 
 

libpst.spec.in

@@ -160,6 +160,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 29 2016 Carl Byington <carl@five-ten-sg.com> 0.6.68-1
+- allow folders containing multiple item types, e.g. email and calendar
+- better detection of valid internet headers
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.67-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Wed Jul 06 2016 Carl Byington <carl@five-ten-sg.com> 0.6.67-1
 - Jeffrey Morlan - multiple bug fixes and an optimization
 
@@ -179,15 +186,13 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.6.64-6
 - Rebuilt for Boost 1.59
 
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> -
- 0.6.64-5
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.64-5
 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
 
 * Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 0.6.64-4
 - rebuild for Boost 1.58
 
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> -
- 0.6.64-3
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.64-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.6.64-2

regression/regression-tests.bash

@@ -73,6 +73,7 @@ function dopst()
             utf='-8'
             echo $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn
                  $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
+            #readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
 
             ## separate mode with filename extensions and .msg files
             #echo $val ../src/readpst $jobs     -r -m -D -cv -o output$n -d $ba.log $fn

src/libpst.h

@@ -32,6 +32,7 @@
 #define PST_TYPE_TASK       12
 #define PST_TYPE_OTHER      13
 #define PST_TYPE_REPORT     14
+#define PST_TYPE_MAX        15
 
 // defines types of possible encryption
 #define PST_NO_ENCRYPT   0