radhermit 14/12/14 00:10:51
Added: wit-2.30a-makefile.patch
wit-2.30a-no-exec-stack.patch
wit-2.30a-sizeof-pointer-memaccess.patch
Log:
Initial import (fixes bug #521468).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
4AB3E85B4F064CA3)
Revision Changes Path
1.1 games-util/wit/files/wit-2.30a-makefile.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-util/wit/files/wit-2.30a-makefile.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-util/wit/files/wit-2.30a-makefile.patch?rev=1.1&content-type=text/plain
Index: wit-2.30a-makefile.patch
===================================================================
--- wit-2.30a/Makefile
+++ wit-2.30a/Makefile
@@ -190,8 +190,8 @@
endif
# lib summary
-LIB_LIST += libbz2 lzma
-LIB_OBJECTS += $(LIBBZ2_OBJ) $(LZMA_OBJ)
+LIB_LIST += lzma
+LIB_OBJECTS += $(LZMA_OBJ)
RM_FILES += $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o})
@@ -273,10 +274,8 @@
DEFINES1 += -D_LZMA_PROB32=1 # LZMA option
DEFINES = $(strip $(DEFINES1) $(MODE) $(XDEF))
-CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -funroll-loops
CFLAGS += -Wall -Wno-parentheses -Wno-unused-function
-#CFLAGS += -O3 -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork
-CFLAGS += -O3 -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
+CFLAGS += -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
ifeq ($(SYSTEM),mac)
CFLAGS += -I/usr/local/include
endif
@@ -291,7 +290,7 @@
ifeq ($(HAVE_ZLIB),1)
LIBS += -lz
endif
-LIBS += $(XLIBS)
+LIBS += $(XLIBS) -lbz2
DISTRIB_RM = ./wit-v$(VERSION)-r
DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT)
@@ -344,71 +343,60 @@
# general rules
$(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
- @printf "$(LOGFORMAT)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
- @if test -f [email protected]; then $(STRIP) [email protected]; else $(STRIP) $@; fi
- @mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
- @if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
+ mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
+ if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
then cp -p $@ bin/$(SYSTEM)/debug/; \
else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi
#--------------------------
$(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile
- @printf "$(LOGFORMAT)" helper "$@ $(TOBJ_$@)" "$(MODE)"
- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
#--------------------------
$(WDF_LINKS): wdf
- @printf "$(LOGFORMAT)" "link" "wdf -> $@" ""
- @ln -f wdf "$@"
+ ln -f wdf "$@"
#--------------------------
$(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
- @printf "$(LOGFORMAT)" +object "$@" "$(MODE)"
- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
#--------------------------
$(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES)
- @printf "$(LOGFORMAT)" object "$@" "$(MODE)"
- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
#--------------------------
$(ASM_OBJECTS): %.o: %.S Makefile
- @printf "$(LOGFORMAT)" asm "$@" "$(MODE)"
- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
#--------------------------
$(SETUP_FILES): templates.sed $(SETUP_DIR)/$@
- @printf "$(LOGFORMAT)" create "$@" ""
- @chmod 775 $(GEN_TEMPLATE)
- @$(GEN_TEMPLATE) $@
+ chmod 775 $(GEN_TEMPLATE)
+ $(GEN_TEMPLATE) $@
#--------------------------
$(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@
- @printf "$(LOGFORMAT)" text "$@" ""
- @chmod 775 $(GEN_TEXT_FILE)
- @$(GEN_TEXT_FILE) $(TEXT_DIR) $@
+ chmod 775 $(GEN_TEXT_FILE)
+ $(GEN_TEXT_FILE) $(TEXT_DIR) $@
#--------------------------
$(UI_FILES): gen-ui.c tab-ui.c ui.h $(UI_TABS) | gen-ui
- @printf "$(LOGFORMAT)" run gen-ui ""
- @./gen-ui
+ ./gen-ui
.PHONY : ui
ui : gen-ui
- @printf "$(LOGFORMAT)" run gen-ui ""
- @./gen-ui
+ ./gen-ui
#
###############################################################################
1.1 games-util/wit/files/wit-2.30a-no-exec-stack.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-util/wit/files/wit-2.30a-no-exec-stack.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-util/wit/files/wit-2.30a-no-exec-stack.patch?rev=1.1&content-type=text/plain
Index: wit-2.30a-no-exec-stack.patch
===================================================================
--- wit-2.30a/src/crypto/ssl-asm.S
+++ wit-2.30a/src/crypto/ssl-asm.S
@@ -37,3 +37,6 @@
#define WIT_INCLUDE_SSL_ASM
#include "ssl-asm.h"
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
1.1
games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch?rev=1.1&content-type=text/plain
Index: wit-2.30a-sizeof-pointer-memaccess.patch
===================================================================
--- wit-2.30a/src/lib-file.c
+++ wit-2.30a/src/lib-file.c
@@ -3510,7 +3510,7 @@
DASSERT(fmap);
DASSERT(n_elem>0);
- memset(fmap,0,sizeof(fmap));
+ memset(fmap,0,sizeof(*fmap));
u64 last_off = 0;
while ( last_off < file->st.st_size )
--- wit-2.30a/src/wfuse.c
+++ wit-2.30a/src/wfuse.c
@@ -340,7 +340,7 @@
}
ResetWBFS(df->wbfs);
FREE(df->wbfs);
- memset(df,0,sizeof(df));
+ memset(df,0,sizeof(*df));
n_dfile--;
}
@@ -352,7 +352,7 @@
if (found_df)
{
- memset(found_df,0,sizeof(found_df));
+ memset(found_df,0,sizeof(*found_df));
WBFS_t * wbfs = MALLOC(sizeof(*wbfs));
InitializeWBFS(wbfs);
enumError err = OpenWBFS(wbfs,source_file,false,true,0);
