From 2c66685cb5fa6d5c51a89b528f5e07bcf11c266dda905f01e7d43273e1755d1b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 25 May 2024 18:39:03 +0000
Subject: [PATCH] Accepting request 1176876 from
 home:AndreasStieger:branches:devel:libraries:c_c++

libsodium 1.0.20

OBS-URL: https://build.opensuse.org/request/show/1176876
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=77
---
 baselibs.conf               |   2 +-
 libsodium-1.0.18.tar.gz     |   3 ---
 libsodium-1.0.18.tar.gz.sig | Bin 566 -> 0 bytes
 libsodium-1.0.20.tar.gz     |   3 +++
 libsodium-1.0.20.tar.gz.sig | Bin 0 -> 566 bytes
 libsodium.changes           |  10 ++++++++++
 libsodium.spec              |  19 ++++++++-----------
 7 files changed, 22 insertions(+), 15 deletions(-)
 delete mode 100644 libsodium-1.0.18.tar.gz
 delete mode 100644 libsodium-1.0.18.tar.gz.sig
 create mode 100644 libsodium-1.0.20.tar.gz
 create mode 100644 libsodium-1.0.20.tar.gz.sig

diff --git a/baselibs.conf b/baselibs.conf
index e5cbeec..58b5f55 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libsodium23
+libsodium26
diff --git a/libsodium-1.0.18.tar.gz b/libsodium-1.0.18.tar.gz
deleted file mode 100644
index a2ad4a6..0000000
--- a/libsodium-1.0.18.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
-size 1919817
diff --git a/libsodium-1.0.18.tar.gz.sig b/libsodium-1.0.18.tar.gz.sig
deleted file mode 100644
index eed705b2e9cd2812d7f9f1c2f8bfd133b1e8707be7f0ccf622caacdd3954e5f7..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j)-d4s6^nh;E4F>=dd@>^LeZ+6-R0$lJ!SO5wM5MuIM
zSu1aL+5yTB{yQdwBIDxCO>d_!oaBZeO@QCUWNEcy0J@-pB8vm!E1PXBLPG`$Qd=P0
zKXIcd>MJh(hNQLn-O$O0L#eE&r#`ap@`T>1X6LjyvV_ry3%jGY4>$4tRbDMGTWlOl
zbot!zxKQdR{!;Lx6ah@>L~R_+Yu6==;rnqrSO%rXwr8PZGa?N!_Zk^8%y25Z2kIP5
zPzEqYP)a)~x^l>nV;dv|3PJ>$t=*VNRsD~%KGTvbY2P7Q#dij4*Zdh}WL{6yzIApI
zkdQThZ=XiXNQX8$B>kqqa4hVg6clEokd^jppBZMaCKJn?km0Y#Di27(d788nObExf
zMljjFq547Y$UncMh6@~WplAKOgpx}fqUTZ>&FQAI+i4RCB&B4;y0{$}kIR5IP@`0o
z8u-&9`}@%7fLlS^=$5mPmpH5{68%%o>|yS$?j3i-Ip{s(gN&Wn?alz&9yOAsxTJ<s
zjbuGSX}FOoy1FiyXXuD`O4~zua%KWfo_>VF^8<W=miU-3(DWe|nRhph#5{&E<Q>j+
zZv0Y9!{PQSyW++^?|E7@vkAdyYmxQa9G96V9p8M_b+C+dLn8b{v-(k_6Vf;1+qYm0
zXqjJuuS4MAt{IDYt)$%+|0bVzW$i1ZM|n7AQ0Wm$6wWP`dMg?({-u2t9v$h4z7!xr
E+0oz-tN;K2

diff --git a/libsodium-1.0.20.tar.gz b/libsodium-1.0.20.tar.gz
new file mode 100644
index 0000000..4047ce4
--- /dev/null
+++ b/libsodium-1.0.20.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19
+size 1925167
diff --git a/libsodium-1.0.20.tar.gz.sig b/libsodium-1.0.20.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..7bda856eff0a003be140ece0c18cb80e0ba896e8bd8fd5d16f4efadde8809256
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j)-d4s6^nh;E4F>=dd@>^LeZ+6-R0%lR$2mlHR5MuIM
zSu1aL+C5GW{U2hIks}DngHV)J>=aQfjP1dkGX3tS8j$aKbtrX_v+>0CyWT_c;!Jup
z{cwqJnk6n@sWWhAhuzKQ8Jc^44A%dtFV`TGVtF<W+C-(c{~O;R;53jI@K>FpY!MId
z?I363OL~DwcW1rP`4Wh`vQ_D<y62T}5#d@q<j)s_X+?Vg)i-CinLeJr51WF{(9`8m
zeC*C`I~@x(!-%lAHS)KMR_q9@y}yYQt{r_mi^I7P-PjEHWZ}CN{%L8DUgzOWKKJj7
za_%9EKz=DJAEe>E-@Q><iSeryhUTL70%g>EC3z$iNnl0F;iSMuYeo~NPQ+bZxu1bq
zm$#V-BPxUm*JECN6Z1o@a^pJv{kuw#2!T?ky^HrrK{5BggQaZrC|^HV3N<?@aTYN5
z%fo)VECR2-X(m#_j~LnAC5FL#e5Kd6vKUq=Sz-)ch;4>n*=(*9J;z4}S-p}aW|xE3
z!I5ciQ-mb)S`Ax;^tD(*GU$HXb5y^ur$~fz_QmHCdBB_Z(woH7HX3Bq4>NNjSU^N#
zRJT?c0x^nG=z0Ysi_FHX0B0H+%YwvN9Qcu17J%YDRF|!oMDo9}@L(t#MKd%;ET&k@
zhI4as#hVr9=b`<oT@6ixsdo5o{wY0~of4B?4nRG-46yQZ+PeZFhG?dQ8jIbH8Dm7w
EUB1;2g#Z8m

literal 0
HcmV?d00001

diff --git a/libsodium.changes b/libsodium.changes
index 1fa9b36..e1e870a 100644
--- a/libsodium.changes
+++ b/libsodium.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat May 25 16:54:11 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+_ update to 1.0.20:
+  * build system updates and portability fixes
+- includes changes from 1.0.19:
+  * New AEADs: AEGIS-128L and AEGIS-256
+  * The HKDF key derivation mechanism, required by many standard
+    protocols
+
 -------------------------------------------------------------------
 Mon Aug 26 14:44:21 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
 
diff --git a/libsodium.spec b/libsodium.spec
index ba244a6..edadf95 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -2,6 +2,7 @@
 # spec file for package libsodium
 #
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +17,10 @@
 #
 
 
-%define _lto_cflags %{nil}
-
-%define sover   23
+%define sover   26
 %define lname   %{name}%{sover}
 Name:           libsodium
-Version:        1.0.18
+Version:        1.0.20
 Release:        0
 Summary:        Portable NaCl-based crypto library
 License:        ISC
@@ -63,31 +62,29 @@ This package contains all necessary include files and libraries needed
 to compile and develop applications that use libsodium.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-# Do _NOT_ change CFLAGS
-# See https://github.com/jedisct1/libsodium/issues/604
 %configure \
   --disable-static \
   --disable-silent-rules
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make %{?_smp_mflags} check
+%make_build check
 
-%post -n %{lname} -p /sbin/ldconfig
-%postun -n %{lname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %{lname}
 
 %files -n %{lname}
 %license LICENSE
 %{_libdir}/%{name}.so.%{sover}*
 
 %files devel
+%license LICENSE
 %doc AUTHORS ChangeLog README.markdown THANKS
 %{_includedir}/sodium.h
 %{_includedir}/sodium