Page MenuHomeSolus
Files F11053713

D9261.id22360.diff
No OneTemporary
Actions

D9261.id22360.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -9,7 +9,6 @@
libnss3.so
libpam.so.0
libpthread.so.0
-libselinux.so.1
libsmime3.so
libsystemd.so.0
libunbound.so.8
diff --git a/files/fix-runtime-breakage-with-nss-3.52.patch b/files/fix-runtime-breakage-with-nss-3.52.patch
new file mode 100644
--- /dev/null
+++ b/files/fix-runtime-breakage-with-nss-3.52.patch
@@ -0,0 +1,17 @@
+diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+index 93a027089a..571913cc1e 100644
+--- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
++++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+@@ -16,6 +16,12 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
++/*
++ * Special advise from Bob Relyea - needs to go before any nss include
++ *
++ */
++#define NSS_PKCS11_2_0_COMPAT 1
++
+ #include "lswlog.h"
+ #include "lswnss.h"
+ #include "prmem.h"
diff --git a/files/pam_d_location.patch b/files/pam_d_location.patch
--- a/files/pam_d_location.patch
+++ b/files/pam_d_location.patch
@@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
-index b706def..3bc1fe1 100644
+index 7487215..1cd36b8 100644
--- a/Makefile
+++ b/Makefile
-@@ -630,9 +630,9 @@ local-install:
+@@ -220,9 +220,9 @@ local-install:
echo -e "**********************************************************************\n" ; \
fi \
fi
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : libreswan
-version : 3.27
-release : 4
+version : 3.32
+release : 5
source :
- - https://github.com/libreswan/libreswan/archive/v3.27.tar.gz : ead07dd701116094b483dc57e54e2a5ee9a06d3982bb142260bcbf3d1faf7b82
+ - https://github.com/libreswan/libreswan/archive/v3.32.tar.gz : 236b57fee8f562302c54f2b16d8a839a9039fcb5893668e61b398ec6b179432e
license : GPL-2.0-or-later
component : network.util
summary : An Internet Key Exchange (IKE) implementation for Linux
@@ -17,8 +17,11 @@
- pkgconfig(nss)
- docbook-xml
- xmlto
+conflicts :
+ - strongswan
setup : |
%patch -p1 < $pkgfiles/pam_d_location.patch
+ %patch -p1 < $pkgfiles/fix-runtime-breakage-with-nss-3.52.patch
build : |
%make INC_USRLOCAL=/usr programs
install : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>libreswan</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Longwu Ou</Name>
+ <Email>xulongwu4@gmail.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>network.util</PartOf>
@@ -28,78 +28,64 @@
<Path fileType="config">/etc/ipsec.d/policies/private-or-clear</Path>
<Path fileType="config">/etc/ipsec.secrets</Path>
<Path fileType="library">/usr/lib/systemd/system/ipsec.service</Path>
+ <Path fileType="library">/usr/lib/tmpfiles.d/libreswan.conf</Path>
<Path fileType="executable">/usr/libexec/ipsec/_import_crl</Path>
- <Path fileType="executable">/usr/libexec/ipsec/_keycensor</Path>
<Path fileType="executable">/usr/libexec/ipsec/_plutorun</Path>
<Path fileType="executable">/usr/libexec/ipsec/_secretcensor</Path>
<Path fileType="executable">/usr/libexec/ipsec/_stackmanager</Path>
<Path fileType="executable">/usr/libexec/ipsec/_unbound-hook</Path>
<Path fileType="executable">/usr/libexec/ipsec/_updown</Path>
- <Path fileType="executable">/usr/libexec/ipsec/_updown.klips</Path>
<Path fileType="executable">/usr/libexec/ipsec/_updown.netkey</Path>
<Path fileType="executable">/usr/libexec/ipsec/addconn</Path>
<Path fileType="executable">/usr/libexec/ipsec/algparse</Path>
<Path fileType="executable">/usr/libexec/ipsec/auto</Path>
<Path fileType="executable">/usr/libexec/ipsec/barf</Path>
<Path fileType="executable">/usr/libexec/ipsec/cavp</Path>
+ <Path fileType="executable">/usr/libexec/ipsec/dncheck</Path>
<Path fileType="executable">/usr/libexec/ipsec/enumcheck</Path>
- <Path fileType="executable">/usr/libexec/ipsec/eroute</Path>
- <Path fileType="executable">/usr/libexec/ipsec/klipsdebug</Path>
+ <Path fileType="executable">/usr/libexec/ipsec/ipcheck</Path>
+ <Path fileType="executable">/usr/libexec/ipsec/jambufcheck</Path>
+ <Path fileType="executable">/usr/libexec/ipsec/letsencrypt</Path>
<Path fileType="executable">/usr/libexec/ipsec/look</Path>
<Path fileType="executable">/usr/libexec/ipsec/newhostkey</Path>
- <Path fileType="executable">/usr/libexec/ipsec/pf_key</Path>
<Path fileType="executable">/usr/libexec/ipsec/pluto</Path>
<Path fileType="executable">/usr/libexec/ipsec/readwriteconf</Path>
<Path fileType="executable">/usr/libexec/ipsec/rsasigkey</Path>
<Path fileType="executable">/usr/libexec/ipsec/setup</Path>
<Path fileType="executable">/usr/libexec/ipsec/show</Path>
<Path fileType="executable">/usr/libexec/ipsec/showhostkey</Path>
- <Path fileType="executable">/usr/libexec/ipsec/spi</Path>
- <Path fileType="executable">/usr/libexec/ipsec/spigrp</Path>
- <Path fileType="executable">/usr/libexec/ipsec/tncfg</Path>
+ <Path fileType="executable">/usr/libexec/ipsec/shunkcheck</Path>
+ <Path fileType="executable">/usr/libexec/ipsec/timecheck</Path>
<Path fileType="executable">/usr/libexec/ipsec/verify</Path>
<Path fileType="executable">/usr/libexec/ipsec/whack</Path>
<Path fileType="data">/usr/man/man5/ipsec.conf.5</Path>
<Path fileType="data">/usr/man/man5/ipsec.secrets.5</Path>
- <Path fileType="data">/usr/man/man5/ipsec_eroute.5</Path>
- <Path fileType="data">/usr/man/man5/ipsec_klipsdebug.5</Path>
- <Path fileType="data">/usr/man/man5/ipsec_pf_key.5</Path>
- <Path fileType="data">/usr/man/man5/ipsec_spi.5</Path>
- <Path fileType="data">/usr/man/man5/ipsec_spigrp.5</Path>
- <Path fileType="data">/usr/man/man5/ipsec_tncfg.5</Path>
<Path fileType="data">/usr/man/man5/ipsec_trap_count.5</Path>
<Path fileType="data">/usr/man/man5/ipsec_trap_sendcount.5</Path>
<Path fileType="data">/usr/man/man5/ipsec_version.5</Path>
<Path fileType="data">/usr/man/man8/ipsec.8</Path>
<Path fileType="data">/usr/man/man8/ipsec__import_crl.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec__keycensor.8</Path>
<Path fileType="data">/usr/man/man8/ipsec__plutorun.8</Path>
<Path fileType="data">/usr/man/man8/ipsec__secretcensor.8</Path>
<Path fileType="data">/usr/man/man8/ipsec__stackmanager.8</Path>
<Path fileType="data">/usr/man/man8/ipsec__unbound-hook.8</Path>
<Path fileType="data">/usr/man/man8/ipsec__updown.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec__updown.klips.8</Path>
<Path fileType="data">/usr/man/man8/ipsec__updown.netkey.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_addconn.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_auto.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_barf.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_checknss.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec_eroute.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_import.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_initnss.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec_klipsdebug.8</Path>
+ <Path fileType="data">/usr/man/man8/ipsec_letsencrypt.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_look.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_newhostkey.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec_pf_key.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_pluto.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_readwriteconf.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_rsasigkey.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_setup.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_show.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_showhostkey.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec_spi.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec_spigrp.8</Path>
- <Path fileType="data">/usr/man/man8/ipsec_tncfg.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_verify.8</Path>
<Path fileType="data">/usr/man/man8/ipsec_whack.8</Path>
<Path fileType="data">/usr/man/man8/pluto.8</Path>
@@ -108,14 +94,17 @@
<Path fileType="doc">/usr/share/doc/libreswan/ipsec.conf-sample</Path>
<Path fileType="doc">/usr/share/doc/libreswan/ipsec.secrets-sample</Path>
</Files>
+ <Conflicts>
+ <Package>strongswan</Package>
+ </Conflicts>
</Package>
<History>
- <Update release="4">
- <Date>2020-07-13</Date>
- <Version>3.27</Version>
+ <Update release="5">
+ <Date>2020-07-21</Date>
+ <Version>3.32</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Longwu Ou</Name>
+ <Email>xulongwu4@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 11:46 PM (2 h, 52 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5814144
Default Alt Text
D9261.id22360.diff (9 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.