root
9 years ago
parent
76ca471226
commit
56901640ee
@ -0,0 +1,16 @@
|
||||
https://lists.gnu.org/archive/html/bug-bash/2015-07/msg00060.html
|
||||
|
||||
*** ../bash-4.4-alpha/execute_cmd.c 2015-06-12 17:29:18.000000000 -0400
|
||||
--- execute_cmd.c 2015-07-14 08:59:22.000000000 -0400
|
||||
***************
|
||||
*** 2630,2638 ****
|
||||
if (ignore_return && second)
|
||||
second->flags |= CMD_IGNORE_RETURN;
|
||||
- if (should_suppress_fork (second))
|
||||
- {
|
||||
- second->flags |= CMD_NO_FORK;
|
||||
- second->value.Simple->flags |= CMD_NO_FORK;
|
||||
- }
|
||||
|
||||
exec_result = execute_command (second);
|
||||
--- 2630,2633 ----
|
||||
@ -1,2 +1 @@
|
||||
DIST OpenSceneGraph-3.0.1.zip 6780282 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 SHA512 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912 WHIRLPOOL e3e24e2b36fd59a823d43864e7123d3683a8b2ef4e09cae17895d4b15eb4321bdd112cd59a734e1e55924cc9af52198c6152797bd73ab33a91bf17936232a7b0
|
||||
DIST OpenSceneGraph-3.2.1.zip 7219212 SHA256 d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d SHA512 f7bd9aedd3a1f48094a0ad95d267c2f2c946b042f7459d6b33e6038a4b16aeda9cfd69f339ea0a2a478dadadf1875313a4132564b8fcade5ad93511ecd8c1a9e WHIRLPOOL ef47a41a316fae86341cdebecaeceb41cf56b5f11fdf93e8218bb9aa9eaa28fc2fc9122efbeb8dce69fa01d8c8b6a2460fab69190714ca53abfa5d347a0ae1bc
|
||||
|
||||
@ -1,293 +0,0 @@
|
||||
diff -ruN OpenSceneGraph-3.0.1/CMakeLists.txt new/CMakeLists.txt
|
||||
--- OpenSceneGraph-3.0.1/CMakeLists.txt 2011-07-31 09:50:34.000000000 +0200
|
||||
+++ new/CMakeLists.txt 2014-02-11 23:12:54.360448879 +0100
|
||||
@@ -421,6 +421,7 @@
|
||||
|
||||
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
|
||||
|
||||
+INCLUDE(MacroOptionalFindPackage)
|
||||
|
||||
################################################################################
|
||||
# Set Version Info resource file
|
||||
@@ -450,30 +451,30 @@
|
||||
ANDROID_3RD_PARTY()
|
||||
ELSE()
|
||||
# Common to all platforms except android:
|
||||
- FIND_PACKAGE(FreeType)
|
||||
- FIND_PACKAGE(Inventor)
|
||||
- FIND_PACKAGE(Jasper)
|
||||
- FIND_PACKAGE(OpenEXR)
|
||||
- FIND_PACKAGE(COLLADA)
|
||||
- FIND_PACKAGE(FBX)
|
||||
- FIND_PACKAGE(ZLIB)
|
||||
- FIND_PACKAGE(Xine)
|
||||
- FIND_PACKAGE(OpenVRML)
|
||||
- FIND_PACKAGE(Performer)
|
||||
- FIND_PACKAGE(GDAL)
|
||||
- FIND_PACKAGE(CURL)
|
||||
- FIND_PACKAGE(ITK)
|
||||
- FIND_PACKAGE(LibVNCServer)
|
||||
- FIND_PACKAGE(OurDCMTK)
|
||||
- FIND_PACKAGE(OpenAL)
|
||||
- FIND_PACKAGE(FFmpeg)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(FBX)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(Xine)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(Performer)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(CURL)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(ITK)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
|
||||
FIND_PACKAGE(DirectShow)
|
||||
- FIND_PACKAGE(SDL)
|
||||
- FIND_PACKAGE(Poppler-glib)
|
||||
- FIND_PACKAGE(RSVG)
|
||||
- FIND_PACKAGE(GtkGl)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(SDL)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
|
||||
FIND_PACKAGE(DirectInput)
|
||||
- FIND_PACKAGE(NVTT)
|
||||
+MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
|
||||
ENDIF()
|
||||
|
||||
# Include macro utilities here
|
||||
@@ -485,17 +486,17 @@
|
||||
IF (DESIRED_QT_VERSION)
|
||||
|
||||
IF (DESIRED_QT_VERSION MATCHES 4)
|
||||
- FIND_PACKAGE(Qt4)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
|
||||
ELSE()
|
||||
- FIND_PACKAGE(Qt3)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
|
||||
ENDIF()
|
||||
|
||||
ELSE()
|
||||
|
||||
- FIND_PACKAGE(Qt4)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
|
||||
|
||||
IF (NOT QT4_FOUND)
|
||||
- FIND_PACKAGE(Qt3)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
|
||||
ENDIF()
|
||||
|
||||
ENDIF()
|
||||
@@ -504,12 +505,12 @@
|
||||
IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
|
||||
|
||||
|
||||
- FIND_PACKAGE(FLTK)
|
||||
- FIND_PACKAGE(GLUT)
|
||||
- FIND_PACKAGE(FOX)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(FOX)
|
||||
|
||||
SET(wxWidgets_USE_LIBS base core gl net)
|
||||
- FIND_PACKAGE(wxWidgets)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
|
||||
|
||||
ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
|
||||
|
||||
@@ -530,10 +531,10 @@
|
||||
# can use Quicktime.
|
||||
IF(NOT ANDROID)
|
||||
IF(NOT APPLE)
|
||||
- FIND_PACKAGE(GIFLIB)
|
||||
- FIND_PACKAGE(JPEG)
|
||||
- FIND_PACKAGE(PNG)
|
||||
- FIND_PACKAGE(TIFF)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(PNG)
|
||||
+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
|
||||
|
||||
# QuickTime is required for OS X, but optional for Windows.
|
||||
IF(WIN32)
|
||||
@@ -586,15 +587,7 @@
|
||||
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
|
||||
ENDIF()
|
||||
|
||||
-IF(UNIX AND NOT WIN32 AND NOT APPLE)
|
||||
- IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
|
||||
- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
|
||||
- MARK_AS_ADVANCED(LIB_POSTFIX)
|
||||
- ENDIF()
|
||||
-ENDIF()
|
||||
-IF(NOT DEFINED LIB_POSTFIX)
|
||||
- SET(LIB_POSTFIX "")
|
||||
-ENDIF()
|
||||
+SET(LIB_POSTFIX ${LIB_SUFFIX})
|
||||
|
||||
# Here we apparantly do some funky stuff with making the bin/ and lib/
|
||||
# folders which is probably needed to work around a very old CMake bug?
|
||||
@@ -884,7 +877,7 @@
|
||||
${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
|
||||
)
|
||||
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
|
||||
- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
|
||||
+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
|
||||
|
||||
# now set up openthreads documentation generation
|
||||
IF(BUILD_REF_DOCS_TAGFILE)
|
||||
@@ -900,7 +893,7 @@
|
||||
${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
|
||||
)
|
||||
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
|
||||
- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
|
||||
+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
|
||||
|
||||
# Process our other doxyfiles but don't create targets for these
|
||||
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
|
||||
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS
|
||||
--- OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ new/CMakeModules/COPYING-CMAKE-SCRIPTS 2014-02-11 23:12:31.241449702 +0100
|
||||
@@ -0,0 +1,22 @@
|
||||
+Redistribution and use in source and binary forms, with or without
|
||||
+modification, are permitted provided that the following conditions
|
||||
+are met:
|
||||
+
|
||||
+1. Redistributions of source code must retain the copyright
|
||||
+ notice, this list of conditions and the following disclaimer.
|
||||
+2. Redistributions in binary form must reproduce the copyright
|
||||
+ notice, this list of conditions and the following disclaimer in the
|
||||
+ documentation and/or other materials provided with the distribution.
|
||||
+3. The name of the author may not be used to endorse or promote products
|
||||
+ derived from this software without specific prior written permission.
|
||||
+
|
||||
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake
|
||||
--- OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake 2010-11-11 17:51:46.000000000 +0100
|
||||
+++ new/CMakeModules/FindFLTK.cmake 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,52 +0,0 @@
|
||||
-# Locate FLTK
|
||||
-# This module defines
|
||||
-# FLTK_LIBRARY
|
||||
-# FLTK_FOUND, if false, do not try to link to gdal
|
||||
-# FLTK_INCLUDE_DIR, where to find the headers
|
||||
-#
|
||||
-# $FLTK_DIR is an environment variable that would
|
||||
-# correspond to the ./configure --prefix=$FLTK_DIR
|
||||
-#
|
||||
-# Created by Robert Osfield.
|
||||
-
|
||||
-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
|
||||
- $ENV{FLTK_DIR}/include
|
||||
- $ENV{FLTK_DIR}
|
||||
- ~/Library/Frameworks
|
||||
- /Library/Frameworks
|
||||
- /usr/local/include
|
||||
- /usr/include
|
||||
- /sw/include # Fink
|
||||
- /opt/local/include # DarwinPorts
|
||||
- /opt/csw/include # Blastwave
|
||||
- /opt/include
|
||||
- /usr/freeware/include
|
||||
-)
|
||||
-
|
||||
-MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
|
||||
-
|
||||
- FIND_LIBRARY(${MYLIBRARY}
|
||||
- NAMES ${MYLIBRARYNAME}
|
||||
- PATHS
|
||||
- $ENV{FLTK_DIR}/lib
|
||||
- $ENV{FLTK_DIR}
|
||||
- ~/Library/Frameworks
|
||||
- /Library/Frameworks
|
||||
- /usr/local/lib
|
||||
- /usr/lib
|
||||
- /sw/lib
|
||||
- /opt/local/lib
|
||||
- /opt/csw/lib
|
||||
- /opt/lib
|
||||
- /usr/freeware/lib64
|
||||
- )
|
||||
-
|
||||
-ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
|
||||
-
|
||||
-FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
|
||||
-FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
|
||||
-
|
||||
-SET(FLTK_FOUND "NO")
|
||||
-IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
|
||||
- SET(FLTK_FOUND "YES")
|
||||
-ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
|
||||
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake
|
||||
--- OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ new/CMakeModules/MacroOptionalFindPackage.cmake 2014-02-11 23:12:31.256449701 +0100
|
||||
@@ -0,0 +1,28 @@
|
||||
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
|
||||
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
|
||||
+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
|
||||
+# works like FIND_PACKAGE(), but additionally it automatically creates
|
||||
+# an option name WITH_<name>, which can be disabled via the cmake GUI.
|
||||
+# or via -DWITH_<name>=OFF
|
||||
+# The standard <name>_FOUND variables can be used in the same way
|
||||
+# as when using the normal FIND_PACKAGE()
|
||||
+
|
||||
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
|
||||
+#
|
||||
+# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
+
|
||||
+
|
||||
+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
|
||||
+ option(WITH_${_name} "Search for ${_name} package" ON)
|
||||
+ if (WITH_${_name})
|
||||
+ find_package(${_name} ${ARGN})
|
||||
+ else (WITH_${_name})
|
||||
+ set(${_name}_FOUND)
|
||||
+ set(${_name}_INCLUDE_DIR)
|
||||
+ set(${_name}_INCLUDES)
|
||||
+ set(${_name}_LIBRARY)
|
||||
+ set(${_name}_LIBRARIES)
|
||||
+ endif (WITH_${_name})
|
||||
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
|
||||
+
|
||||
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake
|
||||
--- OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake 2011-04-21 19:16:27.000000000 +0200
|
||||
+++ new/CMakeModules/OsgMacroUtils.cmake 2014-02-11 23:12:31.280449700 +0100
|
||||
@@ -445,9 +445,9 @@
|
||||
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
|
||||
|
||||
IF(APPLE)
|
||||
- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
|
||||
+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
|
||||
ELSE(APPLE)
|
||||
- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
|
||||
+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
|
||||
ENDIF(APPLE)
|
||||
|
||||
ENDMACRO(SETUP_EXAMPLE)
|
||||
diff -ruN OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt
|
||||
--- OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt 2007-06-25 10:35:06.000000000 +0200
|
||||
+++ new/examples/osgviewerFLTK/CMakeLists.txt 2014-02-11 23:12:31.331449698 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
SET(TARGET_SRC osgviewerFLTK.cpp )
|
||||
|
||||
-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
|
||||
+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
|
||||
|
||||
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff -ruN OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
|
||||
--- OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-06-17 10:41:56.000000000 +0200
|
||||
+++ my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-11-17 19:44:33.194607494 +0100
|
||||
@@ -9,12 +9,13 @@
|
||||
#define FF_API_OLD_SAMPLE_FMT 0
|
||||
#include <errno.h> // for error codes defined in avformat.h
|
||||
#include <stdint.h>
|
||||
-#include <avcodec.h>
|
||||
-#include <avformat.h>
|
||||
-#include <avdevice.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
+#include <libavdevice/avdevice.h>
|
||||
+#include <libavutil/mathematics.h>
|
||||
|
||||
-#ifdef USE_SWSCALE
|
||||
- #include <swscale.h>
|
||||
+#ifdef USE_SWSCALE
|
||||
+ #include <libswscale/swscale.h>
|
||||
#endif
|
||||
|
||||
}
|
||||
@ -1,284 +0,0 @@
|
||||
Patch by lu_zero
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=439606
|
||||
upstream svn rev. 13335 contains similar changes.
|
||||
no need to upstream this patch.
|
||||
|
||||
diff -burN OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake
|
||||
--- OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake 2011-04-19 13:40:22.000000000 +0200
|
||||
+++ OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake 2012-11-22 13:59:28.303401170 +0100
|
||||
@@ -131,20 +131,16 @@
|
||||
SET(FFMPEG_FOUND "YES")
|
||||
|
||||
SET(FFMPEG_INCLUDE_DIRS
|
||||
- ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat
|
||||
- ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice
|
||||
- ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec
|
||||
- ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavutil
|
||||
+ ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}
|
||||
+ ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}
|
||||
+ ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}
|
||||
+ ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
IF (FFMPEG_STDINT_INCLUDE_DIR)
|
||||
SET(FFMPEG_INCLUDE_DIRS
|
||||
${FFMPEG_INCLUDE_DIRS}
|
||||
${FFMPEG_STDINT_INCLUDE_DIR}
|
||||
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavformat
|
||||
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavdevice
|
||||
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavcodec
|
||||
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavutil
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
|
||||
--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2011-04-19 13:40:22.000000000 +0200
|
||||
+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2012-11-22 15:03:53.668601596 +0100
|
||||
@@ -89,7 +89,7 @@
|
||||
// m_context->flags |= CODEC_FLAG_TRUNCATED;
|
||||
|
||||
// Open codec
|
||||
- if (avcodec_open(m_context, p_codec) < 0)
|
||||
+ if (avcodec_open2(m_context, p_codec, NULL) < 0)
|
||||
throw std::runtime_error("avcodec_open() failed");
|
||||
}
|
||||
|
||||
Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp differ
|
||||
diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
|
||||
--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp 2011-07-15 12:25:12.000000000 +0200
|
||||
+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp 2012-11-22 15:59:39.569775078 +0100
|
||||
@@ -64,21 +64,12 @@
|
||||
|
||||
OSG_NOTICE<<"Attempting to stream "<<filename<<std::endl;
|
||||
|
||||
- AVFormatParameters formatParams;
|
||||
- memset(&formatParams, 0, sizeof(AVFormatParameters));
|
||||
AVInputFormat *iformat;
|
||||
+ AVDictionary *options = NULL;
|
||||
|
||||
- formatParams.channel = 0;
|
||||
- formatParams.standard = 0;
|
||||
-#if 1
|
||||
- formatParams.width = 320;
|
||||
- formatParams.height = 240;
|
||||
-#else
|
||||
- formatParams.width = 640;
|
||||
- formatParams.height = 480;
|
||||
-#endif
|
||||
- formatParams.time_base.num = 1;
|
||||
- formatParams.time_base.den = 30;
|
||||
+ av_dict_set(&options, "video_size", "320x240", 0);
|
||||
+
|
||||
+ av_dict_set(&options, "framerate", "1/30", 0);
|
||||
|
||||
std::string format = "video4linux2";
|
||||
iformat = av_find_input_format(format.c_str());
|
||||
@@ -92,7 +83,7 @@
|
||||
OSG_NOTICE<<"Failed to find input format: "<<format<<std::endl;
|
||||
}
|
||||
|
||||
- int error = av_open_input_file(&p_format_context, filename.c_str(), iformat, 0, &formatParams);
|
||||
+ int error = avformat_open_input(&p_format_context, filename.c_str(), iformat, &options);
|
||||
if (error != 0)
|
||||
{
|
||||
std::string error_str;
|
||||
@@ -110,21 +101,21 @@
|
||||
default: error_str = "Unknown error"; break;
|
||||
}
|
||||
|
||||
- throw std::runtime_error("av_open_input_file() failed : " + error_str);
|
||||
+ throw std::runtime_error("avformat_open_input() failed : " + error_str);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
AVInputFormat* av_format = (parameters ? parameters->getFormat() : 0);
|
||||
- AVFormatParameters* av_params = (parameters ? parameters->getFormatParameter() : 0);
|
||||
- if (av_open_input_file(&p_format_context, filename.c_str(), av_format, 0, av_params) !=0 )
|
||||
+ AVDictionary* av_options = (parameters ? parameters->getOptions() : NULL);
|
||||
+ if (avformat_open_input(&p_format_context, filename.c_str(), av_format, &av_options) !=0 )
|
||||
throw std::runtime_error("av_open_input_file() failed");
|
||||
}
|
||||
|
||||
m_format_context.reset(p_format_context);
|
||||
|
||||
// Retrieve stream info
|
||||
- if (av_find_stream_info(p_format_context) < 0)
|
||||
+ if (avformat_find_stream_info(p_format_context, NULL) < 0)
|
||||
throw std::runtime_error("av_find_stream_info() failed");
|
||||
|
||||
m_duration = double(m_format_context->duration) / AV_TIME_BASE;
|
||||
@@ -134,7 +125,7 @@
|
||||
m_clocks.reset(m_start);
|
||||
|
||||
// Dump info to stderr
|
||||
- dump_format(p_format_context, 0, filename.c_str(), false);
|
||||
+ av_dump_format(p_format_context, 0, filename.c_str(), false);
|
||||
|
||||
// Find and open the first video and audio streams (note that audio stream is optional and only opened if possible)
|
||||
|
||||
@@ -292,7 +283,7 @@
|
||||
// Read the next frame packet
|
||||
if (av_read_frame(m_format_context.get(), &packet) < 0)
|
||||
{
|
||||
- if (url_ferror(m_format_context->pb) == 0)
|
||||
+ if (m_format_context->pb->eof_reached == 0)
|
||||
end_of_stream = true;
|
||||
else
|
||||
throw std::runtime_error("av_read_frame() failed");
|
||||
Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp differ
|
||||
diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp
|
||||
--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp 2011-04-19 13:40:22.000000000 +0200
|
||||
+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp 2012-11-22 15:59:18.895774005 +0100
|
||||
@@ -46,8 +46,8 @@
|
||||
{
|
||||
if (_ptr)
|
||||
{
|
||||
- OSG_NOTICE<<"Calling av_close_input_file("<<_ptr<<")"<<std::endl;
|
||||
- av_close_input_file(_ptr);
|
||||
+ OSG_NOTICE<<"Calling avformat_close_input("<<_ptr<<")"<<std::endl;
|
||||
+ avformat_close_input(&_ptr);
|
||||
}
|
||||
_ptr = 0;
|
||||
}
|
||||
@@ -151,8 +151,7 @@
|
||||
|
||||
inline double FFmpegDecoder::creation_time() const
|
||||
{
|
||||
- if(m_format_context) return m_format_context->timestamp;
|
||||
- else return HUGE_VAL;
|
||||
+ return HUGE_VAL;
|
||||
}
|
||||
|
||||
inline double FFmpegDecoder::duration() const
|
||||
diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
|
||||
--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp 2011-04-19 13:40:22.000000000 +0200
|
||||
+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp 2012-11-22 16:01:30.906780849 +0100
|
||||
@@ -83,7 +83,7 @@
|
||||
m_context = stream->codec;
|
||||
|
||||
// Trust the video size given at this point
|
||||
- // (avcodec_open seems to sometimes return a 0x0 size)
|
||||
+ // (avcodec_open2 seems to sometimes return a 0x0 size)
|
||||
m_width = m_context->width;
|
||||
m_height = m_context->height;
|
||||
findAspectRatio();
|
||||
@@ -105,8 +105,8 @@
|
||||
// m_context->flags |= CODEC_FLAG_TRUNCATED;
|
||||
|
||||
// Open codec
|
||||
- if (avcodec_open(m_context, m_codec) < 0)
|
||||
- throw std::runtime_error("avcodec_open() failed");
|
||||
+ if (avcodec_open2(m_context, m_codec, NULL) < 0)
|
||||
+ throw std::runtime_error("avcodec_open2() failed");
|
||||
|
||||
// Allocate video frame
|
||||
m_frame.reset(avcodec_alloc_frame());
|
||||
Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp differ
|
||||
diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
|
||||
--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp 2011-07-15 12:25:12.000000000 +0200
|
||||
+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp 2012-11-22 17:20:09.019025477 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
#if LIBAVCODEC_VERSION_MAJOR >= 53
|
||||
extern "C"
|
||||
{
|
||||
- #include <parseutils.h>
|
||||
+ #include <libavutil/parseutils.h>
|
||||
}
|
||||
#define av_parse_video_frame_size av_parse_video_size
|
||||
#define av_parse_video_frame_rate av_parse_video_rate
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
- #include <pixdesc.h>
|
||||
+ #include <libavutil/pixdesc.h>
|
||||
}
|
||||
|
||||
inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
|
||||
@@ -34,14 +34,15 @@
|
||||
|
||||
|
||||
FFmpegParameters::FFmpegParameters() :
|
||||
- m_format(0)
|
||||
-{
|
||||
- memset(&m_parameters, 0, sizeof(m_parameters));
|
||||
-}
|
||||
+ m_format(0),
|
||||
+ m_options(NULL)
|
||||
+{}
|
||||
|
||||
|
||||
FFmpegParameters::~FFmpegParameters()
|
||||
-{}
|
||||
+{
|
||||
+ av_dict_free(&m_options);
|
||||
+}
|
||||
|
||||
|
||||
void FFmpegParameters::parse(const std::string& name, const std::string& value)
|
||||
@@ -59,40 +60,19 @@
|
||||
}
|
||||
else if (name == "pixel_format")
|
||||
{
|
||||
- m_parameters.pix_fmt = osg_av_get_pix_fmt(value.c_str());
|
||||
+ av_dict_set(&m_options, "pixel_format", value.c_str(), 0);
|
||||
}
|
||||
else if (name == "frame_size")
|
||||
{
|
||||
- int frame_width = 0, frame_height = 0;
|
||||
- if (av_parse_video_frame_size(&frame_width, &frame_height, value.c_str()) < 0)
|
||||
- {
|
||||
- OSG_NOTICE<<"Failed to apply frame size: "<<value.c_str()<<std::endl;
|
||||
- return;
|
||||
- }
|
||||
- if ((frame_width % 2) != 0 || (frame_height % 2) != 0)
|
||||
- {
|
||||
- OSG_NOTICE<<"Frame size must be a multiple of 2: "<<frame_width<<"x"<<frame_height<<std::endl;
|
||||
- return;
|
||||
- }
|
||||
- m_parameters.width = frame_width;
|
||||
- m_parameters.height = frame_height;
|
||||
+ av_dict_set(&m_options, "video_size", value.c_str(), 0);
|
||||
}
|
||||
else if (name == "frame_rate")
|
||||
{
|
||||
- AVRational frame_rate;
|
||||
- if (av_parse_video_frame_rate(&frame_rate, value.c_str()) < 0)
|
||||
- {
|
||||
- OSG_NOTICE<<"Failed to apply frame rate: "<<value.c_str()<<std::endl;
|
||||
- return;
|
||||
- }
|
||||
- m_parameters.time_base.den = frame_rate.num;
|
||||
- m_parameters.time_base.num = frame_rate.den;
|
||||
+ av_dict_set(&m_options, "framerate", value.c_str(), 0);
|
||||
}
|
||||
else if (name == "audio_sample_rate")
|
||||
{
|
||||
- int audio_sample_rate = 44100;
|
||||
- std::stringstream ss(value); ss >> audio_sample_rate;
|
||||
- m_parameters.sample_rate = audio_sample_rate;
|
||||
+ av_dict_set(&m_options, "sample_rate", value.c_str(), 0);
|
||||
}
|
||||
}
|
||||
|
||||
diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp
|
||||
--- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp 2011-04-19 13:40:22.000000000 +0200
|
||||
+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp 2012-11-22 15:23:27.490662455 +0100
|
||||
@@ -21,14 +21,14 @@
|
||||
bool isFormatAvailable() const { return m_format!=NULL; }
|
||||
|
||||
AVInputFormat* getFormat() { return m_format; }
|
||||
- AVFormatParameters* getFormatParameter() { return &m_parameters; }
|
||||
+ AVDictionary* getOptions() { return m_options; }
|
||||
|
||||
void parse(const std::string& name, const std::string& value);
|
||||
|
||||
protected:
|
||||
|
||||
AVInputFormat* m_format;
|
||||
- AVFormatParameters m_parameters;
|
||||
+ AVDictionary* m_options;
|
||||
};
|
||||
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
http://bugs.gentoo.org/397643
|
||||
|
||||
--- src/osgPlugins/xine/video_out_rgb.c
|
||||
+++ src/osgPlugins/xine/video_out_rgb.c
|
||||
@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
|
||||
clear(rgb_class, sizeof(rgbout_class_t));
|
||||
|
||||
rgb_class->driver_class.open_plugin = open_plugin;
|
||||
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
|
||||
rgb_class->driver_class.get_identifier = get_identifier;
|
||||
rgb_class->driver_class.get_description = get_description;
|
||||
+#else
|
||||
+ rgb_class->driver_class.identifier = get_identifier(NULL);
|
||||
+ rgb_class->driver_class.description = get_description(NULL);
|
||||
+#endif
|
||||
+
|
||||
rgb_class->driver_class.dispose = dispose_class;
|
||||
|
||||
return(rgb_class);
|
||||
@ -0,0 +1,85 @@
|
||||
add support for isl-0.15+
|
||||
|
||||
--- a/source/isl/domain.c
|
||||
+++ b/source/isl/domain.c
|
||||
@@ -68,25 +68,39 @@
|
||||
void cloog_domain_print_constraints(FILE *foo, CloogDomain *domain,
|
||||
int print_number)
|
||||
{
|
||||
+ isl_printer *printer;
|
||||
isl_basic_set *bset;
|
||||
isl_set *set = isl_set_from_cloog_domain(domain);
|
||||
|
||||
- if (print_number)
|
||||
- isl_set_print(set, foo, 0, ISL_FORMAT_EXT_POLYLIB);
|
||||
- else {
|
||||
+ printer = isl_printer_to_file(isl_set_get_ctx(set), foo);
|
||||
+ printer = isl_printer_set_indent(printer, 0);
|
||||
+ printer = isl_printer_set_prefix(printer, NULL);
|
||||
+ printer = isl_printer_set_suffix(printer, NULL);
|
||||
+
|
||||
+ if (print_number) {
|
||||
+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
|
||||
+ printer = isl_printer_print_set(printer, set);
|
||||
+ } else {
|
||||
assert(isl_set_n_basic_set(set) == 1);
|
||||
bset = isl_set_copy_basic_set(set);
|
||||
- isl_basic_set_print(bset, foo,
|
||||
- 0, NULL, NULL, ISL_FORMAT_POLYLIB);
|
||||
+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_POLYLIB);
|
||||
+ isl_printer_print_basic_set(printer, bset);
|
||||
isl_basic_set_free(bset);
|
||||
}
|
||||
+
|
||||
+ isl_printer_free(printer);
|
||||
}
|
||||
|
||||
|
||||
void cloog_scattering_print_constraints(FILE *foo, CloogScattering *scattering)
|
||||
{
|
||||
+ isl_printer *printer;
|
||||
isl_map *map = isl_map_from_cloog_scattering(scattering);
|
||||
- isl_map_print(map, foo, 0, ISL_FORMAT_EXT_POLYLIB);
|
||||
+ printer = isl_printer_to_file(isl_map_get_ctx(map), foo);
|
||||
+ printer = isl_printer_set_indent(printer, 0);
|
||||
+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
|
||||
+ printer = isl_printer_print_map(printer, map);
|
||||
+ isl_printer_free(printer);
|
||||
}
|
||||
|
||||
|
||||
@@ -343,6 +357,7 @@
|
||||
void cloog_domain_print_structure(FILE *file, CloogDomain *domain, int level,
|
||||
const char *name)
|
||||
{
|
||||
+ isl_printer *printer;
|
||||
int i ;
|
||||
isl_set *set = isl_set_from_cloog_domain(domain);
|
||||
|
||||
@@ -358,7 +373,11 @@
|
||||
for (i = 0; i < level+1; ++i)
|
||||
fprintf(file, "|\t");
|
||||
|
||||
- isl_set_print(set, file, 0, ISL_FORMAT_ISL);
|
||||
+ printer = isl_printer_to_file(isl_set_get_ctx(set), file);
|
||||
+ printer = isl_printer_set_indent(printer, 0);
|
||||
+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
|
||||
+ printer = isl_printer_print_set(printer, set);
|
||||
+ isl_printer_free(printer);
|
||||
|
||||
fprintf(file, "\n");
|
||||
}
|
||||
|
||||
https://groups.google.com/d/msg/isl-development/362AYAibze4/STY799KhdHMJ
|
||||
|
||||
--- a/source/isl/constraints.c
|
||||
+++ a/source/isl/constraints.c
|
||||
@@ -438,6 +438,8 @@
|
||||
}
|
||||
|
||||
|
||||
+/* Newer isl doesn't declare this in the headers, but it still exports the symbol ... */
|
||||
+extern struct isl_basic_set *isl_basic_set_dup(struct isl_basic_set *bset);
|
||||
|
||||
/**
|
||||
* cloog_constraint_set_copy function:
|
||||
@ -0,0 +1 @@
|
||||
DIST kdev-qmljs-1.7.0.tar.xz 245968 SHA256 70927785de7791335eda43b55ef7742af7915425823d5f70b97edac1828681e1 SHA512 844f6dbf7f9f30a5361556edb7d7872250bb9999846b156465785d013c5be162e019019c364832d87f034c1d4ffdbf9f7ef5a1c7b54d676739776bdef1b13940 WHIRLPOOL 63fd36d00c966bdc6e957f004656d63bdc01f1f070a55d90130cb9f55398263526e08b2d6f2524aeb2dbcf15972463fc0bb2dade236c71a8feaacbd46e82e6d1
|
||||
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild,v 1.1 2015/07/14 20:52:52 johu Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDEBASE="kdevelop"
|
||||
KMNAME="kdev-qmljs"
|
||||
KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl
|
||||
pt pt_BR ru sl sv uk zh_CN zh_TW"
|
||||
MY_P="${KMNAME}-${PV}"
|
||||
|
||||
inherit kde4-base
|
||||
|
||||
DESCRIPTION="QML and javascrip plugin for KDevelop 4"
|
||||
LICENSE="GPL-2 LGPL-2"
|
||||
IUSE="debug"
|
||||
SRC_URI="mirror://kde/stable/kdevelop/${KMNAME}/${PV}/src/${MY_P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
DEPEND="
|
||||
>=dev-util/kdevplatform-${PV}:4
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
dev-util/kdevelop:4
|
||||
"
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>kde</herd>
|
||||
</pkgmetadata>
|
||||
@ -1 +1,2 @@
|
||||
DIST iscan-data_1.22.0-1.tar.gz 96626 SHA256 e6ef1c275488d907869f48eb7889d9a01e564ea4b39e291e90843feb59e92ef8 SHA512 2adc6c125045803ffd269abab4f58d6d1c87ebd4c959985e6689d0b2e7f5a84fb1956d0e559c35b1704a1e330bc639e668c37f718c871e076a7ccf6c35562e6f WHIRLPOOL f4b7aaf68396c54295b40999653b4f1f8777d154e38ff1612a2458c2449570a6213fd41abeb13d6d06cba09828f8f35d485a6cce7303e8657a7ce87887657cc2
|
||||
DIST iscan-data_1.36.0-1.tar.gz 100218 SHA256 3a0a0075d0f7fcb0f482cbde2e74c9f6bee64268db32a4e6f470f1a6069117ba SHA512 a9711264c852dd4bdcdb10c1153f725a111bd74b03705c99265b6692bf47236c6e4f5e7e4813991eb5991deb198adeee272c8c3eb53da641ba189d923916d3cb WHIRLPOOL 5fc6bc042c7ee587e00b47f46f7b3ae3eba8646ac8c66ea5a1641d616f54fe75e7a1285b7146a4bba0e75bb88dae8c4478cefc270f6bf07e89f67b6ec3141f02
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild,v 1.1 2015/07/14 15:48:30 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils versionator udev multilib
|
||||
|
||||
MY_PV="$(get_version_component_range 1-3)"
|
||||
MY_PVR="$(replace_version_separator 3 -)"
|
||||
|
||||
DESCRIPTION="Image Scan! for Linux data files"
|
||||
HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
|
||||
# Use a gentoo hosted url since upstream uses a session based url that causes the
|
||||
# files to no longer be available after the session expires.
|
||||
SRC_URI="http://dev.gentoo.org/~idella4/tarballs//${PN}_${MY_PVR}.tar.gz"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="udev"
|
||||
|
||||
DEPEND="udev? (
|
||||
dev-libs/libxslt
|
||||
media-gfx/sane-backends
|
||||
)"
|
||||
RDEPEND=""
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
|
||||
|
||||
src_install() {
|
||||
ewarn ""; ewarn "Some profiles automatically enable udev which will cause install to fail"
|
||||
ewarn "if media-gfx/sane-backends is not already installed."; ewarn ""
|
||||
default
|
||||
|
||||
if use udev; then
|
||||
# create udev rules
|
||||
local rulesdir=$(get_udevdir)/rules.d
|
||||
dodir ${rulesdir}
|
||||
"${D}usr/$(get_libdir)/iscan-data/make-policy-file" \
|
||||
--force --mode udev \
|
||||
-d "${D}usr/share/iscan-data/epkowa.desc" \
|
||||
-o "${D}${rulesdir}/99-iscan.rules" || die
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
Depends on features removed in opencv3.
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=554516
|
||||
|
||||
Index: cinelerra-20140710/configure.ac
|
||||
===================================================================
|
||||
--- cinelerra-20140710.orig/configure.ac
|
||||
+++ cinelerra-20140710/configure.ac
|
||||
@@ -317,7 +317,7 @@ fi
|
||||
AC_DEFINE_UNQUOTED(HAVE_OPENCV_SURF, $HAVE_OPENCV_SURF,
|
||||
[define if SURF support is compiled into opencv])
|
||||
if test "x$opencv" = "xyes" && test "x$opencvh" = "xyes" ; then
|
||||
- enable_findobject=ok
|
||||
+ enable_findobject=no
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_FINDOBJECT,test "x$enable_findobject" = "xok")
|
||||
############## END OF MISC LIBRARIES
|
||||
@ -1 +1 @@
|
||||
Tue, 14 Jul 2015 15:06:56 +0000
|
||||
Wed, 15 Jul 2015 04:36:51 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 14 Jul 2015 15:06:56 +0000
|
||||
Wed, 15 Jul 2015 04:36:51 +0000
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-proto/xextproto doc? ( app-doc/doxygen ) xrandr? ( x11-proto/randrproto ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
DESCRIPTION=Open source high performance 3D graphics toolkit
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.openscenegraph.org/projects/osg/
|
||||
IUSE=curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k openexr openinventor osgapps pdf png qt4 sdl svg tiff truetype vnc wxwidgets xine xrandr zlib
|
||||
KEYWORDS=amd64 ppc x86
|
||||
LICENSE=wxWinLL-3 LGPL-2.1
|
||||
RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0.1/source/OpenSceneGraph-3.0.1.zip
|
||||
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 wxwidgets 6d6eec2685256d35511e7b6d5461bec9
|
||||
_md5_=10c3017acd091413e469e152bbfbb5ee
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-proto/xextproto doc? ( app-doc/doxygen ) xrandr? ( x11-proto/randrproto ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
DESCRIPTION=Open source high performance 3D graphics toolkit
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.openscenegraph.org/projects/osg/
|
||||
IUSE=asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k openexr openinventor osgapps pdf png qt4 qt5 sdl svg tiff truetype vnc wxwidgets xine xrandr zlib
|
||||
KEYWORDS=~amd64 ~ppc ~x86
|
||||
LICENSE=wxWinLL-3 LGPL-2.1
|
||||
RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
|
||||
REQUIRED_USE=qt4? ( !qt5 ) qt5? ( !qt4 )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip
|
||||
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 wxwidgets 6d6eec2685256d35511e7b6d5461bec9
|
||||
_md5_=f90de01db8c858d628e7faefaf2a7717
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
|
||||
DEPEND=>=dev-util/kdevplatform-1.7.0:4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.0.0:4
|
||||
DESCRIPTION=QML and javascrip plugin for KDevelop 4
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kdevelop.org/
|
||||
IUSE=debug linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=GPL-2 LGPL-2
|
||||
RDEPEND=>=dev-util/kdevplatform-1.7.0:4 dev-util/kdevelop:4 kde-apps/oxygen-icons linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.0.0:4
|
||||
SLOT=4
|
||||
SRC_URI=mirror://kde/stable/kdevelop/kdev-qmljs/1.7.0/src/kdev-qmljs-1.7.0.tar.xz
|
||||
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
|
||||
_md5_=011663f1fdff812159560b32eebd4c64
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=install
|
||||
DEPEND=udev? ( dev-libs/libxslt media-gfx/sane-backends ) virtual/pkgconfig
|
||||
DESCRIPTION=Image Scan! for Linux data files
|
||||
EAPI=5
|
||||
HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
|
||||
IUSE=udev
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=GPL-2
|
||||
SLOT=0
|
||||
SRC_URI=http://dev.gentoo.org/~idella4/tarballs//iscan-data_1.36.0-1.tar.gz
|
||||
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438 versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=b2a94679bd498c17088b9c1f8c555e12
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare
|
||||
DEPEND=ssl? ( dev-libs/openssl[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
|
||||
DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
|
||||
EAPI=4
|
||||
HOMEPAGE=http://hostap.epitest.fi
|
||||
IUSE=ipv6 logwatch netlink sqlite +ssl +wps +crda
|
||||
KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
|
||||
LICENSE=|| ( GPL-2 BSD )
|
||||
RDEPEND=ssl? ( dev-libs/openssl[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
|
||||
SLOT=0
|
||||
SRC_URI=http://hostap.epitest.fi/releases/hostapd-2.4.tar.gz
|
||||
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4
|
||||
_md5_=913eeb4c08407a473c9a3da13447a166
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup unpack
|
||||
DEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) dev-libs/libnl:3 net-wireless/crda ) !kernel_linux? ( net-libs/libpcap ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) readline? ( sys-libs/ncurses sys-libs/readline:0 ) ssl? ( dev-libs/openssl:0 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) virtual/pkgconfig virtual/pkgconfig
|
||||
DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
|
||||
EAPI=5
|
||||
HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/
|
||||
IUSE=ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
|
||||
LICENSE=|| ( GPL-2 BSD )
|
||||
RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) dev-libs/libnl:3 net-wireless/crda ) !kernel_linux? ( net-libs/libpcap ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) readline? ( sys-libs/ncurses sys-libs/readline:0 ) ssl? ( dev-libs/openssl:0 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) selinux? ( sec-policy/selinux-networkmanager )
|
||||
REQUIRED_USE=fasteap? ( !gnutls !ssl ) smartcard? ( ssl )
|
||||
SLOT=0
|
||||
SRC_URI=http://hostap.epitest.fi/releases/wpa_supplicant-2.4.tar.gz
|
||||
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 4ce40e37ef0e28425a7159b0353be026 qt4-r2 7199e3db5b5908325487d379c6f67cf0 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4
|
||||
_md5_=53eb99d39fa079a2120cd245cf887f62
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2] x11-libs/gtk+:2= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] pulseaudio? ( media-sound/pulseaudio ) dev-util/ragel virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
DESCRIPTION=PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/i-rinat/freshplayerplugin
|
||||
IUSE=pulseaudio
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2] x11-libs/gtk+:2= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] pulseaudio? ( media-sound/pulseaudio ) || ( www-plugins/chrome-binary-plugins[flash] www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.2.3.tar.gz -> freshplayerplugin-0.2.3.tar.gz
|
||||
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
|
||||
_md5_=0ac7afe72c0dd61e5cbc3b054b9bb92d
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/libv4l:0= media-libs/mesa:=[egl,gles2] x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] jack? ( media-sound/jack ) pulseaudio? ( media-sound/pulseaudio ) !gtk3? ( x11-libs/gtk+:2= ) gtk3? ( x11-libs/gtk+:3= ) vaapi? ( x11-libs/libva x11-libs/libvdpau ) dev-util/ragel virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
DESCRIPTION=PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/i-rinat/freshplayerplugin
|
||||
IUSE=gtk3 jack pulseaudio vaapi
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/libv4l:0= media-libs/mesa:=[egl,gles2] x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] jack? ( media-sound/jack ) pulseaudio? ( media-sound/pulseaudio ) !gtk3? ( x11-libs/gtk+:2= ) gtk3? ( x11-libs/gtk+:3= ) vaapi? ( x11-libs/libva x11-libs/libvdpau ) || ( www-plugins/chrome-binary-plugins[flash] www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.3.1.tar.gz -> freshplayerplugin-0.3.1.tar.gz
|
||||
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
|
||||
_md5_=6cd0af98685e9fb8a0fcdd703e87d302
|
||||
@ -1 +1 @@
|
||||
Tue, 14 Jul 2015 15:06:59 +0000
|
||||
Wed, 15 Jul 2015 04:36:55 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue Jul 14 15:06:56 UTC 2015
|
||||
Wed Jul 15 04:36:51 UTC 2015
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 14 Jul 2015 15:30:01 +0000
|
||||
Wed, 15 Jul 2015 05:00:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
1436886301 Tue 14 Jul 2015 03:05:01 PM UTC
|
||||
1436934901 Wed 15 Jul 2015 04:35:01 AM UTC
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
ICINGA2_ERROR_LOG=/var/log/icinga2/error.log
|
||||
ICINGA2_STARTUP_LOG=/var/log/icinga2/startup.log
|
||||
ICINGA2_LOG=/var/log/icinga2/icinga2.log
|
||||
ICINGA2_RUN_DIR=/run/icinga2
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
Hack to make this build against poppler-0.34. Just disables color management in some places.
|
||||
We should probably find a better solution. dilfridge@gentoo.org
|
||||
|
||||
|
||||
diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx
|
||||
--- cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx 2015-06-26 17:45:26.000000000 +0200
|
||||
+++ cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:02:51.666737621 +0200
|
||||
@@ -1812,9 +1812,15 @@
|
||||
maskSplash->drawImage(&imageSrc, &imgMaskData,
|
||||
splashModeMono8, gFalse, maskWidth, maskHeight, mat);
|
||||
#else
|
||||
+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
|
||||
maskSplash->drawImage(&imageSrc, &imgMaskData,
|
||||
splashModeMono8, gFalse, maskWidth, maskHeight,
|
||||
mat,gFalse);
|
||||
+#else
|
||||
+ maskSplash->drawImage(&imageSrc, NULL, &imgMaskData,
|
||||
+ splashModeMono8, gFalse, maskWidth, maskHeight,
|
||||
+ mat,gFalse);
|
||||
+#endif
|
||||
#endif
|
||||
delete imgMaskData.imgStr;
|
||||
maskStr->close();
|
||||
diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx
|
||||
--- cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx 2015-06-26 17:45:26.000000000 +0200
|
||||
+++ cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:00:20.655740720 +0200
|
||||
@@ -241,7 +241,11 @@
|
||||
#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
|
||||
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
|
||||
#else
|
||||
+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
|
||||
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
|
||||
+#else
|
||||
+ return splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
|
||||
+#endif
|
||||
#endif
|
||||
} else {
|
||||
return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
|
||||
@ -0,0 +1,29 @@
|
||||
From fc880b11ed70ff9dcf8be48621f75d354cc5094d Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Tue, 7 Jul 2015 15:33:55 +0300
|
||||
Subject: [PATCH] NFC: Avoid misaligned read of an NDEF field
|
||||
|
||||
The 32-bit version of payload length field may not be 32-bit aligned in
|
||||
the message buffer, so use WPA_GET_BE32() to read it instead of ntohl().
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/wps/ndef.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/wps/ndef.c b/src/wps/ndef.c
|
||||
index 8d1ce1e..5604b0a 100644
|
||||
--- a/src/wps/ndef.c
|
||||
+++ b/src/wps/ndef.c
|
||||
@@ -47,7 +47,7 @@ static int ndef_parse_record(const u8 *data, u32 size,
|
||||
} else {
|
||||
if (size < 6)
|
||||
return -1;
|
||||
- record->payload_length = ntohl(*(u32 *)pos);
|
||||
+ record->payload_length = WPA_GET_BE32(pos);
|
||||
pos += sizeof(u32);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
From df9079e72760ceb7ebe7fb11538200c516bdd886 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Tue, 7 Jul 2015 21:57:28 +0300
|
||||
Subject: [PATCH] NFC: Fix payload length validation in NDEF record parser
|
||||
|
||||
It was possible for the 32-bit record->total_length value to end up
|
||||
wrapping around due to integer overflow if the longer form of payload
|
||||
length field is used and record->payload_length gets a value close to
|
||||
2^32. This could result in ndef_parse_record() accepting a too large
|
||||
payload length value and the record type filter reading up to about 20
|
||||
bytes beyond the end of the buffer and potentially killing the process.
|
||||
This could also result in an attempt to allocate close to 2^32 bytes of
|
||||
heap memory and if that were to succeed, a buffer read overflow of the
|
||||
same length which would most likely result in the process termination.
|
||||
In case of record->total_length ending up getting the value 0, there
|
||||
would be no buffer read overflow, but record parsing would result in an
|
||||
infinite loop in ndef_parse_records().
|
||||
|
||||
Any of these error cases could potentially be used for denial of service
|
||||
attacks over NFC by using a malformed NDEF record on an NFC Tag or
|
||||
sending them during NFC connection handover if the application providing
|
||||
the NDEF message to hostapd/wpa_supplicant did no validation of the
|
||||
received records. While such validation is likely done in the NFC stack
|
||||
that needs to parse the NFC messages before further processing,
|
||||
hostapd/wpa_supplicant better be prepared for any data being included
|
||||
here.
|
||||
|
||||
Fix this by validating record->payload_length value in a way that
|
||||
detects integer overflow. (CID 122668)
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/wps/ndef.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/wps/ndef.c b/src/wps/ndef.c
|
||||
index 5604b0a..50d018f 100644
|
||||
--- a/src/wps/ndef.c
|
||||
+++ b/src/wps/ndef.c
|
||||
@@ -48,6 +48,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
|
||||
if (size < 6)
|
||||
return -1;
|
||||
record->payload_length = WPA_GET_BE32(pos);
|
||||
+ if (record->payload_length > size - 6)
|
||||
+ return -1;
|
||||
pos += sizeof(u32);
|
||||
}
|
||||
|
||||
@@ -68,7 +70,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
|
||||
pos += record->payload_length;
|
||||
|
||||
record->total_length = pos - data;
|
||||
- if (record->total_length > size)
|
||||
+ if (record->total_length > size ||
|
||||
+ record->total_length < record->payload_length)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -0,0 +1,224 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.4-r3.ebuild,v 1.1 2015/07/14 19:36:35 gurligebis Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit toolchain-funcs eutils systemd
|
||||
|
||||
DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
|
||||
HOMEPAGE="http://hostap.epitest.fi"
|
||||
SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( GPL-2 BSD )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
|
||||
IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
|
||||
|
||||
DEPEND="ssl? ( dev-libs/openssl[-bindist] )
|
||||
kernel_linux? (
|
||||
dev-libs/libnl:3
|
||||
crda? ( net-wireless/crda )
|
||||
)
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
sqlite? ( >=dev-db/sqlite-3 )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${S}/${PN}"
|
||||
|
||||
src_prepare() {
|
||||
cd ..
|
||||
|
||||
# bug (548744)
|
||||
epatch "${FILESDIR}/2015-2/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch"
|
||||
epatch "${FILESDIR}/2015-3/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch"
|
||||
epatch "${FILESDIR}/2015-4/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch"
|
||||
epatch "${FILESDIR}/2015-4/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch"
|
||||
epatch "${FILESDIR}/2015-4/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch"
|
||||
epatch "${FILESDIR}/2015-4/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch"
|
||||
epatch "${FILESDIR}/2015-4/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch"
|
||||
|
||||
# bug (554862)
|
||||
epatch "${FILESDIR}/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch"
|
||||
epatch "${FILESDIR}/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch"
|
||||
|
||||
cd "${PN}"
|
||||
|
||||
epatch "${FILESDIR}/${PN}-hlr_auc_gw-openssl.patch"
|
||||
|
||||
sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
|
||||
"${S}/hostapd.conf" || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local CONFIG="${S}/.config"
|
||||
|
||||
# toolchain setup
|
||||
echo "CC = $(tc-getCC)" > ${CONFIG}
|
||||
|
||||
# EAP authentication methods
|
||||
echo "CONFIG_EAP=y" >> ${CONFIG}
|
||||
echo "CONFIG_ERP=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
|
||||
|
||||
if use ssl; then
|
||||
# SSL authentication methods
|
||||
echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
|
||||
echo "CONFIG_TLSV11=y" >> ${CONFIG}
|
||||
echo "CONFIG_TLSV12=y" >> ${CONFIG}
|
||||
fi
|
||||
|
||||
if use wps; then
|
||||
# Enable Wi-Fi Protected Setup
|
||||
echo "CONFIG_WPS=y" >> ${CONFIG}
|
||||
echo "CONFIG_WPS2=y" >> ${CONFIG}
|
||||
echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
|
||||
echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
|
||||
einfo "Enabling Wi-Fi Protected Setup support"
|
||||
fi
|
||||
|
||||
echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
|
||||
echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
|
||||
|
||||
einfo "Enabling drivers: "
|
||||
|
||||
# drivers
|
||||
echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
|
||||
einfo " HostAP driver enabled"
|
||||
echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
|
||||
einfo " Wired driver enabled"
|
||||
echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
|
||||
einfo " Prism54 driver enabled"
|
||||
echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
|
||||
einfo " None driver enabled"
|
||||
|
||||
einfo " nl80211 driver enabled"
|
||||
echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
|
||||
|
||||
# misc
|
||||
echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
|
||||
echo "CONFIG_PKCS12=y" >> ${CONFIG}
|
||||
echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
|
||||
echo "CONFIG_IAPP=y" >> ${CONFIG}
|
||||
echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
|
||||
echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
|
||||
echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
|
||||
echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
|
||||
echo "CONFIG_PEERKEY=y" >> ${CONFIG}
|
||||
echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
|
||||
echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
|
||||
echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
|
||||
echo "CONFIG_HS20=y" >> ${CONFIG}
|
||||
echo "CONFIG_WNM=y" >> ${CONFIG}
|
||||
echo "CONFIG_ACS=y" >> ${CONFIG}
|
||||
|
||||
if use netlink; then
|
||||
# Netlink support
|
||||
echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
|
||||
fi
|
||||
|
||||
if use ipv6; then
|
||||
# IPv6 support
|
||||
echo "CONFIG_IPV6=y" >> ${CONFIG}
|
||||
fi
|
||||
|
||||
if use sqlite; then
|
||||
# Sqlite support
|
||||
echo "CONFIG_SQLITE=y" >> ${CONFIG}
|
||||
fi
|
||||
|
||||
# If we are using libnl 2.0 and above, enable support for it
|
||||
# Removed for now, since the 3.2 version is broken, and we don't
|
||||
# support it.
|
||||
if has_version ">=dev-libs/libnl-3.2"; then
|
||||
echo "CONFIG_LIBNL32=y" >> .config
|
||||
fi
|
||||
|
||||
# TODO: Add support for BSD drivers
|
||||
|
||||
default_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
|
||||
if use ssl; then
|
||||
emake V=1 nt_password_hash
|
||||
emake V=1 hlr_auc_gw
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /etc/${PN}
|
||||
doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
|
||||
|
||||
fperms -R 600 /etc/${PN}
|
||||
|
||||
dosbin ${PN}
|
||||
dobin ${PN}_cli
|
||||
|
||||
use ssl && dobin nt_password_hash hlr_auc_gw
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}-init.d ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
|
||||
systemd_dounit "${FILESDIR}"/${PN}.service
|
||||
|
||||
doman ${PN}{.8,_cli.1}
|
||||
|
||||
dodoc ChangeLog README
|
||||
use wps && dodoc README-WPS
|
||||
|
||||
docinto examples
|
||||
dodoc wired.conf
|
||||
|
||||
if use logwatch; then
|
||||
insinto /etc/log.d/conf/services/
|
||||
doins logwatch/${PN}.conf
|
||||
|
||||
exeinto /etc/log.d/scripts/services/
|
||||
doexe logwatch/${PN}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo
|
||||
einfo "If you are running openRC you need to follow this instructions:"
|
||||
einfo "In order to use ${PN} you need to set up your wireless card"
|
||||
einfo "for master mode in /etc/conf.d/net and then start"
|
||||
einfo "/etc/init.d/${PN}."
|
||||
einfo
|
||||
einfo "Example configuration:"
|
||||
einfo
|
||||
einfo "config_wlan0=( \"192.168.1.1/24\" )"
|
||||
einfo "channel_wlan0=\"6\""
|
||||
einfo "essid_wlan0=\"test\""
|
||||
einfo "mode_wlan0=\"master\""
|
||||
einfo
|
||||
#if [ -e "${KV_DIR}"/net/mac80211 ]; then
|
||||
# einfo "This package now compiles against the headers installed by"
|
||||
# einfo "the kernel source for the mac80211 driver. You should "
|
||||
# einfo "re-emerge ${PN} after upgrading your kernel source."
|
||||
#fi
|
||||
|
||||
if use wps; then
|
||||
einfo "You have enabled Wi-Fi Protected Setup support, please"
|
||||
einfo "read the README-WPS file in /usr/share/doc/${P}"
|
||||
einfo "for info on how to use WPS"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
From fc880b11ed70ff9dcf8be48621f75d354cc5094d Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Tue, 7 Jul 2015 15:33:55 +0300
|
||||
Subject: [PATCH] NFC: Avoid misaligned read of an NDEF field
|
||||
|
||||
The 32-bit version of payload length field may not be 32-bit aligned in
|
||||
the message buffer, so use WPA_GET_BE32() to read it instead of ntohl().
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/wps/ndef.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/wps/ndef.c b/src/wps/ndef.c
|
||||
index 8d1ce1e..5604b0a 100644
|
||||
--- a/src/wps/ndef.c
|
||||
+++ b/src/wps/ndef.c
|
||||
@@ -47,7 +47,7 @@ static int ndef_parse_record(const u8 *data, u32 size,
|
||||
} else {
|
||||
if (size < 6)
|
||||
return -1;
|
||||
- record->payload_length = ntohl(*(u32 *)pos);
|
||||
+ record->payload_length = WPA_GET_BE32(pos);
|
||||
pos += sizeof(u32);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
From df9079e72760ceb7ebe7fb11538200c516bdd886 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Tue, 7 Jul 2015 21:57:28 +0300
|
||||
Subject: [PATCH] NFC: Fix payload length validation in NDEF record parser
|
||||
|
||||
It was possible for the 32-bit record->total_length value to end up
|
||||
wrapping around due to integer overflow if the longer form of payload
|
||||
length field is used and record->payload_length gets a value close to
|
||||
2^32. This could result in ndef_parse_record() accepting a too large
|
||||
payload length value and the record type filter reading up to about 20
|
||||
bytes beyond the end of the buffer and potentially killing the process.
|
||||
This could also result in an attempt to allocate close to 2^32 bytes of
|
||||
heap memory and if that were to succeed, a buffer read overflow of the
|
||||
same length which would most likely result in the process termination.
|
||||
In case of record->total_length ending up getting the value 0, there
|
||||
would be no buffer read overflow, but record parsing would result in an
|
||||
infinite loop in ndef_parse_records().
|
||||
|
||||
Any of these error cases could potentially be used for denial of service
|
||||
attacks over NFC by using a malformed NDEF record on an NFC Tag or
|
||||
sending them during NFC connection handover if the application providing
|
||||
the NDEF message to hostapd/wpa_supplicant did no validation of the
|
||||
received records. While such validation is likely done in the NFC stack
|
||||
that needs to parse the NFC messages before further processing,
|
||||
hostapd/wpa_supplicant better be prepared for any data being included
|
||||
here.
|
||||
|
||||
Fix this by validating record->payload_length value in a way that
|
||||
detects integer overflow. (CID 122668)
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/wps/ndef.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/wps/ndef.c b/src/wps/ndef.c
|
||||
index 5604b0a..50d018f 100644
|
||||
--- a/src/wps/ndef.c
|
||||
+++ b/src/wps/ndef.c
|
||||
@@ -48,6 +48,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
|
||||
if (size < 6)
|
||||
return -1;
|
||||
record->payload_length = WPA_GET_BE32(pos);
|
||||
+ if (record->payload_length > size - 6)
|
||||
+ return -1;
|
||||
pos += sizeof(u32);
|
||||
}
|
||||
|
||||
@@ -68,7 +70,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
|
||||
pos += record->payload_length;
|
||||
|
||||
record->total_length = pos - data;
|
||||
- if (record->total_length > size)
|
||||
+ if (record->total_length > size ||
|
||||
+ record->total_length < record->payload_length)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -0,0 +1,387 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.4-r4.ebuild,v 1.1 2015/07/14 19:42:57 gurligebis Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils toolchain-funcs qt4-r2 systemd multilib
|
||||
|
||||
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
|
||||
HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
|
||||
SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
|
||||
LICENSE="|| ( GPL-2 BSD )"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
|
||||
REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )"
|
||||
|
||||
CDEPEND="dbus? ( sys-apps/dbus )
|
||||
kernel_linux? (
|
||||
eap-sim? ( sys-apps/pcsc-lite )
|
||||
dev-libs/libnl:3
|
||||
net-wireless/crda
|
||||
)
|
||||
!kernel_linux? ( net-libs/libpcap )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtsvg:4
|
||||
)
|
||||
readline? (
|
||||
sys-libs/ncurses
|
||||
sys-libs/readline:0
|
||||
)
|
||||
ssl? ( dev-libs/openssl:0 )
|
||||
!ssl? ( gnutls? ( net-libs/gnutls ) )
|
||||
!ssl? ( !gnutls? ( dev-libs/libtommath ) )
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-networkmanager )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${P}/${PN}"
|
||||
|
||||
Kconfig_style_config() {
|
||||
#param 1 is CONFIG_* item
|
||||
#param 2 is what to set it = to, defaulting in y
|
||||
CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
|
||||
setting="${2:-y}"
|
||||
|
||||
if [ ! $setting = n ]; then
|
||||
#first remove any leading "# " if $2 is not n
|
||||
sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
|
||||
#set item = $setting (defaulting to y)
|
||||
sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
|
||||
else
|
||||
#ensure item commented out
|
||||
sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if use gnutls && use ssl ; then
|
||||
elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
|
||||
sed -i \
|
||||
-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
|
||||
../src/l2_packet/l2_packet_freebsd.c || die
|
||||
|
||||
# People seem to take the example configuration file too literally (bug #102361)
|
||||
sed -i \
|
||||
-e "s:^\(opensc_engine_path\):#\1:" \
|
||||
-e "s:^\(pkcs11_engine_path\):#\1:" \
|
||||
-e "s:^\(pkcs11_module_path\):#\1:" \
|
||||
wpa_supplicant.conf || die
|
||||
|
||||
# Change configuration to match Gentoo locations (bug #143750)
|
||||
sed -i \
|
||||
-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
|
||||
-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
|
||||
wpa_supplicant.conf || die
|
||||
|
||||
if use dbus; then
|
||||
epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
|
||||
fi
|
||||
|
||||
# systemd entries to D-Bus service files (bug #372877)
|
||||
echo 'SystemdService=wpa_supplicant.service' \
|
||||
| tee -a dbus/*.service >/dev/null || die
|
||||
|
||||
cd "${WORKDIR}/${P}"
|
||||
|
||||
if use wimax; then
|
||||
# generate-libeap-peer.patch comes before
|
||||
# fix-undefined-reference-to-random_get_bytes.patch
|
||||
epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
|
||||
|
||||
# multilib-strict fix (bug #373685)
|
||||
sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
|
||||
fi
|
||||
|
||||
# bug (548742)
|
||||
epatch "${FILESDIR}/2015-1/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch"
|
||||
epatch "${FILESDIR}/2015-2/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch"
|
||||
epatch "${FILESDIR}/2015-3/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch"
|
||||
epatch "${FILESDIR}/2015-4/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch"
|
||||
epatch "${FILESDIR}/2015-4/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch"
|
||||
epatch "${FILESDIR}/2015-4/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch"
|
||||
epatch "${FILESDIR}/2015-4/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch"
|
||||
epatch "${FILESDIR}/2015-4/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch"
|
||||
|
||||
# bug (554860)
|
||||
epatch "${FILESDIR}/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch"
|
||||
epatch "${FILESDIR}/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch"
|
||||
|
||||
# bug (320097)
|
||||
epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
|
||||
|
||||
# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
|
||||
# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
|
||||
# bug (374089)
|
||||
#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Toolchain setup
|
||||
tc-export CC
|
||||
|
||||
cp defconfig .config
|
||||
|
||||
# Basic setup
|
||||
Kconfig_style_config CTRL_IFACE
|
||||
Kconfig_style_config BACKEND file
|
||||
Kconfig_style_config IBSS_RSN
|
||||
Kconfig_style_config IEEE80211W
|
||||
Kconfig_style_config IEEE80211R
|
||||
|
||||
# Basic authentication methods
|
||||
# NOTE: we don't set GPSK or SAKE as they conflict
|
||||
# with the below options
|
||||
Kconfig_style_config EAP_GTC
|
||||
Kconfig_style_config EAP_MD5
|
||||
Kconfig_style_config EAP_OTP
|
||||
Kconfig_style_config EAP_PAX
|
||||
Kconfig_style_config EAP_PSK
|
||||
Kconfig_style_config EAP_TLV
|
||||
Kconfig_style_config EAP_EXE
|
||||
Kconfig_style_config IEEE8021X_EAPOL
|
||||
Kconfig_style_config PKCS12
|
||||
Kconfig_style_config PEERKEY
|
||||
Kconfig_style_config EAP_LEAP
|
||||
Kconfig_style_config EAP_MSCHAPV2
|
||||
Kconfig_style_config EAP_PEAP
|
||||
Kconfig_style_config EAP_TLS
|
||||
Kconfig_style_config EAP_TTLS
|
||||
|
||||
# Enabling background scanning.
|
||||
Kconfig_style_config BGSCAN_SIMPLE
|
||||
Kconfig_style_config BGSCAN_LEARN
|
||||
|
||||
if use dbus ; then
|
||||
Kconfig_style_config CTRL_IFACE_DBUS
|
||||
Kconfig_style_config CTRL_IFACE_DBUS_NEW
|
||||
Kconfig_style_config CTRL_IFACE_DBUS_INTRO
|
||||
fi
|
||||
|
||||
# Enable support for writing debug info to a log file and syslog.
|
||||
Kconfig_style_config DEBUG_FILE
|
||||
Kconfig_style_config DEBUG_SYSLOG
|
||||
|
||||
if use hs2-0 ; then
|
||||
Kconfig_style_config INTERWORKING
|
||||
Kconfig_style_config HS20
|
||||
fi
|
||||
|
||||
if use uncommon-eap-types; then
|
||||
Kconfig_style_config EAP_GPSK
|
||||
Kconfig_style_config EAP_SAKE
|
||||
Kconfig_style_config EAP_GPSK_SHA256
|
||||
Kconfig_style_config EAP_IKEV2
|
||||
Kconfig_style_config EAP_EKE
|
||||
fi
|
||||
|
||||
if use eap-sim ; then
|
||||
# Smart card authentication
|
||||
Kconfig_style_config EAP_SIM
|
||||
Kconfig_style_config EAP_AKA
|
||||
Kconfig_style_config EAP_AKA_PRIME
|
||||
Kconfig_style_config PCSC
|
||||
fi
|
||||
|
||||
if use fasteap ; then
|
||||
Kconfig_style_config EAP_FAST
|
||||
fi
|
||||
|
||||
if use readline ; then
|
||||
# readline/history support for wpa_cli
|
||||
Kconfig_style_config READLINE
|
||||
else
|
||||
#internal line edit mode for wpa_cli
|
||||
Kconfig_style_config WPA_CLI_EDIT
|
||||
fi
|
||||
|
||||
# SSL authentication methods
|
||||
if use ssl ; then
|
||||
Kconfig_style_config TLS openssl
|
||||
elif use gnutls ; then
|
||||
Kconfig_style_config TLS gnutls
|
||||
Kconfig_style_config GNUTLS_EXTRA
|
||||
else
|
||||
Kconfig_style_config TLS internal
|
||||
fi
|
||||
|
||||
if use smartcard ; then
|
||||
Kconfig_style_config SMARTCARD
|
||||
fi
|
||||
|
||||
if use tdls ; then
|
||||
Kconfig_style_config TDLS
|
||||
fi
|
||||
|
||||
if use kernel_linux ; then
|
||||
# Linux specific drivers
|
||||
Kconfig_style_config DRIVER_ATMEL
|
||||
Kconfig_style_config DRIVER_HOSTAP
|
||||
Kconfig_style_config DRIVER_IPW
|
||||
Kconfig_style_config DRIVER_NL80211
|
||||
Kconfig_style_config DRIVER_RALINK
|
||||
Kconfig_style_config DRIVER_WEXT
|
||||
Kconfig_style_config DRIVER_WIRED
|
||||
|
||||
if use ps3 ; then
|
||||
Kconfig_style_config DRIVER_PS3
|
||||
fi
|
||||
|
||||
elif use kernel_FreeBSD ; then
|
||||
# FreeBSD specific driver
|
||||
Kconfig_style_config DRIVER_BSD
|
||||
fi
|
||||
|
||||
# Wi-Fi Protected Setup (WPS)
|
||||
if use wps ; then
|
||||
Kconfig_style_config WPS
|
||||
Kconfig_style_config WPS2
|
||||
# USB Flash Drive
|
||||
Kconfig_style_config WPS_UFD
|
||||
# External Registrar
|
||||
Kconfig_style_config WPS_ER
|
||||
# Universal Plug'n'Play
|
||||
Kconfig_style_config WPS_UPNP
|
||||
# Near Field Communication
|
||||
Kconfig_style_config WPS_NFC
|
||||
fi
|
||||
|
||||
# Wi-Fi Direct (WiDi)
|
||||
if use p2p ; then
|
||||
Kconfig_style_config P2P
|
||||
Kconfig_style_config WIFI_DISPLAY
|
||||
fi
|
||||
|
||||
# Access Point Mode
|
||||
if use ap ; then
|
||||
Kconfig_style_config AP
|
||||
fi
|
||||
|
||||
# Enable mitigation against certain attacks against TKIP
|
||||
Kconfig_style_config DELAYED_MIC_ERROR_REPORT
|
||||
|
||||
# If we are using libnl 2.0 and above, enable support for it
|
||||
# Bug 382159
|
||||
# Removed for now, since the 3.2 version is broken, and we don't
|
||||
# support it.
|
||||
if has_version ">=dev-libs/libnl-3.2"; then
|
||||
Kconfig_style_config LIBNL32
|
||||
fi
|
||||
|
||||
if use qt4 ; then
|
||||
pushd "${S}"/wpa_gui-qt4 > /dev/null
|
||||
eqmake4 wpa_gui.pro
|
||||
popd > /dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "Building wpa_supplicant"
|
||||
emake V=1 BINDIR=/usr/sbin
|
||||
|
||||
if use wimax; then
|
||||
emake -C ../src/eap_peer clean
|
||||
emake -C ../src/eap_peer
|
||||
fi
|
||||
|
||||
if use qt4 ; then
|
||||
pushd "${S}"/wpa_gui-qt4 > /dev/null
|
||||
einfo "Building wpa_gui"
|
||||
emake
|
||||
popd > /dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin wpa_supplicant
|
||||
dobin wpa_cli wpa_passphrase
|
||||
|
||||
# baselayout-1 compat
|
||||
if has_version "<sys-apps/baselayout-2.0.0"; then
|
||||
dodir /sbin
|
||||
dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
|
||||
dodir /bin
|
||||
dosym /usr/bin/wpa_cli /bin/wpa_cli
|
||||
fi
|
||||
|
||||
if has_version ">=sys-apps/openrc-0.5.0"; then
|
||||
newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
|
||||
newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
|
||||
fi
|
||||
|
||||
exeinto /etc/wpa_supplicant/
|
||||
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
|
||||
|
||||
dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
|
||||
wpa_supplicant.conf
|
||||
|
||||
newdoc .config build-config
|
||||
|
||||
doman doc/docbook/*.{5,8}
|
||||
|
||||
if use qt4 ; then
|
||||
into /usr
|
||||
dobin wpa_gui-qt4/wpa_gui
|
||||
doicon wpa_gui-qt4/icons/wpa_gui.svg
|
||||
make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
|
||||
fi
|
||||
|
||||
use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
|
||||
|
||||
if use dbus ; then
|
||||
pushd "${S}"/dbus > /dev/null
|
||||
insinto /etc/dbus-1/system.d
|
||||
newins dbus-wpa_supplicant.conf wpa_supplicant.conf
|
||||
insinto /usr/share/dbus-1/system-services
|
||||
doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
|
||||
popd > /dev/null
|
||||
|
||||
# This unit relies on dbus support, bug 538600.
|
||||
systemd_dounit systemd/wpa_supplicant.service
|
||||
fi
|
||||
|
||||
systemd_dounit "systemd/wpa_supplicant@.service"
|
||||
systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
|
||||
systemd_dounit "systemd/wpa_supplicant-wired@.service"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "If this is a clean installation of wpa_supplicant, you"
|
||||
elog "have to create a configuration file named"
|
||||
elog "/etc/wpa_supplicant/wpa_supplicant.conf"
|
||||
elog
|
||||
elog "An example configuration file is available for reference in"
|
||||
elog "/usr/share/doc/${PF}/"
|
||||
|
||||
if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
|
||||
echo
|
||||
ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
|
||||
ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
|
||||
fi
|
||||
|
||||
# Mea culpa, feel free to remove that after some time --mgorny.
|
||||
local fn
|
||||
for fn in wpa_supplicant{,@wlan0}.service; do
|
||||
if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
|
||||
then
|
||||
ebegin "Moving ${fn} to multi-user.target"
|
||||
mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
|
||||
"${ROOT}"/etc/systemd/system/multi-user.target.wants/
|
||||
eend ${?} \
|
||||
"Please try to re-enable ${fn}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
commit 14bf458675a735975c6b9bf7394682e93398a8e0
|
||||
Author: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
|
||||
Date: Tue Jul 14 17:46:45 2015 -0700
|
||||
|
||||
Fix regression in exit via dbus message
|
||||
|
||||
Terminate via dbus terminate message is broken. Fixed this.
|
||||
Thanks to Yixun Lan <yixun.lan@gmail.com> for finding this.
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 2cf4864..d692cf3 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -50,7 +50,7 @@
|
||||
#define TD_DIST_VERSION PACKAGE_VERSION
|
||||
#endif
|
||||
|
||||
-extern int thd_dbus_server_init();
|
||||
+extern int thd_dbus_server_init(void (*exit_handler)(int));
|
||||
|
||||
// Default log level
|
||||
static int thd_log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL
|
||||
@@ -263,7 +263,7 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
if (dbus_enable)
|
||||
- thd_dbus_server_init();
|
||||
+ thd_dbus_server_init(sig_int_handler);
|
||||
|
||||
if (!no_daemon) {
|
||||
printf("Ready to serve requests: Daemonizing.. %d\n", thd_daemonize);
|
||||
diff --git a/src/thd_dbus_interface.cpp b/src/thd_dbus_interface.cpp
|
||||
index 021bce2..7926101 100644
|
||||
--- a/src/thd_dbus_interface.cpp
|
||||
+++ b/src/thd_dbus_interface.cpp
|
||||
@@ -187,8 +187,12 @@ gboolean thd_dbus_interface_get_current_preference(PrefObject *obj,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+void (*thd_dbus_exit_callback)(int);
|
||||
gboolean thd_dbus_interface_terminate(PrefObject *obj, GError **error) {
|
||||
thd_engine->thd_engine_terminate();
|
||||
+ if (thd_dbus_exit_callback)
|
||||
+ thd_dbus_exit_callback(0);
|
||||
+
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -561,13 +565,15 @@ gboolean thd_dbus_interface_get_sensor_temperature(PrefObject *obj, int index,
|
||||
}
|
||||
|
||||
// Setup dbus server
|
||||
-int thd_dbus_server_init() {
|
||||
+int thd_dbus_server_init(void (*exit_handler)(int)) {
|
||||
DBusGConnection *bus;
|
||||
DBusGProxy *bus_proxy;
|
||||
GError *error = NULL;
|
||||
guint result;
|
||||
PrefObject *value_obj;
|
||||
|
||||
+ thd_dbus_exit_callback = exit_handler;
|
||||
+
|
||||
bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
|
||||
if (error != NULL) {
|
||||
thd_log_error("Couldn't connect to session bus: %s:\n", error->message);
|
||||
@ -1,34 +0,0 @@
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 2cf4864..49489d2 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -129,6 +129,11 @@ bool check_thermald_running() {
|
||||
return false;
|
||||
}
|
||||
|
||||
+void thd_main_quit(void) {
|
||||
+ if (g_main_loop)
|
||||
+ g_main_loop_quit(g_main_loop);
|
||||
+}
|
||||
+
|
||||
// SIGTERM & SIGINT handler
|
||||
void sig_int_handler(int signum) {
|
||||
thd_engine->thd_engine_terminate();
|
||||
diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp
|
||||
index c7352ac..4fc5ad6 100644
|
||||
--- a/src/thd_engine.cpp
|
||||
+++ b/src/thd_engine.cpp
|
||||
@@ -348,10 +348,13 @@ void cthd_engine::process_pref_change() {
|
||||
}
|
||||
}
|
||||
|
||||
+extern void thd_main_quit(void);
|
||||
void cthd_engine::thd_engine_terminate() {
|
||||
send_message(TERMINATE, 0, NULL);
|
||||
sleep(1);
|
||||
process_terminate();
|
||||
+
|
||||
+ thd_main_quit();
|
||||
}
|
||||
|
||||
int cthd_engine::thd_engine_set_user_max_temp(const char *zone_type,
|
||||
@ -1,3 +1,3 @@
|
||||
DIST freshplayerplugin-0.2.3.tar.gz 402126 SHA256 b28ae17dec274aa6eb819d496088efbc503aa6bfba09192e2f08200ecf66d10b SHA512 bc2ee4377103d7d56d40ebed19cff0dd4acdb7a810225381d9d49874ca3925cb5c72f9ca576f2b9e58a4374fe546d99a0bc97c9c95eb3d44e08fe68e1310bf51 WHIRLPOOL 5180f9709ae6bd691c1df8daaf03b91aa80ab1a5e0b1c562919dd179f8252a5ae8bfe6fdc98bde1d4fff88098045a06e6cdabc66ab95604e70c9a084e2bc085d
|
||||
DIST freshplayerplugin-0.2.4.tar.gz 490685 SHA256 e071c811778577f44331edcd418472fc392effd416c0750cbf384a30c9269163 SHA512 b16bfb90554ce2355a10d2a81fe611a9c15e8e945b39d0d2e1d954e87ea0ba849206785187cd4b52f523e560ee28e9a6728ec58244d41000050d59d13d96e7c4 WHIRLPOOL 21f6b66bbee6ea13c6708316281bfb963fe73e8104d5db202a0241ff7c46553ffeac4736f7b66d94a7c12e94c4a38336e4ba56dfccee3481e85da856dde5631f
|
||||
DIST freshplayerplugin-0.3.0.tar.gz 2706001 SHA256 ca0281884874f010243496567e9f6717dfea5fdf0406ee39260d234fd57f247e SHA512 5e72131959a119805dcee9fd8d7e5eda0a2100de34eba75643adab7543ec5120babce2b824f8813763da83927c599c14db5ef93ab8ae83a7ea4b942ca4746445 WHIRLPOOL 7cc4867034a0374640e36378665ffa831ea164610b3bb57f607e3f9648e6dc609ee6196a11c781b8f4f138e22e7e9689b2f642258110e088d4eb17e9f820b47f
|
||||
DIST freshplayerplugin-0.3.1.tar.gz 2711793 SHA256 4ed582896fff618d8025dd51bbf2fae0c5e36e2875065acc536b2c76befb593c SHA512 78e87548ecd758ad9ff0dab59b1b2f68b8b9a639ff19de08046a7090ab51d87f0e4c879b1b0075151ff17642d50ff937e199733c55c4a9cff94599fd98eae9de WHIRLPOOL d8be949cc9a2087d8f62fcfb4a1786d68574a5ec52dccc45da06df9838ee84e8dd4d7f3c3f86703e428df1b3f4d6d75c1e87d0809d3f78550a16ed278d51b211
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
diff -aurN a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2015-02-15 17:05:40.000000000 -0500
|
||||
+++ b/CMakeLists.txt 2015-03-10 19:33:48.519110012 -0400
|
||||
@@ -45,12 +45,18 @@
|
||||
openssl
|
||||
REQUIRED)
|
||||
|
||||
-pkg_check_modules(PULSEAUDIO libpulse)
|
||||
+OPTION(WITH_PULSEAUDIO "Enable pulseaudio support" ON)
|
||||
|
||||
-if (${PULSEAUDIO_FOUND})
|
||||
- add_definitions(-DHAVE_PULSEAUDIO=1)
|
||||
- set(HAVE_PULSEAUDIO 1)
|
||||
-endif()
|
||||
+IF(WITH_PULSEAUDIO)
|
||||
+ pkg_check_modules(PULSEAUDIO libpulse)
|
||||
+
|
||||
+ if (${PULSEAUDIO_FOUND})
|
||||
+ add_definitions(-DHAVE_PULSEAUDIO=1)
|
||||
+ set(HAVE_PULSEAUDIO 1)
|
||||
+ else()
|
||||
+ MESSAGE(FATAL_ERROR "PulseAudio not found")
|
||||
+ endif()
|
||||
+ENDIF(WITH_PULSEAUDIO)
|
||||
|
||||
include_directories(${REQ_INCLUDE_DIRS})
|
||||
add_definitions(${REQ_CFLAGS_OTHER})
|
||||
Loading…
Reference in new issue