Fix CVE-2014-0017.
This commit is contained in:
Andreas Schneider
parent
ceb8ee2305
commit
38320ac7ba
1
.gitignore
vendored
1
.gitignore
vendored
@ -16,3 +16,4 @@ libssh-0.4.4.tar.gz.asc
|
|||||||
/libssh-0.5.5.tar.asc
|
/libssh-0.5.5.tar.asc
|
||||||
/libssh-0.6.0.tar.xz
|
/libssh-0.6.0.tar.xz
|
||||||
/libssh-0.6.1.tar.xz
|
/libssh-0.6.1.tar.xz
|
||||||
|
/libssh-0.6.3.tar.xz
|
||||||
|
|||||||
@ -1,67 +0,0 @@
|
|||||||
Description: Be sure we never build LaTeX documentation
|
|
||||||
Author: Laurent Bigonville <bigon@debian.org>
|
|
||||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622108
|
|
||||||
|
|
||||||
Index: libssh-0.5.5/doc/doxy.config.in
|
|
||||||
===================================================================
|
|
||||||
--- libssh-0.5.5.orig/doc/doxy.config.in
|
|
||||||
+++ libssh-0.5.5/doc/doxy.config.in
|
|
||||||
@@ -1015,7 +1015,7 @@ SEARCHENGINE = NO
|
|
||||||
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
|
|
||||||
# generate Latex output.
|
|
||||||
|
|
||||||
-GENERATE_LATEX = @DOXYFILE_LATEX@
|
|
||||||
+GENERATE_LATEX = NO
|
|
||||||
|
|
||||||
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
|
|
||||||
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
|
|
||||||
Index: libssh-0.5.5/cmake/Modules/UseDoxygen.cmake
|
|
||||||
===================================================================
|
|
||||||
--- libssh-0.5.5.orig/cmake/Modules/UseDoxygen.cmake
|
|
||||||
+++ libssh-0.5.5/cmake/Modules/UseDoxygen.cmake
|
|
||||||
@@ -63,27 +63,27 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
|
|
||||||
set(DOXYFILE_PDFLATEX FALSE)
|
|
||||||
set(DOXYFILE_DOT FALSE)
|
|
||||||
|
|
||||||
- find_package(LATEX)
|
|
||||||
- if(LATEX_COMPILER AND MAKEINDEX_COMPILER)
|
|
||||||
- set(DOXYFILE_LATEX TRUE)
|
|
||||||
- usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex")
|
|
||||||
+ #find_package(LATEX)
|
|
||||||
+ #if(LATEX_COMPILER AND MAKEINDEX_COMPILER)
|
|
||||||
+ # set(DOXYFILE_LATEX TRUE)
|
|
||||||
+ # usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex")
|
|
||||||
|
|
||||||
- set_property(DIRECTORY APPEND PROPERTY
|
|
||||||
- ADDITIONAL_MAKE_CLEAN_FILES
|
|
||||||
- "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
|
|
||||||
+ # set_property(DIRECTORY APPEND PROPERTY
|
|
||||||
+ # ADDITIONAL_MAKE_CLEAN_FILES
|
|
||||||
+ # "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
|
|
||||||
|
|
||||||
- if(PDFLATEX_COMPILER)
|
|
||||||
- set(DOXYFILE_PDFLATEX TRUE)
|
|
||||||
- endif()
|
|
||||||
- if(DOXYGEN_DOT_EXECUTABLE)
|
|
||||||
- set(DOXYFILE_DOT TRUE)
|
|
||||||
- endif()
|
|
||||||
+ # if(PDFLATEX_COMPILER)
|
|
||||||
+ # set(DOXYFILE_PDFLATEX TRUE)
|
|
||||||
+ # endif()
|
|
||||||
+ # if(DOXYGEN_DOT_EXECUTABLE)
|
|
||||||
+ # set(DOXYFILE_DOT TRUE)
|
|
||||||
+ # endif()
|
|
||||||
|
|
||||||
- add_custom_command(TARGET doxygen
|
|
||||||
- POST_BUILD
|
|
||||||
- COMMAND ${CMAKE_MAKE_PROGRAM}
|
|
||||||
- WORKING_DIRECTORY "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
|
|
||||||
- endif()
|
|
||||||
+ # add_custom_command(TARGET doxygen
|
|
||||||
+ # POST_BUILD
|
|
||||||
+ # COMMAND ${CMAKE_MAKE_PROGRAM}
|
|
||||||
+ # WORKING_DIRECTORY "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
|
|
||||||
+ #endif()
|
|
||||||
|
|
||||||
configure_file(${DOXYFILE_IN} ${CMAKE_CURRENT_BINARY_DIR}/doxy.config ESCAPE_QUOTES IMMEDIATE @ONLY)
|
|
||||||
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doxy.trac.in)
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
Description: Do not exclude "*/build/*" directory as buildd use that path
|
|
||||||
Author: Laurent Bigonville <bigon@debian.org>
|
|
||||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libssh/+bug/821437
|
|
||||||
|
|
||||||
--- a/doc/doxy.config.in
|
|
||||||
+++ b/doc/doxy.config.in
|
|
||||||
@@ -631,8 +631,7 @@
|
|
||||||
|
|
||||||
EXCLUDE_PATTERNS = */.git/* \
|
|
||||||
*/.svn/* \
|
|
||||||
- */cmake/* \
|
|
||||||
- */build/*
|
|
||||||
+ */cmake/*
|
|
||||||
|
|
||||||
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
|
|
||||||
# (namespaces, classes, functions, etc.) that should be excluded from the
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
Name: libssh
|
Name: libssh
|
||||||
Version: 0.6.1
|
Version: 0.6.3
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A library implementing the SSH protocol
|
Summary: A library implementing the SSH protocol
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -7,7 +7,7 @@ URL: http://www.libssh.org
|
|||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
Source0: https://red.libssh.org/attachments/download/81/libssh-0.6.1.tar.xz
|
Source0: https://red.libssh.org/attachments/download/87/libssh-0.6.3.tar.xz
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -83,6 +83,9 @@ rm -rf %{buildroot}
|
|||||||
%{_libdir}/libssh_threads.so
|
%{_libdir}/libssh_threads.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 04 2014 - Andreas Schneider <asn@redhat.com> - 0.6.3-1
|
||||||
|
- Fix CVE-2014-0017.
|
||||||
|
|
||||||
* Mon Feb 10 2014 - Andreas Schneider <asn@redhat.com> - 0.6.1-1
|
* Mon Feb 10 2014 - Andreas Schneider <asn@redhat.com> - 0.6.1-1
|
||||||
- Update to version 0.6.1.
|
- Update to version 0.6.1.
|
||||||
- resolves: #1056757 - Fix scp mode.
|
- resolves: #1056757 - Fix scp mode.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user