[lighttpd] Update to 1.4.29.
Matthias Saou
thias at fedoraproject.org
Sun Aug 21 11:41:20 UTC 2011
commit 03da308fc6af5b6df1f3af1405e8ce9de5f3c54a
Author: Matthias Saou <matthias at saou.eu>
Date: Sun Aug 21 13:40:51 2011 +0200
Update to 1.4.29.
lighttpd.spec | 148 +++++++++++++++++++------------------
lighttpd_1.4.29_ssl_no_ecdh.patch | 17 ++++
2 files changed, 93 insertions(+), 72 deletions(-)
---
diff --git a/lighttpd.spec b/lighttpd.spec
index 9e0db38..d4f7543 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -54,8 +54,8 @@
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
-Version: 1.4.28
-Release: 3%{?dist}
+Version: 1.4.29
+Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.lighttpd.net/
@@ -73,7 +73,7 @@ Source100: lighttpd-mod_geoip.c
Source101: lighttpd-mod_geoip.txt
Patch0: lighttpd-1.4.28-defaultconf.patch
Patch1: lighttpd-1.4.29-mod_geoip.patch
-#Patch100: lighttpd-1.4.29-mod_geoip.patch
+Patch100: http://redmine.lighttpd.net/attachments/download/1294/lighttpd_1.4.29_ssl_no_ecdh.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# For the target poweredby.png image (skip requirement + provide image on RHEL)
%if %{with systemlogos}
@@ -151,6 +151,7 @@ Virtual host module for lighttpd that uses a MySQL database.
%setup -q
%patch0 -p1 -b .defaultconf
%patch1 -p1 -b .mod_geoip
+%patch100 -p1
install -p -m 0644 %{SOURCE100} src/mod_geoip.c
install -p -m 0644 %{SOURCE101} mod_geoip.txt
@@ -275,7 +276,7 @@ fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
-%doc doc/*.txt config/ doc/scripts/rrdtool-graph.sh
+%doc config/ doc/scripts/rrdtool-graph.sh
%dir %{_sysconfdir}/lighttpd/
%dir %{_sysconfdir}/lighttpd/conf.d/
%dir %{_sysconfdir}/lighttpd/vhosts.d/
@@ -314,7 +315,7 @@ fi
%files fastcgi
%defattr(-,root,root,-)
-%doc doc/fastcgi*.txt doc/scripts/spawn-php.sh
+%doc doc/outdated/fastcgi*.txt doc/scripts/spawn-php.sh
%config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
%dir %{_libdir}/lighttpd/
%{_libdir}/lighttpd/mod_fastcgi.so
@@ -327,19 +328,22 @@ fi
%files mod_mysql_vhost
%defattr(-,root,root,-)
-%doc doc/mysqlvhost.txt
+%doc doc/outdated/mysqlvhost.txt
%dir %{_libdir}/lighttpd/
%{_libdir}/lighttpd/mod_mysql_vhost.so
%changelog
-* Mon Jul 11 2011 Matthias Saou <http://freshrpms.net/> 1.4.28-3
+* Sun Aug 21 2011 Matthias Saou <matthias at saou.eu> 1.4.29-1
+- Re-update to 1.4.29, including ssl_no_ecdh to fix build (#625737).
+
+* Mon Jul 11 2011 Matthias Saou <matthias at saou.eu> 1.4.28-3
- Update the defaultconf patch to hint at selinux change to fix server.max-fds.
- Start using %%bcond, including quick defines to also support EL4.
- Include systemd service for F16+, don't add all of the ugly trigger for sysv
migration (yet : new versions might be released before F16 final) (#720210).
-* Sat Jul 9 2011 Matthias Saou <http://freshrpms.net/> 1.4.28-2
+* Sat Jul 9 2011 Matthias Saou <matthias at saou.eu> 1.4.28-2
- Rebase F15 master to the 1.4.28 update.
- Try to update to 1.4.29 (#625737).
- Rebase geoip patch for 1.4.29.
@@ -353,18 +357,18 @@ fi
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-* Mon Nov 8 2010 Matthias Saou <http://freshrpms.net/> 1.4.28-1
+* Mon Nov 8 2010 Matthias Saou <matthias at saou.eu> 1.4.28-1
- Update to 1.4.28.
- Update defaultconf patch.
- Remove upstreamed ssl-2157 patch.
-* Fri Apr 16 2010 Matthias Saou <http://freshrpms.net/> 1.4.26-2
+* Fri Apr 16 2010 Matthias Saou <matthias at saou.eu> 1.4.26-2
- Update to 1.4.26.
- Update the geoip patch.
- Remove no longer provided ChangeLog from %%doc.
- Include patch to fix upstream SSL related bug #2157.
-* Thu Sep 3 2009 Matthias Saou <http://freshrpms.net/> 1.4.23-1
+* Thu Sep 3 2009 Matthias Saou <matthias at saou.eu> 1.4.23-1
- Update to 1.4.23.
- Update defaultconf and mod_geoip patches.
- Remove no longer shipped spawn-fcgi, it's a separate source package now.
@@ -376,65 +380,65 @@ fi
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-3
+* Sun Apr 12 2009 Matthias Saou <matthias at saou.eu> 1.4.22-3
- Update init script to new style.
- No longer include a sysconfig file, though one can be set to override the
default configuration file location.
-* Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
+* Mon Mar 30 2009 Matthias Saou <matthias at saou.eu> 1.4.22-2
- Update to 1.4.22.
- Add missing defattr for the spawn-fcgi package.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Wed Feb 18 2009 Matthias Saou <http://freshrpms.net/> 1.4.21-1
+* Wed Feb 18 2009 Matthias Saou <matthias at saou.eu> 1.4.21-1
- Update to 1.4.21.
* Sat Jan 24 2009 Caolán McNamara <caolanm at redhat.com> 1.4.20-7
- rebuild for dependencies
-* Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-6
+* Wed Dec 24 2008 Matthias Saou <matthias at saou.eu> 1.4.20-6
- Partially revert last change by creating a "spawn-fastcgi" symlink, so that
nothing breaks currently (especially for EL).
- Install empty poweredby image on RHEL since the symlink's target is missing.
- Split spawn-fcgi off in its own sub-package, have fastcgi package require it
to provide backwards compatibility.
-* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-3
+* Mon Dec 22 2008 Matthias Saou <matthias at saou.eu> 1.4.20-3
- Rename spawn-fastcgi to lighttpd-spawn-fastcgi to avoid clash with other
packages providing it for their own needs (#472749). It's not used as-is
by lighttpd, so it shouldn't be a problem... at worst, some custom scripts
will need to be updated.
-* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-2
+* Mon Dec 22 2008 Matthias Saou <matthias at saou.eu> 1.4.20-2
- Include conf.d/*.conf configuration snippets (#444953).
- Mark the default index.html in order to not loose changes upon upgrade if it
was edited or replaced with a different file (#438564).
- Include patch to add the INIT INFO block to the init script (#246973).
-* Mon Oct 13 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-1
+* Mon Oct 13 2008 Matthias Saou <matthias at saou.eu> 1.4.20-1
- Update to 1.4.20 final.
-* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-0.1.r2303
+* Mon Sep 22 2008 Matthias Saou <matthias at saou.eu> 1.4.20-0.1.r2303
- Update to 1.4.20 r2303 pre-release.
-* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-5
+* Mon Sep 22 2008 Matthias Saou <matthias at saou.eu> 1.4.19-5
- Include memory leak patch (changeset #2305 from ticket #1774).
-* Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-4
+* Thu Apr 24 2008 Matthias Saou <matthias at saou.eu> 1.4.19-4
- Merge in second changest from upstream fix for upstream bug #285.
-* Thu Mar 27 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-3
+* Thu Mar 27 2008 Matthias Saou <matthias at saou.eu> 1.4.19-3
- Include sslshutdown patch, upstream fix to upstream bug #285 (#439066).
-* Sat Mar 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-2
+* Sat Mar 22 2008 Matthias Saou <matthias at saou.eu> 1.4.19-2
- Provide "webserver" (#437884).
-* Wed Mar 12 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-1
+* Wed Mar 12 2008 Matthias Saou <matthias at saou.eu> 1.4.19-1
- Update to 1.4.19, which includes all previous security fixes + bugfixes.
-* Tue Mar 4 2008 Matthias Saou <http://freshrpms.net/> 1.4.18-6
+* Tue Mar 4 2008 Matthias Saou <matthias at saou.eu> 1.4.18-6
- Include patch for CVE-2008-0983 (crash when low on file descriptors).
- Include patch for CVE-2008-1111 (cgi source disclosure).
@@ -444,181 +448,181 @@ fi
* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org>
- Rebuild for deps
-* Wed Oct 31 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-3
+* Wed Oct 31 2007 Matthias Saou <matthias at saou.eu> 1.4.18-3
- Update mod_geoip source to fix segfault upon stopping lighttpd.
-* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-2
+* Mon Oct 22 2007 Matthias Saou <matthias at saou.eu> 1.4.18-2
- Include mod_geoip additional source, make it an optional sub-package.
- Reorder sub-packages alphabetically in spec file.
- Make sub-packages require exact release, just in case.
- Change default webroot back from /srv to /var.
-* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+* Mon Sep 10 2007 Matthias Saou <matthias at saou.eu> 1.4.18-1
- Update to 1.4.18.
- Include newly installed lighttpd-angel ("angel" process meant to always run
as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
it's in testing stage and must be run with -D for now.
-* Wed Sep 5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+* Wed Sep 5 2007 Matthias Saou <matthias at saou.eu> 1.4.17-1
- Update to 1.4.17.
- Update defaultconf patch to match new example configuration.
- Include patch to fix log file rotation with max-workers set (trac #902).
- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
-* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+* Thu Aug 23 2007 Matthias Saou <matthias at saou.eu> 1.4.16-3
- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
-* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+* Wed Aug 22 2007 Matthias Saou <matthias at saou.eu> 1.4.16-2
- Rebuild to fix wrong execmem requirement on ppc32.
-* Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
+* Thu Jul 26 2007 Matthias Saou <matthias at saou.eu> 1.4.16-1
- Update to 1.4.16 security fix release.
-* Mon Apr 16 2007 Matthias Saou <http://freshrpms.net/> 1.4.15-1
+* Mon Apr 16 2007 Matthias Saou <matthias at saou.eu> 1.4.15-1
- Update to 1.4.15.
- Remove now included previous patch.
- Switch to using the bz2 source.
- Add optional --with-webdav-locks support.
-* Fri Feb 16 2007 Matthias Saou <http://freshrpms.net/> 1.4.13-6
+* Fri Feb 16 2007 Matthias Saou <matthias at saou.eu> 1.4.13-6
- Include patch to fix 99% cpu bug when client connection is dropped.
-* Fri Feb 2 2007 Matthias Saou <http://freshrpms.net/> 1.4.13-5
+* Fri Feb 2 2007 Matthias Saou <matthias at saou.eu> 1.4.13-5
- Update defaultconf patch to change php binary to /usr/bin/php-cgi (#219723).
- Noticed %%{?_smp_mflags} was missing, so add it as it works fine.
-* Mon Jan 29 2007 Matthias Saou <http://freshrpms.net/> 1.4.13-4
+* Mon Jan 29 2007 Matthias Saou <matthias at saou.eu> 1.4.13-4
- Remove readline-devel build req, added by lua but since fixed (#213895).
-* Mon Nov 6 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-3
+* Mon Nov 6 2006 Matthias Saou <matthias at saou.eu> 1.4.13-3
- Switch to using killall for log rotation to fix it when using workers.
-* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-2
+* Mon Oct 16 2006 Matthias Saou <matthias at saou.eu> 1.4.13-2
- Remove gcc-c++ build req, it's part of the defaults.
- Add readline-devel build req, needed on RHEL4.
-* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
+* Wed Oct 11 2006 Matthias Saou <matthias at saou.eu> 1.4.13-1
- Update to 1.4.13, which contains the previous fix.
-* Tue Oct 3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
+* Tue Oct 3 2006 Matthias Saou <matthias at saou.eu> 1.4.12-3
- Include fix for segfaults (lighttpd bug #876, changeset 1352).
-* Mon Sep 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-1
+* Mon Sep 25 2006 Matthias Saou <matthias at saou.eu> 1.4.12-1
- Update to 1.4.12 final.
-* Fri Sep 22 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-0.1.r1332
+* Fri Sep 22 2006 Matthias Saou <matthias at saou.eu> 1.4.12-0.1.r1332
- Update to latest 1.4.12 pre-release, fixes SSL issues and other bugs.
- Update powered_by_fedora.png to the new logo.
-* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-2
+* Mon Aug 28 2006 Matthias Saou <matthias at saou.eu> 1.4.11-2
- FC6 rebuild.
-* Thu Mar 9 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-1
+* Thu Mar 9 2006 Matthias Saou <matthias at saou.eu> 1.4.11-1
- Update to 1.4.11.
-* Mon Mar 6 2006 Matthias Saou <http://freshrpms.net/> 1.4.10-2
+* Mon Mar 6 2006 Matthias Saou <matthias at saou.eu> 1.4.10-2
- FC5 rebuild.
-* Wed Feb 8 2006 Matthias Saou <http://freshrpms.net/> 1.4.10-1
+* Wed Feb 8 2006 Matthias Saou <matthias at saou.eu> 1.4.10-1
- Update to 1.4.10.
- Remove now included fix.
-* Wed Jan 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-2
+* Wed Jan 25 2006 Matthias Saou <matthias at saou.eu> 1.4.9-2
- Add mod_fastcgi-fix patch to fix crash on backend overload.
-* Mon Jan 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-1
+* Mon Jan 16 2006 Matthias Saou <matthias at saou.eu> 1.4.9-1
- Update to 1.4.9.
-* Wed Nov 23 2005 Matthias Saou <http://freshrpms.net/> 1.4.8-1
+* Wed Nov 23 2005 Matthias Saou <matthias at saou.eu> 1.4.8-1
- Update to 1.4.8.
-* Fri Nov 4 2005 Matthias Saou <http://freshrpms.net/> 1.4.7-1
+* Fri Nov 4 2005 Matthias Saou <matthias at saou.eu> 1.4.7-1
- Update to 1.4.7.
-* Wed Oct 12 2005 Matthias Saou <http://freshrpms.net/> 1.4.6-1
+* Wed Oct 12 2005 Matthias Saou <matthias at saou.eu> 1.4.6-1
- Update to 1.4.6.
-* Mon Oct 3 2005 Matthias Saou <http://freshrpms.net/> 1.4.5-1
+* Mon Oct 3 2005 Matthias Saou <matthias at saou.eu> 1.4.5-1
- Update to 1.4.5.
- Disable gamin/fam support for now, it does not work.
-* Tue Sep 27 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-3
+* Tue Sep 27 2005 Matthias Saou <matthias at saou.eu> 1.4.4-3
- Update to current SVN to check if it fixes the remaining load problems.
-* Wed Sep 21 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-2
+* Wed Sep 21 2005 Matthias Saou <matthias at saou.eu> 1.4.4-2
- Patch to SVN 722 revision : Fixes a crash in mod_mysql_vhost and a problem
with keepalive and certain browsers.
-* Mon Sep 19 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-1
+* Mon Sep 19 2005 Matthias Saou <matthias at saou.eu> 1.4.4-1
- Update to 1.4.4 final.
- Enable ldap auth, gdbm and gamin/fam support by default.
-* Thu Sep 15 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-0
+* Thu Sep 15 2005 Matthias Saou <matthias at saou.eu> 1.4.4-0
- Update to 1.4.4 pre-release (fixes another fastcgi memleak).
- Enable lua (cml module) by default.
- Add --with-webdav-props conditional option.
-* Tue Sep 13 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-2
+* Tue Sep 13 2005 Matthias Saou <matthias at saou.eu> 1.4.3-2
- Include lighttpd-1.4.3-stat_cache.patch to fix memleak.
-* Fri Sep 2 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-1.1
+* Fri Sep 2 2005 Matthias Saou <matthias at saou.eu> 1.4.3-1.1
- Rearrange the included index.html to include the new logo, button and
favicon from lighttpd.net.
-* Fri Sep 2 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-1
+* Fri Sep 2 2005 Matthias Saou <matthias at saou.eu> 1.4.3-1
- Update to 1.4.3.
- No longer override libdir at make install stage, use DESTDIR instead, as
the resulting binary would now have referenced to %%{buildroot} :-(
-* Tue Aug 30 2005 Matthias Saou <http://freshrpms.net/> 1.4.2-1
+* Tue Aug 30 2005 Matthias Saou <matthias at saou.eu> 1.4.2-1
- Update to 1.4.2.
-* Mon Aug 22 2005 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+* Mon Aug 22 2005 Matthias Saou <matthias at saou.eu> 1.4.1-1
- Update to 1.4.1.
-* Sun Aug 21 2005 Matthias Saou <http://freshrpms.net/> 1.4.0-1
+* Sun Aug 21 2005 Matthias Saou <matthias at saou.eu> 1.4.0-1
- Update to 1.4.0.
- Add conditional of gamin, gdbm, memcache and lua options.
-* Mon Aug 1 2005 Matthias Saou <http://freshrpms.net/> 1.3.16-2
+* Mon Aug 1 2005 Matthias Saou <matthias at saou.eu> 1.3.16-2
- Update to 1.3.16, rebuild.
-* Mon Jul 18 2005 Matthias Saou <http://freshrpms.net/> 1.3.15-1
+* Mon Jul 18 2005 Matthias Saou <matthias at saou.eu> 1.3.15-1
- Update to 1.3.15.
-* Mon Jun 20 2005 Matthias Saou <http://freshrpms.net/> 1.3.14-1
+* Mon Jun 20 2005 Matthias Saou <matthias at saou.eu> 1.3.14-1
- Update to 1.3.14.
* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.13-5
- rebuild on all arches
-* Mon Apr 4 2005 Matthias Saou <http://freshrpms.net/> 1.3.13-4
+* Mon Apr 4 2005 Matthias Saou <matthias at saou.eu> 1.3.13-4
- Change signal sent from the logrotate script from USR1 to HUP, as that's the
correct one.
* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.3.13-2
- Include /etc/lighttpd directory.
-* Sun Mar 6 2005 Matthias Saou <http://freshrpms.net/> 1.3.13-1
+* Sun Mar 6 2005 Matthias Saou <matthias at saou.eu> 1.3.13-1
- Update to 1.3.13.
-* Wed Mar 2 2005 Matthias Saou <http://freshrpms.net/> 1.3.12-1
+* Wed Mar 2 2005 Matthias Saou <matthias at saou.eu> 1.3.12-1
- Update to 1.3.12.
- Remove obsolete empty_cgi_handler patch.
-* Tue Mar 1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
+* Tue Mar 1 2005 Matthias Saou <matthias at saou.eu> 1.3.11-2
- Add missing defattr to sub-packages (#150018).
-* Mon Feb 21 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-0
+* Mon Feb 21 2005 Matthias Saou <matthias at saou.eu> 1.3.11-0
- Update to 1.3.11.
- Remove cleanconf and init.d patches (merged upstream).
- Add empty_cgi_handler patch.
-* Fri Feb 18 2005 Matthias Saou <http://freshrpms.net/> 1.3.10-0
+* Fri Feb 18 2005 Matthias Saou <matthias at saou.eu> 1.3.10-0
- Split off -fastcgi sub-package.
- Include php.d entry to set sane FastCGI defaults.
-* Wed Feb 16 2005 Matthias Saou <http://freshrpms.net/> 1.3.10-0
+* Wed Feb 16 2005 Matthias Saou <matthias at saou.eu> 1.3.10-0
- Spec file cleanup for freshrpms.net/Extras.
- Compile OpenSSL support unconditionally.
- Put modules in a subdirectory of libdir.
diff --git a/lighttpd_1.4.29_ssl_no_ecdh.patch b/lighttpd_1.4.29_ssl_no_ecdh.patch
new file mode 100644
index 0000000..89399aa
--- /dev/null
+++ b/lighttpd_1.4.29_ssl_no_ecdh.patch
@@ -0,0 +1,17 @@
+diff -r -p lighttpd-1.4.29.orig/src/network.c lighttpd-1.4.29/src/network.c
+*** lighttpd-1.4.29.orig/src/network.c 2011-04-24 15:02:45.000000000 +0200
+--- lighttpd-1.4.29/src/network.c 2011-08-17 11:50:59.320647785 +0200
+*************** int network_init(server *srv) {
+*** 480,488 ****
+--- 480,490 ----
+ network_backend_t backend;
+
+ #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
++ #ifndef OPENSSL_NO_ECDH
+ EC_KEY *ecdh;
+ int nid;
+ #endif
++ #endif
+
+ #ifdef USE_OPENSSL
+ DH *dh;
More information about the scm-commits
mailing list