Bump version to 1.3.6 release (#826)

lsh123 · Jul 18, 2024 · 3e92e7c · 3e92e7c
1 parent d76b77b
commit 3e92e7c
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 21 deletions.
diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml
@@ -219,7 +219,7 @@ jobs:
     env:
       VISUAL_STUDIO_ROOT: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise"
       INSTALL_FOLDER: c:\install.dir
-      LIBS_VERSION: 1.3.4
+      LIBS_VERSION: 1.3.5
     steps:
     - name: create-dirs
       run: |

diff --git a/configure.ac b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([xmlsec1],[1.3.5],[http://www.aleksey.com/xmlsec])
+AC_INIT([xmlsec1],[1.3.6],[http://www.aleksey.com/xmlsec])
 
 XMLSEC_PACKAGE=xmlsec1
 XMLSEC_VERSION_MAJOR=1
 XMLSEC_VERSION_MINOR=3
-XMLSEC_VERSION_SUBMINOR=5
+XMLSEC_VERSION_SUBMINOR=6
 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR"
 XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
 XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`

diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html
@@ -78,7 +78,7 @@ <h2><span class="refentrytitle"><a name="xmlsec-version.top_of_page"></a>version
 <a name="xmlsec-version.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
 <a name="XMLSEC-VERSION:CAPS"></a><h3>XMLSEC_VERSION</h3>
-<pre class="programlisting">#define XMLSEC_VERSION            "1.3.5"
+<pre class="programlisting">#define XMLSEC_VERSION            "1.3.6"
 </pre>
 <p>The library version string in the format
 "$major_number.$minor_number.$sub_minor_number".</p>
@@ -100,14 +100,14 @@ <h2><span class="refentrytitle"><a name="xmlsec-version.top_of_page"></a>version
 <hr>
 <div class="refsect2">
 <a name="XMLSEC-VERSION-SUBMINOR:CAPS"></a><h3>XMLSEC_VERSION_SUBMINOR</h3>
-<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR        5
+<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR        6
 </pre>
 <p>The library sub-minor version number.</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="XMLSEC-VERSION-INFO:CAPS"></a><h3>XMLSEC_VERSION_INFO</h3>
-<pre class="programlisting">#define XMLSEC_VERSION_INFO        "4:5:3"
+<pre class="programlisting">#define XMLSEC_VERSION_INFO        "4:6:3"
 </pre>
 <p>The library version info string in the format
 "$major_number+$minor_number:$sub_minor_number:$minor_number".</p>

diff --git a/docs/download.html b/docs/download.html
@@ -48,11 +48,11 @@
 <div align="center"><h1>Download</h1></div>
 <div align="left">
                     <h2>Stable releases</h2>
-                    <p>The latest stable XML Security Library version is <b>1.3.5</b>:</p>
+                    <p>The latest stable XML Security Library version is <b>1.3.6</b>:</p>
                     <ul>
                         <li>
-                            <a href="https://www.aleksey.com/xmlsec/download/xmlsec1-1.3.5.tar.gz">Sources</a>
-                            and <a href="https://www.aleksey.com/xmlsec/download/xmlsec1-1.3.5.sig">signature</a>
+                            <a href="https://www.aleksey.com/xmlsec/download/xmlsec1-1.3.6.tar.gz">Sources</a>
+                            and <a href="https://www.aleksey.com/xmlsec/download/xmlsec1-1.3.6.sig">signature</a>
                             for the latest version (<a href="https://scan.coverity.com/projects/xmlsec">Coverity report</a>).
                         </li>
                         <li>

diff --git a/docs/index.html b/docs/index.html
@@ -67,6 +67,15 @@ <h1>XML Security Library</h1>
 see the Copyright file in the distribution  for details.<br><br></p>
 <p><b>News</b></p>
 <ul>
+    <li>TBD<br>
+		The <a href="download.html">XML Security Library 1.3.6</a> release includes the following changes:
+        <ul>
+            <li>TBD</li>
+            <li>Several other small fixes (see <a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
+        </ul>
+	</li>
+	<br>
+
     <li>July 19, 2024<br>
 		The <a href="download.html">XML Security Library 1.3.5 and legacy 1.2.41</a> releases include the following changes:
         <ul>

diff --git a/docs/news.html b/docs/news.html
@@ -48,6 +48,11 @@
 <h1>XML Security Library News</h1>
 </div>
 <ul>
+    <li>TBD<br>
+		TODO: COPY FROM index.html
+	</li>
+	<br>
+
     <li>July 19, 2024<br>
 		The <a href="download.html">XML Security Library 1.3.5 and legacy 1.2.41</a> releases include the following changes:
         <ul>

diff --git a/examples/Makefile.w32 b/examples/Makefile.w32
@@ -1,6 +1,6 @@
 # Makefile for xmlsec, specific for Windows, MSVC and NMAKE.
 #
-# Take a look at the beginning and modify the variables to suit your 
+# Take a look at the beginning and modify the variables to suit your
 # environment.
 XMLSEC_STATIC          = yes
 XMLSEC_DEFAULT_CRYPTO  = openssl
@@ -24,11 +24,11 @@ XMLSEC_EXAMPLES = \
 	$(XMLSEC_OBJS_DIR)\decrypt2.exe \
 	$(XMLSEC_OBJS_DIR)\decrypt3.exe \
 
-# 
+#
 !IF "$(XMLSEC_DEFAULT_CRYPTO)" == "openssl"
 XMLSEC_CFLAGS = $(XMLSEC_CFLAGS) /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_DEFAULT_CRYPTO=\"openssl\""
-XMLSEC_SOLIBS = libxmlsec-openssl.lib libeay32.lib wsock32.lib user32.lib gdi32.lib 
-XMLSEC_ALIBS  = libxmlsec-openssl_a.lib libeay32.lib wsock32.lib user32.lib gdi32.lib 
+XMLSEC_SOLIBS = libxmlsec-openssl.lib libeay32.lib wsock32.lib user32.lib gdi32.lib
+XMLSEC_ALIBS  = libxmlsec-openssl_a.lib libeay32.lib wsock32.lib user32.lib gdi32.lib
 !ENDIF
 
 !IF "$(XMLSEC_DEFAULT_CRYPTO)" == "nss"
@@ -46,10 +46,10 @@ XMLSEC_ALIBS  = libxmlsec-mscrypto_a.lib user32.lib gdi32.lib crypt32.lib advapi
 !IF "$(XMLSEC_STATIC)" == "yes"
 XMLSEC_CFLAGS = $(XMLSEC_CFLAGS) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "XMLSEC_STATIC"
 XMLSEC_LIBS   = $(XMLSEC_LIBS) $(XMLSEC_ALIBS) libxmlsec_a.lib \
-		libxml2_a.lib libxslt_a.lib libexslt_a.lib 
+		libxml2_a.lib libxslt_a.lib libexslt_a.lib bcrypt.lib
 !ELSE
 XMLSEC_LIBS   = $(XMLSEC_LIBS) $(XMLSEC_SOLIBS) libxmlsec.lib libxml2.lib \
-		libxslt.lib libexslt.lib
+		libxslt.lib libexslt.lib bcrypt.lib
 !ENDIF
 
 # The preprocessor and its options.
@@ -58,7 +58,7 @@ CPPFLAGS = /nologo
 
 # The compiler and its options.
 CC = cl.exe
-CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /DWIN32_SOCKETS /W1 /MD $(XMLSEC_CFLAGS)  
+CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /DWIN32_SOCKETS /W1 /MD $(XMLSEC_CFLAGS)
 
 # The linker and its options.
 LD = link.exe
@@ -69,7 +69,7 @@ LDFLAGS = /nologo $(XMLSEC_LIBS) wsock32.lib
 CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
 LDFLAGS = $(LDFLAGS) /DEBUG
 !else
-CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
+CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
 LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
 !endif
 

diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH XMLSEC1-CONFIG "1" "July 2024" "xmlsec1-config 1.3.5" "User Commands"
+.TH XMLSEC1-CONFIG "1" "July 2024" "xmlsec1-config 1.3.6" "User Commands"
 .SH NAME
 xmlsec1-config \- detail installed version of xmlsec library
 .SH SYNOPSIS

diff --git a/man/xmlsec1.1 b/man/xmlsec1.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH XMLSEC1 "1" "July 2024" "xmlsec1 1.3.5 (openssl)" "User Commands"
+.TH XMLSEC1 "1" "July 2024" "xmlsec1 1.3.6 (openssl)" "User Commands"
 .SH NAME
 xmlsec1 \- sign, verify, encrypt and decrypt XML documents
 .SH SYNOPSIS

diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
@@ -490,8 +490,8 @@ LDFLAGS 		= $(LDFLAGS) /OPT:REF,ICF
 LDFLAGS = $(LDFLAGS) /WX
 !endif
 
-SOLIBS 			= $(LIBS) libxml2.lib ws2_32.lib
-ALIBS 			= $(LIBS) libxml2_a.lib ws2_32.lib
+SOLIBS 			= $(LIBS) libxml2.lib bcrypt.lib ws2_32.lib
+ALIBS           = $(LIBS) libxml2_a.lib bcrypt.lib ws2_32.lib
 
 !if "$(WITH_ICONV)" == "1"
 CFLAGS          = $(CFLAGS) /D "LIBXML_ICONV_ENABLED"