Author: vincentc-guest Date: 2012-05-20 08:36:49 +0000 (Sun, 20 May 2012) New Revision: 13587
Added: packages/trunk/0ad/debian/patches/enable-hardening-relro.patch Modified: packages/trunk/0ad/debian/changelog packages/trunk/0ad/debian/install packages/trunk/0ad/debian/patches/fix-bindir.patch packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch packages/trunk/0ad/debian/patches/series packages/trunk/0ad/debian/rules Log: 0ad: Update to release 0~r11863-1 Modified: packages/trunk/0ad/debian/changelog =================================================================== --- packages/trunk/0ad/debian/changelog 2012-05-19 04:08:12 UTC (rev 13586) +++ packages/trunk/0ad/debian/changelog 2012-05-20 08:36:49 UTC (rev 13587) @@ -1,9 +1,12 @@ -0ad (0~r11339-3) UNRELEASED; urgency=low +0ad (0~r11863-1) unstable; urgency=low - * (debian/rules: stop creation of extra dirs, i.e. ../data/mods/ - when running tests. See comments in d/rules) + * New upstream release. + - Refresh patches. + * Add debian/patches/enable-hardening-relro.patch to build using the + "read-only relocation" link flag, as suggested by lintian. + * Add build-depends on libxcursor-dev. - -- Vincent Cheng <[email protected]> Wed, 02 May 2012 00:46:20 -0700 + -- Vincent Cheng <[email protected]> Wed, 16 May 2012 23:50:12 -0700 0ad (0~r11339-2) unstable; urgency=low Modified: packages/trunk/0ad/debian/install =================================================================== --- packages/trunk/0ad/debian/install 2012-05-19 04:08:12 UTC (rev 13586) +++ packages/trunk/0ad/debian/install 2012-05-20 08:36:49 UTC (rev 13587) @@ -1,5 +1,6 @@ binaries/system/libAtlasUI.so usr/lib/games/0ad/ binaries/system/libCollada.so usr/lib/games/0ad/ +binaries/system/ActorEditor usr/lib/games/0ad/ binaries/system/pyrogenesis usr/games/ build/resources/0ad.desktop usr/share/applications/ build/resources/0ad.png usr/share/pixmaps/ Added: packages/trunk/0ad/debian/patches/enable-hardening-relro.patch =================================================================== --- packages/trunk/0ad/debian/patches/enable-hardening-relro.patch (rev 0) +++ packages/trunk/0ad/debian/patches/enable-hardening-relro.patch 2012-05-20 08:36:49 UTC (rev 13587) @@ -0,0 +1,18 @@ +Description: Build with the "read-only relocation" hardening linker flag + Pass "-Wl,-z,relro" to the linker. This fixes lintian warning + "hardening-no-relro". +Forwarded: http://trac.wildfiregames.com/ticket/1416 +Author: Vincent Cheng <[email protected]> +Last-Update: 05-16-2012 + +--- a/build/premake/premake4.lua ++++ b/build/premake/premake4.lua +@@ -246,7 +246,7 @@ + end + + if os.is("linux") or os.is("bsd") then +- linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" } ++ linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed", "-Wl,-z,relro" } + end + + if _OPTIONS["coverage"] then Modified: packages/trunk/0ad/debian/patches/fix-bindir.patch =================================================================== --- packages/trunk/0ad/debian/patches/fix-bindir.patch 2012-05-19 04:08:12 UTC (rev 13586) +++ packages/trunk/0ad/debian/patches/fix-bindir.patch 2012-05-20 08:36:49 UTC (rev 13587) @@ -1,17 +1,24 @@ Description: Fix path to 0 A.D. binaries - On Debian systems, game binaries should be installed into /usr/games/ rather - than /usr/bin/; this patch fixes this. -Forwarded: not-needed + Modify launcher script to look for pyrogenesis binary in PATH instead of + hardcoding the path, and modify the .desktop file to use a relative Exec= + value. +Forwarded: http://trac.wildfiregames.com/ticket/492#comment:16 Author: Vincent Cheng <[email protected]> -Last-Update: 2011-08-13 +Last-Update: 2012-05-16 --- a/build/resources/0ad.sh +++ b/build/resources/0ad.sh -@@ -1,3 +1,3 @@ +@@ -1,3 +1,9 @@ #!/bin/sh -/usr/bin/pyrogenesis "$@" -+/usr/games/pyrogenesis "$@" ++path_to_pyrogenesis=$(which pyrogenesis) ++if [ -x "$path_to_pyrogenesis" ] ; then ++ "$path_to_pyrogenesis" "$@" ++else ++ echo "Error: pyrogenesis cannot be found in $PATH" ++ exit 1 ++fi --- a/build/resources/0ad.desktop +++ b/build/resources/0ad.desktop @@ -3,7 +3,7 @@ @@ -19,7 +26,7 @@ Comment=A real-time strategy game of ancient warfare Comment[it]=Videogioco strategico in tempo reale di guerre antiche -Exec=/usr/bin/0ad -+Exec=/usr/games/0ad ++Exec=0ad Icon=0ad Terminal=false Type=Application Modified: packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch =================================================================== --- packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch 2012-05-19 04:08:12 UTC (rev 13586) +++ packages/trunk/0ad/debian/patches/fix-kfreebsd-ftbfs.patch 2012-05-20 08:36:49 UTC (rev 13587) @@ -1,14 +1,12 @@ Description: Fix FTBFS on Debian GNU/kFreeBSD - Add defined(__FreeBSD_kernel__) for every instance of a FreeBSD preprocessor - directive in order to detect kfreebsd, and avoid linking with execinfo on - kfreebsd. + Link with -ldl instead of -lexecinfo on kfreebsd to fix FTBFS. Forwarded: http://trac.wildfiregames.com/ticket/1322 Author: Vincent Cheng <[email protected]> -Last-Update: 2012-04-26 +Last-Update: 2012-05-17 --- a/build/premake/premake4.lua +++ b/build/premake/premake4.lua -@@ -781,7 +781,7 @@ +@@ -782,7 +782,7 @@ elseif os.is("bsd") then links { -- Needed for backtrace* on FreeBSD @@ -17,7 +15,7 @@ } end -@@ -1012,6 +1012,10 @@ +@@ -1016,6 +1016,10 @@ elseif os.is("bsd") then -- define BSD-something? @@ -28,7 +26,7 @@ buildoptions { "-fno-strict-aliasing" } buildoptions { "-rdynamic" } -@@ -1183,7 +1187,7 @@ +@@ -1197,7 +1201,7 @@ elseif os.is("bsd") then links { -- Needed for backtrace* on FreeBSD @@ -37,120 +35,3 @@ } end ---- a/build/premake/premake4/src/host/premake.h -+++ b/build/premake/premake4/src/host/premake.h -@@ -15,7 +15,7 @@ - #if defined(__linux__) - #define PLATFORM_LINUX (1) - #define PLATFORM_STRING "linux" --#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) - #define PLATFORM_BSD (1) - #define PLATFORM_STRING "bsd" - #elif defined(__APPLE__) && defined(__MACH__) ---- a/source/lib/sysdep/os.h -+++ b/source/lib/sysdep/os.h -@@ -66,7 +66,7 @@ - # define OS_MACOSX 0 - #endif - // BSD --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) - # define OS_BSD 1 - #else - # define OS_BSD 0 ---- a/libraries/fcollada/src/FCollada/FUtils/FUCriticalSection.h -+++ b/libraries/fcollada/src/FCollada/FUtils/FUCriticalSection.h -@@ -33,7 +33,7 @@ - #elif defined (__APPLE__) - //Do something here. - MPCriticalRegionID criticalSection; --#elif defined (LINUX) || defined(__FreeBSD__) -+#elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #else - #warning "FUCriticalSection: Critical section not implemented for other platforms." - #endif ---- a/libraries/fcollada/src/FCollada/FUtils/Platforms.h -+++ b/libraries/fcollada/src/FCollada/FUtils/Platforms.h -@@ -74,7 +74,7 @@ - #include <wchar.h> - #include <stdint.h> - #else // __APPLE__ --#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) -+#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include <ctype.h> - #include <wctype.h> - #include <unistd.h> -@@ -127,7 +127,7 @@ - #endif // PLATFORMS - - // Important functions that some OSes have missing! --#if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) -+#if defined(__APPLE__) || defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; } - inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; } - inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; } ---- a/libraries/fcollada/include/FUtils/FUCriticalSection.h -+++ b/libraries/fcollada/include/FUtils/FUCriticalSection.h -@@ -33,7 +33,7 @@ - #elif defined (__APPLE__) - //Do something here. - MPCriticalRegionID criticalSection; --#elif defined (LINUX) || defined(__FreeBSD__) -+#elif defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #else - #warning "FUCriticalSection: Critical section not implemented for other platforms." - #endif ---- a/libraries/fcollada/include/FUtils/Platforms.h -+++ b/libraries/fcollada/include/FUtils/Platforms.h -@@ -74,7 +74,7 @@ - #include <wchar.h> - #include <stdint.h> - #else // __APPLE__ --#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) -+#if defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include <ctype.h> - #include <wctype.h> - #include <unistd.h> -@@ -127,7 +127,7 @@ - #endif // PLATFORMS - - // Important functions that some OSes have missing! --#if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) -+#if defined(__APPLE__) || defined (LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; } - inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; } - inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; } ---- a/libraries/fcollada/src/FCollada/FCDocument/FCDocument.h -+++ b/libraries/fcollada/src/FCollada/FCDocument/FCDocument.h -@@ -30,7 +30,7 @@ - #if defined(WIN32) - template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */ - template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */ --#elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) -+#elif defined(LINUX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - template <class T> class FCDLibrary; /**< Trick Doxygen. */ - template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */ - #endif // LINUX ---- a/libraries/fcollada/include/FCDocument/FCDocument.h -+++ b/libraries/fcollada/include/FCDocument/FCDocument.h -@@ -30,7 +30,7 @@ - #if defined(WIN32) - template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */ - template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */ --#elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) -+#elif defined(LINUX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - template <class T> class FCDLibrary; /**< Trick Doxygen. */ - template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */ - #endif // LINUX ---- a/source/third_party/mongoose/mongoose.cpp -+++ b/source/third_party/mongoose/mongoose.cpp -@@ -37,7 +37,7 @@ - - #undef DEBUG - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - // Fix undefined PF_INET on FreeBSD - #include <sys/socket.h> - #endif Modified: packages/trunk/0ad/debian/patches/series =================================================================== --- packages/trunk/0ad/debian/patches/series 2012-05-19 04:08:12 UTC (rev 13586) +++ packages/trunk/0ad/debian/patches/series 2012-05-20 08:36:49 UTC (rev 13587) @@ -1,2 +1,3 @@ fix-bindir.patch fix-kfreebsd-ftbfs.patch +enable-hardening-relro.patch Modified: packages/trunk/0ad/debian/rules =================================================================== --- packages/trunk/0ad/debian/rules 2012-05-19 04:08:12 UTC (rev 13586) +++ packages/trunk/0ad/debian/rules 2012-05-20 08:36:49 UTC (rev 13587) @@ -28,7 +28,7 @@ # Note: Avoid running tests from root dir of build, otherwise certain # tests (i.e. in testsuite MeshManager) may not work as intended and # create spurious directories above root dir (../data/mods). - cd binaries/system/ && ./test + cd binaries/system/ && LD_LIBRARY_PATH=. ./test -libdir . override_dh_auto_install: install -Dm 0755 build/resources/0ad.sh $(CURDIR)/debian/tmp/usr/games/0ad _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
