added debug package, openssl 1.1 patch [release 2.0.0-2mamba;Sun Dec 06 2020]

This commit is contained in:
Silvan Calarco 2024-01-06 08:15:47 +01:00
parent 6e8afaaefb
commit 6ac29f65c2
2 changed files with 49 additions and 14 deletions

View File

@ -0,0 +1,25 @@
diff -up openslp-2.0.0/common/slp_crypto.c.orig openslp-2.0.0/common/slp_crypto.c
--- openslp-2.0.0/common/slp_crypto.c.orig 2012-12-07 21:13:28.000000000 +0100
+++ openslp-2.0.0/common/slp_crypto.c 2017-02-22 11:16:11.620835724 +0100
@@ -88,11 +88,16 @@ SLPCryptoDSAKey * SLPCryptoDSAKeyDup(SLP
result = DSA_new();
if (result)
{
- result->p = BN_dup(dsa->p);
- result->q = BN_dup(dsa->q);
- result->g = BN_dup(dsa->g);
- result->priv_key = BN_dup(dsa->priv_key);
- result->pub_key = BN_dup(dsa->pub_key);
+ const BIGNUM *p, *q, *g;
+ const BIGNUM *priv_key, *pub_key;
+
+ DSA_get0_pqg(dsa, &p, &q, &g);
+ DSA_get0_key(dsa, &pub_key, &priv_key);
+
+ /* would be nice to check return values,
+ * but original code didn't do that either... */
+ DSA_set0_pqg(result, BN_dup(p), BN_dup(q), BN_dup(g));
+ DSA_set0_key(result, BN_dup(pub_key), BN_dup(priv_key));
}
return result;
}

View File

@ -1,6 +1,6 @@
Name: openslp Name: openslp
Version: 2.0.0 Version: 2.0.0
Release: 1mamba Release: 2mamba
Summary: An open-source implementation of Service Location Protocol Summary: An open-source implementation of Service Location Protocol
Group: System/Servers Group: System/Servers
Vendor: openmamba Vendor: openmamba
@ -10,14 +10,21 @@ URL: http://www.openslp.org
Source: http://downloads.sourceforge.net/sourceforge/openslp/%{name}-%{version}.tar.gz Source: http://downloads.sourceforge.net/sourceforge/openslp/%{name}-%{version}.tar.gz
Patch0: %{name}-1.2.1-optflags.patch Patch0: %{name}-1.2.1-optflags.patch
Patch1: %{name}-1.2.1-export_slp_net_symbols Patch1: %{name}-1.2.1-export_slp_net_symbols
Patch2: openslp-2.0.0-openssl-1.1.patch
License: BSD License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libe2fs-devel
BuildRequires: libkrb5-devel
BuildRequires: libnsl-devel
BuildRequires: libopenssl-devel
BuildRequires: libtirpc-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
BuildRequires: flex BuildRequires: flex
BuildRequires: bison BuildRequires: bison
BuildRequires: libtool BuildRequires: libtool
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libopenssl-devel
## AUTOBUILDREQ-END
Requires: libopenslp = %{?epoch:%epoch:}%{version}-%{release} Requires: libopenslp = %{?epoch:%epoch:}%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -40,13 +47,13 @@ Requires: libopenslp = %{?epoch:%epoch:}%{version}-%{release}
%description -n libopenslp-devel %description -n libopenslp-devel
Service Location Protocol is an IETF standards track protocol that provides a framework to allow networking applications to discover the existence, location, and configuration of networked services in enterprise networks. Service Location Protocol is an IETF standards track protocol that provides a framework to allow networking applications to discover the existence, location, and configuration of networked services in enterprise networks.
This package contains static libraries and header files needed for development.
This package contains static libraries and header files need for development. %debug_package
%prep %prep
%setup -q %setup -q
#%patch0 -p1 -b .optflags %patch2 -p1
#%patch1 -p1 -b .export_slp_net_symbols
%build %build
%configure \ %configure \
@ -81,29 +88,32 @@ install -D -m 755 etc/slpd.all_init \
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/slptool
%{_sbindir}/slpd
%config(noreplace) %{_initrddir}/slpd %config(noreplace) %{_initrddir}/slpd
%dir %{_sysconfdir}/slp %dir %{_sysconfdir}/slp
%config(noreplace) %{_sysconfdir}/slp/slp.conf %config(noreplace) %{_sysconfdir}/slp/slp.conf
%config(noreplace) %{_sysconfdir}/slp/slp.reg %config(noreplace) %{_sysconfdir}/slp/slp.reg
%config(noreplace) %{_sysconfdir}/slp/slp.spi %config(noreplace) %{_sysconfdir}/slp/slp.spi
%{_bindir}/slptool
%{_sbindir}/slpd
%files -n libopenslp %files -n libopenslp
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.so %{_libdir}/libslp.so.*
%{_libdir}/*.so.*
%doc AUTHORS COPYING %doc AUTHORS COPYING
%files -n libopenslp-devel %files -n libopenslp-devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.a %{_libdir}/libslp.a
%{_libdir}/*.la %{_libdir}/libslp.la
%{_libdir}/libslp.so
%{_includedir}/*.h %{_includedir}/*.h
%doc ChangeLog FAQ NEWS README THANKS %doc ChangeLog FAQ NEWS README THANKS
#%doc rpmdoc/* #%doc rpmdoc/*
%changelog %changelog
* Sun Dec 06 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.0-2mamba
- added debug package, openssl 1.1 patch
* Thu Jun 13 2013 Automatic Build System <autodist@mambasoft.it> 2.0.0-1mamba * Thu Jun 13 2013 Automatic Build System <autodist@mambasoft.it> 2.0.0-1mamba
- automatic version update by autodist - automatic version update by autodist