Hello community, here is the log from the commit of package physfs for openSUSE:Factory checked in at Mon Feb 21 23:45:58 CET 2011.
-------- --- physfs/physfs.changes 2011-02-18 16:51:41.000000000 +0100 +++ physfs/physfs.changes 2011-02-21 22:27:11.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 21 21:23:54 UTC 2011 - [email protected] + +- update to version 2.0.2 + * Fixed bug where zip and qpak could fail to locate an existing file. + * Fixed overflow on zero-sized buffers when converting to UTF-8. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:recompress:download_url:physfs-2.0.1.tar.bz2 physfs-2.0.1-lib64.patch New: ---- _service:recompress:download_url:physfs-2.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:set_version:physfs.spec ++++++ --- /var/tmp/diff_new_pack.kuzbEp/_old 2011-02-21 23:45:28.000000000 +0100 +++ /var/tmp/diff_new_pack.kuzbEp/_new 2011-02-21 23:45:28.000000000 +0100 @@ -19,15 +19,13 @@ %define so_nr 1 Name: physfs -Version: 2.0.1 +Version: 2.0.2 Release: 1 License: ZLIB + LGPLv2.1/CPL plus exception Summary: PhysicsFS file abstraction layer for games Url: http://www.icculus.org/physfs/ Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM physfs-2.0.1-lib64.patch [email protected] -- Honor LIB_SUFFIX -Patch0: physfs-2.0.1-lib64.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -54,6 +52,7 @@ %package -n lib%{name}%{so_nr} + Summary: PhysicsFS file abstraction layer for games Group: System/Libraries # physfs was last used in openSUSE 11.3 @@ -81,6 +80,7 @@ %package -n lib%{name}-devel + Summary: Libraries, includes and more to develop PhysicsFS applications Group: Development/Libraries/C and C++ Requires: lib%{name}%{so_nr} = %{version} @@ -109,7 +109,6 @@ %prep %setup -q -%patch0 %build # just to be sure... ++++++ physfs.spec ++++++ --- /var/tmp/diff_new_pack.kuzbEp/_old 2011-02-21 23:45:28.000000000 +0100 +++ /var/tmp/diff_new_pack.kuzbEp/_new 2011-02-21 23:45:28.000000000 +0100 @@ -20,14 +20,12 @@ Name: physfs Version: to_be_filled_by_service -Release: 1 +Release: 2 License: ZLIB + LGPLv2.1/CPL plus exception Summary: PhysicsFS file abstraction layer for games Url: http://www.icculus.org/physfs/ Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM physfs-2.0.1-lib64.patch [email protected] -- Honor LIB_SUFFIX -Patch0: physfs-2.0.1-lib64.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -54,6 +52,7 @@ %package -n lib%{name}%{so_nr} + Summary: PhysicsFS file abstraction layer for games Group: System/Libraries # physfs was last used in openSUSE 11.3 @@ -81,6 +80,7 @@ %package -n lib%{name}-devel + Summary: Libraries, includes and more to develop PhysicsFS applications Group: Development/Libraries/C and C++ Requires: lib%{name}%{so_nr} = %{version} @@ -109,7 +109,6 @@ %prep %setup -q -%patch0 %build # just to be sure... ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kuzbEp/_old 2011-02-21 23:45:28.000000000 +0100 +++ /var/tmp/diff_new_pack.kuzbEp/_new 2011-02-21 23:45:28.000000000 +0100 @@ -3,12 +3,12 @@ <service name="download_url"> <param name="protocol">http</param> <param name="host">icculus.org</param> - <param name="path">/physfs/downloads/physfs-2.0.1.tar.gz</param> + <param name="path">/physfs/downloads/physfs-2.0.2.tar.gz</param> </service> <service name="verify_file"> - <param name="file">_service:download_url:physfs-2.0.1.tar.gz</param> + <param name="file">_service:download_url:physfs-2.0.2.tar.gz</param> <param name="verifier">sha256</param> - <param name="checksum">1ee9891d9d34db4bcf78ae31f321fdb948c12e233ca04c690cae032968dbf45d</param> + <param name="checksum">ae296d3148228e03fd56cc9ea58af02f87dcbb1fadef125c18b709ab37f0bc09</param> </service> <service name="recompress"> <param name="file">*.gz</param> ++++++ _service:recompress:download_url:physfs-2.0.1.tar.bz2 -> _service:recompress:download_url:physfs-2.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/.hg_archival.txt new/physfs-2.0.2/.hg_archival.txt --- old/physfs-2.0.1/.hg_archival.txt 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/.hg_archival.txt 2011-02-18 22:17:31.000000000 +0100 @@ -1,5 +1,5 @@ repo: 7672c9962ce627edaaa67ff54fe4ad8f9a46dc2b -node: 01e7571471efc54c036a558360518c5088c87c11 +node: 92a35b8603186c536e4cc126458dfc2d2809b19c branch: stable-2.0 -latesttag: release-2.0.1 +latesttag: release-2.0.2 latesttagdistance: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/.hgtags new/physfs-2.0.2/.hgtags --- old/physfs-2.0.1/.hgtags 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/.hgtags 2011-02-18 22:17:31.000000000 +0100 @@ -13,3 +13,4 @@ 5d70fca3be361258edfb59c3edaba5abe75a1e88 release-2.0.0 df04959950eb3830c39adfa983789f70f86062d7 release-1.1.0 94771621792f838aa4cacf9a1e1f4f86c1cb0711 release-2.0.1 +236afd18dd8cae34adb9897024bdcecc1dc8ca5d release-2.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/CMakeLists.txt new/physfs-2.0.2/CMakeLists.txt --- old/physfs-2.0.1/CMakeLists.txt 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/CMakeLists.txt 2011-02-18 22:17:31.000000000 +0100 @@ -6,7 +6,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) PROJECT(PhysicsFS) -SET(PHYSFS_VERSION 2.0.1) +SET(PHYSFS_VERSION 2.0.2) # Increment this if/when we break backwards compatibility. SET(PHYSFS_SOVERSION 1) @@ -108,7 +108,9 @@ # We add this explicitly, since we don't want CMake to think this # is a C++ project unless we're on BeOS. SET(PHYSFS_BEOS_SRCS platform/beos.cpp) - SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} be root) + FIND_LIBRARY(BE_LIBRARY be) + FIND_LIBRARY(ROOT_LIBRARY root) + SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${BE_LIBRARY} ${ROOT_LIBRARY}) ENDIF(BEOS) # Almost everything is "compiled" here, but things that don't apply to the @@ -298,7 +300,8 @@ FIND_PATH(READLINE_H readline/readline.h) FIND_PATH(HISTORY_H readline/history.h) IF(READLINE_H AND HISTORY_H) - SET(CMAKE_REQUIRED_LIBRARIES curses) + FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses) + SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY}) FIND_LIBRARY(READLINE_LIBRARY readline) FIND_LIBRARY(HISTORY_LIBRARY history) IF(READLINE_LIBRARY AND HISTORY_LIBRARY) @@ -333,8 +336,8 @@ INSTALL(TARGETS ${PHYSFS_INSTALL_TARGETS} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) INSTALL(FILES physfs.h DESTINATION include) FIND_PACKAGE(Doxygen) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/Doxyfile new/physfs-2.0.2/Doxyfile --- old/physfs-2.0.1/Doxyfile 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/Doxyfile 2011-02-18 22:17:31.000000000 +0100 @@ -23,7 +23,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.0.1 +PROJECT_NUMBER = 2.0.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/LICENSE.txt new/physfs-2.0.2/LICENSE.txt --- old/physfs-2.0.1/LICENSE.txt 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/LICENSE.txt 2011-02-18 22:17:31.000000000 +0100 @@ -1,5 +1,5 @@ - Copyright (c) 2003-2010 Ryan C. Gordon and others. + Copyright (c) 2001-2011 Ryan C. Gordon and others. This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/archivers/qpak.c new/physfs-2.0.2/archivers/qpak.c --- old/physfs-2.0.1/archivers/qpak.c 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/archivers/qpak.c 2011-02-18 22:17:31.000000000 +0100 @@ -478,8 +478,11 @@ if (thispath[pathlen] == '\0') /* found entry? */ return(&a[middle]); + /* adjust search params, try again. */ + else if (thispath[pathlen] > '/') + hi = middle - 1; else - hi = middle - 1; /* adjust search params, try again. */ + lo = middle + 1; } /* if */ } /* while */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/archivers/zip.c new/physfs-2.0.2/archivers/zip.c --- old/physfs-2.0.1/archivers/zip.c 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/archivers/zip.c 2011-02-18 22:17:31.000000000 +0100 @@ -375,7 +375,7 @@ static PHYSFS_sint64 zip_find_end_of_central_dir(void *in, PHYSFS_sint64 *len) { PHYSFS_uint8 buf[256]; - PHYSFS_uint8 extra[4]; + PHYSFS_uint8 extra[4] = { 0, 0, 0, 0 }; PHYSFS_sint32 i = 0; PHYSFS_sint64 filelen; PHYSFS_sint64 filepos; @@ -544,8 +544,11 @@ if (thispath[pathlen] == '\0') /* found entry? */ return(&a[middle]); + /* adjust search params, try again. */ + else if (thispath[pathlen] > '/') + hi = middle - 1; else - hi = middle - 1; /* adjust search params, try again. */ + lo = middle + 1; } /* if */ } /* while */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/physfs.h new/physfs-2.0.2/physfs.h --- old/physfs-2.0.1/physfs.h 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/physfs.h 2011-02-18 22:17:31.000000000 +0100 @@ -405,7 +405,7 @@ #ifndef DOXYGEN_SHOULD_IGNORE_THIS #define PHYSFS_VER_MAJOR 2 #define PHYSFS_VER_MINOR 0 -#define PHYSFS_VER_PATCH 1 +#define PHYSFS_VER_PATCH 2 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ @@ -1215,9 +1215,9 @@ * The file must be opened for writing. * * \param handle retval from PHYSFS_openWrite() or PHYSFS_openAppend(). - * \param buffer buffer to store read data into. - * \param objSize size in bytes of objects being read from (handle). - * \param objCount number of (objSize) objects to read from (handle). + * \param buffer buffer of bytes to write to (handle). + * \param objSize size in bytes of objects being written to (handle). + * \param objCount number of (objSize) objects to write to (handle). * \return number of objects written. PHYSFS_getLastError() can shed light on * the reason this might be < (objCount). -1 if complete failure. */ @@ -2272,7 +2272,7 @@ * * Strings that don't fit in the destination buffer will be truncated, but * will always be null-terminated and never have an incomplete UTF-8 - * sequence at the end. + * sequence at the end. If the buffer length is 0, this function does nothing. * * \param src Null-terminated source string in UCS-4 format. * \param dst Buffer to store converted UTF-8 string. @@ -2294,7 +2294,7 @@ * * Strings that don't fit in the destination buffer will be truncated, but * will always be null-terminated and never have an incomplete UCS-4 - * sequence at the end. + * sequence at the end. If the buffer length is 0, this function does nothing. * * \param src Null-terminated source string in UTF-8 format. * \param dst Buffer to store converted UCS-4 string. @@ -2317,7 +2317,7 @@ * * Strings that don't fit in the destination buffer will be truncated, but * will always be null-terminated and never have an incomplete UTF-8 - * sequence at the end. + * sequence at the end. If the buffer length is 0, this function does nothing. * * Please note that UCS-2 is not UTF-16; we do not support the "surrogate" * values at this time. @@ -2343,7 +2343,7 @@ * * Strings that don't fit in the destination buffer will be truncated, but * will always be null-terminated and never have an incomplete UCS-2 - * sequence at the end. + * sequence at the end. If the buffer length is 0, this function does nothing. * * Please note that UCS-2 is not UTF-16; we do not support the "surrogate" * values at this time. @@ -2369,7 +2369,7 @@ * * Strings that don't fit in the destination buffer will be truncated, but * will always be null-terminated and never have an incomplete UTF-8 - * sequence at the end. + * sequence at the end. If the buffer length is 0, this function does nothing. * * Please note that we do not supply a UTF-8 to Latin1 converter, since Latin1 * can't express most Unicode codepoints. It's a legacy encoding; you should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/physfs_internal.h new/physfs-2.0.2/physfs_internal.h --- old/physfs-2.0.1/physfs_internal.h 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/physfs_internal.h 2011-02-18 22:17:31.000000000 +0100 @@ -29,6 +29,10 @@ #include <malloc.h> #endif +#if defined(__sun) || defined(sun) +#include <alloca.h> +#endif + #ifdef __cplusplus extern "C" { #endif @@ -966,7 +970,7 @@ #define PHYSFS_LIL_ENDIAN 1234 #define PHYSFS_BIG_ENDIAN 4321 -#if defined(__i386__) || defined(__ia64__) || defined(WIN32) || \ +#if defined(__i386__) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || \ (defined(__alpha__) || defined(__alpha)) || \ defined(__arm__) || defined(ARM) || \ (defined(__mips__) && defined(__MIPSEL__)) || \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/physfs_unicode.c new/physfs-2.0.2/physfs_unicode.c --- old/physfs-2.0.1/physfs_unicode.c 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/physfs_unicode.c 2011-02-18 22:17:31.000000000 +0100 @@ -305,6 +305,7 @@ } /* utf8fromcodepoint */ #define UTF8FROMTYPE(typ, src, dst, len) \ + if (len == 0) return; \ len--; \ while (len) \ { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/platform/beos.cpp new/physfs-2.0.2/platform/beos.cpp --- old/physfs-2.0.1/platform/beos.cpp 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/platform/beos.cpp 2011-02-18 22:17:31.000000000 +0100 @@ -174,14 +174,17 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0) { - /* in case there isn't a BApplication yet, we'll construct a roster. */ - BRoster roster; - app_info info; - status_t rc = roster.GetRunningAppInfo(getTeamID(), &info); - BAIL_IF_MACRO(rc < B_OK, strerror(rc), NULL); - BEntry entry(&(info.ref), true); + image_info info; + int32 cookie = 0; + + while (get_next_image_info(0, &cookie, &info) == B_OK) { + if (info.type == B_APP_IMAGE) + break; + } + + BEntry entry(info.name, true); BPath path; - rc = entry.GetPath(&path); /* (path) now has binary's path. */ + status_t rc = entry.GetPath(&path); /* (path) now has binary's path. */ assert(rc == B_OK); rc = path.GetParent(&path); /* chop filename, keep directory. */ assert(rc == B_OK); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/test/test_physfs.c new/physfs-2.0.2/test/test_physfs.c --- old/physfs-2.0.1/test/test_physfs.c 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/test/test_physfs.c 2011-02-18 22:17:31.000000000 +0100 @@ -27,7 +27,7 @@ #define TEST_VERSION_MAJOR 2 #define TEST_VERSION_MINOR 0 -#define TEST_VERSION_PATCH 1 +#define TEST_VERSION_PATCH 2 static FILE *history_file = NULL; static PHYSFS_uint32 do_buffer_size = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/physfs-2.0.1/test/wxtest_physfs.cpp new/physfs-2.0.2/test/wxtest_physfs.cpp --- old/physfs-2.0.1/test/wxtest_physfs.cpp 2010-03-25 04:51:40.000000000 +0100 +++ new/physfs-2.0.2/test/wxtest_physfs.cpp 2011-02-18 22:17:31.000000000 +0100 @@ -24,7 +24,7 @@ #define TEST_VER_MAJOR 2 #define TEST_VER_MINOR 0 -#define TEST_VER_PATCH 1 +#define TEST_VER_PATCH 2 //static PHYSFS_uint32 do_buffer_size = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
