hush
/
libsodium
8
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

Bump

master
Frank Denis 5 years ago
parent
2e6c26ebd8
commit
252fda724c
8 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      builds/msvc/resource.rc
  2. 4
      builds/msvc/version.h
  3. 8
      configure.ac
  4. 4
      msvc-scripts/process.bat
  5. 10
      packaging/dotnet-core/README.md
  6. 14
      packaging/dotnet-core/prepare.py
  7. 2
      packaging/nuget/package.config
  8. 2
      src/libsodium/include/sodium/private/common.h

4
builds/msvc/resource.rc
View File

@ -4,8 +4,8 @@
#include "windows.h" #include "windows.h"
//specify the version numbers for the dll's //specify the version numbers for the dll's
#define LIBSODIUM_VERSION_STRING "1.0.17.0" #define LIBSODIUM_VERSION_STRING "1.0.18.0"
#define LIBSODIUM_VERSION_BIN 1,0,17,0 #define LIBSODIUM_VERSION_BIN 1,0,18,0
//specify the product name for the dlls based on the platform we are compiling for //specify the product name for the dlls based on the platform we are compiling for
#if defined(x64) #if defined(x64)

4
builds/msvc/version.h
View File

@ -4,10 +4,10 @@
#include "export.h" #include "export.h"
#define SODIUM_VERSION_STRING "1.0.17" #define SODIUM_VERSION_STRING "1.0.18"
#define SODIUM_LIBRARY_VERSION_MAJOR 10 #define SODIUM_LIBRARY_VERSION_MAJOR 10
#define SODIUM_LIBRARY_VERSION_MINOR 2 #define SODIUM_LIBRARY_VERSION_MINOR 3
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_INIT([libsodium],[1.0.17], AC_INIT([libsodium],[1.0.18],
[https://github.com/jedisct1/libsodium/issues], [https://github.com/jedisct1/libsodium/issues],
[libsodium], [libsodium],
[https://github.com/jedisct1/libsodium]) [https://github.com/jedisct1/libsodium])
@ -15,9 +15,9 @@ AM_DEP_TRACK
AC_SUBST(VERSION) AC_SUBST(VERSION)
SODIUM_LIBRARY_VERSION_MAJOR=10 SODIUM_LIBRARY_VERSION_MAJOR=10
SODIUM_LIBRARY_VERSION_MINOR=2 SODIUM_LIBRARY_VERSION_MINOR=3
DLL_VERSION=23 DLL_VERSION=24
SODIUM_LIBRARY_VERSION=25:0:2 SODIUM_LIBRARY_VERSION=26:0:3
# | | | # | | |
# +------+ | +---+ # +------+ | +---+
# | | | # | | |

4
msvc-scripts/process.bat
View File

@ -1,5 +1,5 @@
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.17/ < src\libsodium\include\sodium\version.h.in > tmp cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.18/ < src\libsodium\include\sodium\version.h.in > tmp
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/10/ < tmp > tmp2 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/10/ < tmp > tmp2
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/2/ < tmp2 > tmp3 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/3/ < tmp2 > tmp3
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h
del tmp tmp2 tmp3 del tmp tmp2 tmp3

10
packaging/dotnet-core/README.md
View File

@ -31,15 +31,15 @@ Version numbers for the packages for .NET Core consist of three components:
It may be necessary to release more than one package for a libsodium version, It may be necessary to release more than one package for a libsodium version,
e.g., when adding support for a new platform or if a release contains a broken e.g., when adding support for a new platform or if a release contains a broken
binary. In this case, a package revision number is added as a fourth part to binary. In this case, a package revision number is added as a fourth part to
the libsodium version, starting at `1`. For example, `1.0.17` is the initial the libsodium version, starting at `1`. For example, `1.0.18` is the initial
release of the package for libsodium 1.0.17 and `1.0.17.5` is the fifth release of the package for libsodium 1.0.18 and `1.0.18.5` is the fifth
revision (sixth release) of that package. revision (sixth release) of that package.
* *pre-release label* * *pre-release label*
If a package is a pre-release, a label is appended to the version number in If a package is a pre-release, a label is appended to the version number in
`-preview-##` format where `##` is the number of the pre-release, starting at `-preview-##` format where `##` is the number of the pre-release, starting at
`01`. For example, `1.0.17-preview-01` is the first pre-release of the package `01`. For example, `1.0.18-preview-01` is the first pre-release of the package
for libsodium 1.0.17 and `1.0.17.5-preview-02` the second pre-release of the for libsodium 1.0.18 and `1.0.18.5-preview-02` the second pre-release of the
fifth revision of the package for libsodium 1.0.17. fifth revision of the package for libsodium 1.0.18.
**Making a release** **Making a release**

14
packaging/dotnet-core/prepare.py
View File

@ -203,13 +203,13 @@ def main(args):
print(" python3 prepare.py <version>") print(" python3 prepare.py <version>")
print() print()
print("Examples:") print("Examples:")
print(" python3 prepare.py 1.0.17-preview-01") print(" python3 prepare.py 1.0.18-preview-01")
print(" python3 prepare.py 1.0.17-preview-02") print(" python3 prepare.py 1.0.18-preview-02")
print(" python3 prepare.py 1.0.17-preview-03") print(" python3 prepare.py 1.0.18-preview-03")
print(" python3 prepare.py 1.0.17") print(" python3 prepare.py 1.0.18")
print(" python3 prepare.py 1.0.17.1-preview-01") print(" python3 prepare.py 1.0.18.1-preview-01")
print(" python3 prepare.py 1.0.17.1") print(" python3 prepare.py 1.0.18.1")
print(" python3 prepare.py 1.0.17.2") print(" python3 prepare.py 1.0.18.2")
return 1 return 1
version = Version(m.group(2), m.group(0)) version = Version(m.group(2), m.group(0))

2
packaging/nuget/package.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- These values are populated into the package.gsl templates by package.bat. --> <!-- These values are populated into the package.gsl templates by package.bat. -->
<!-- The target attribute controls path and file name only, id controls package naming. --> <!-- The target attribute controls path and file name only, id controls package naming. -->
<package id="libsodium_vc120" target="libsodium" version = "1.0.17.0" pathversion="1_0_17_0" platformtoolset="v120" /> <package id="libsodium_vc120" target="libsodium" version = "1.0.18.0" pathversion="1_0_18_0" platformtoolset="v120" />

2
src/libsodium/include/sodium/private/common.h
View File

@ -1,7 +1,7 @@
#ifndef common_H #ifndef common_H
#define common_H 1 #define common_H 1
#if !defined(_MSC_VER) && !defined(DEV_MODE) && 1 #if !defined(_MSC_VER) && !defined(DEV_MODE) && 0
# warning *** This is unstable, untested, development code. # warning *** This is unstable, untested, development code.
# warning It might not compile. It might not work as expected. # warning It might not compile. It might not work as expected.
# warning It might be totally insecure. # warning It might be totally insecure.

Write Preview
Loading…
Cancel
Save