From 3e92e7c53806e0317c8b2dbda83003de66bea0c1 Mon Sep 17 00:00:00 2001 From: lsh123 Date: Thu, 18 Jul 2024 17:03:47 -0400 Subject: [PATCH] Bump version to 1.3.6 release (#826) --- .github/workflows/make-check.yml | 2 +- configure.ac | 4 ++-- docs/api/xmlsec-version.html | 6 +++--- docs/download.html | 6 +++--- docs/index.html | 9 +++++++++ docs/news.html | 5 +++++ examples/Makefile.w32 | 16 ++++++++-------- man/xmlsec1-config.1 | 2 +- man/xmlsec1.1 | 2 +- win32/Makefile.msvc | 4 ++-- 10 files changed, 35 insertions(+), 21 deletions(-) diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml index 97699b89d..d25404bcd 100755 --- 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 index 8add8793c..cfc01a97d 100644 --- 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 index 6695d0de2..a1baf8e72 100644 --- a/docs/api/xmlsec-version.html +++ b/docs/api/xmlsec-version.html @@ -78,7 +78,7 @@

version

Types and Values

XMLSEC_VERSION

-
#define XMLSEC_VERSION            "1.3.5"
+
#define XMLSEC_VERSION            "1.3.6"
 

 
The library version string in the format
 "$major_number.$minor_number.$sub_minor_number".

@@ -100,14 +100,14 @@ 
version
 

 

 
XMLSEC_VERSION_SUBMINOR

-
#define XMLSEC_VERSION_SUBMINOR        5
+
#define XMLSEC_VERSION_SUBMINOR        6
 

 
The library sub-minor version number.

 

 

 

 
XMLSEC_VERSION_INFO

-
#define XMLSEC_VERSION_INFO        "4:5:3"
+
#define XMLSEC_VERSION_INFO        "4:6:3"
 

 
The library version info string in the format
 "$major_number+$minor_number:$sub_minor_number:$minor_number".

diff --git a/docs/download.html b/docs/download.html
index e79df4c33..b3b7cd9b2 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -48,11 +48,11 @@
 
Download

 

                     
Stable releases

-                    
The latest stable XML Security Library version is 1.3.5:

+                    
The latest stable XML Security Library version is 1.3.6:

                     
    
                         
  • 
-                            Sources
-                            and signature
+                            Sources
+                            and signature
                             for the latest version (Coverity report).
                         
    • 
                         
  • 
diff --git a/docs/index.html b/docs/index.html
index 58cd88916..5a8af3323 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -67,6 +67,15 @@ 
    XML Security Library
    
 see the Copyright file in the distribution  for details.

    
 
    News
    
 
      
+    
    • TBD
      
+		The XML Security Library 1.3.6 release includes the following changes:
+        
+	
      • 
+	
      
+
     
    • July 19, 2024
      
 		The XML Security Library 1.3.5 and legacy 1.2.41 releases include the following changes:
         
        
diff --git a/docs/news.html b/docs/news.html
index 0a8c0bc5d..464e72306 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -48,6 +48,11 @@
 
        XML Security Library News
        
 

 
    
+    
  • TBD
    
+		TODO: COPY FROM index.html
+	
    • 
+	
    
+
     
  • July 19, 2024
    
 		The XML Security Library 1.3.5 and legacy 1.2.41 releases include the following changes:
         
      
diff --git a/examples/Makefile.w32 b/examples/Makefile.w32
index b7c5723fe..6bfdc497b 100644
--- 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
index 5967065a7..46945ed43 100644
--- 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
index 0ca1c97e8..a639a4a9f 100644
--- 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
index dad0bc497..61923f6b7 100755
--- 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"