Initial import (fixes bug #521468).

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

7 files changed, 228 insertions, 0 deletions

diff --git a/games-util/wit/ChangeLog b/games-util/wit/ChangeLog
new file mode 100644
index 000000000000..df7abfd356e1
--- /dev/null
+++ b/games-util/wit/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for games-util/wit
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/wit/ChangeLog,v 1.1 2014/12/14 00:10:51 radhermit Exp $
+
+*wit-2.30a (14 Dec 2014)
+
+  14 Dec 2014; Tim Harder <radhermit@gentoo.org> +wit-2.30a.ebuild,
+  +files/wit-2.30a-makefile.patch, +files/wit-2.30a-no-exec-stack.patch,
+  +files/wit-2.30a-sizeof-pointer-memaccess.patch, +metadata.xml:
+  Initial import (fixes bug #521468).
+
diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest
new file mode 100644
index 000000000000..7f95a91c7fb0
--- /dev/null
+++ b/games-util/wit/Manifest
@@ -0,0 +1,7 @@
+AUX wit-2.30a-makefile.patch 3579 SHA256 addb45e745ec54ed3ad199af128b09775927d26d252ac202cffa4cba3df74717 SHA512 e3c98f47e10fe8771dabea091032625448d85adde125a93cc786a49def4f165e164eb71dc7612aee3eea47a9e11dfc0577c223c79eeae5d6832be44b055eed7b WHIRLPOOL 65bb3556c054d66d00822d1eae180d9fa946d4abac619fd0efc7da9a82463334bbcc31d3b7a9efb4f9beb299a1c05ed33c6c2778407b49cdf10d49009985d73d
+AUX wit-2.30a-no-exec-stack.patch 232 SHA256 6208b50aa8bcda69be9241285f107deac484c4ce084aa314485aa56de2d8214b SHA512 958f1fbeda1f29ad704d2eeb3c2a1281f71957fbbb07a7258e6e69af1552e13d135ed61864ef92b9a1334b91990f79366b5b235a8865c424414e46a9305762b0 WHIRLPOOL 5fe6df0d36f10d75679b9d26e5b54a3aa2522f6853f8a75aa10038ed60fcabb2ecc51d4fc6f2cd19f3e2d58d871c686a12c09bbb2ea06247ca05750e8a8234bb
+AUX wit-2.30a-sizeof-pointer-memaccess.patch 729 SHA256 fa20715994b733c32599c0b172eaa0b65ee9c6dd4e325cf72a3429a0ae9d9b18 SHA512 43a0c9d4f68e571a790949d4d842b354d7581c181823cf838d9d2cc8d917fa737d0f8b17b479bded43e9ef9c0ce1fc21304359aec836576929ff1dd1e49730ff WHIRLPOOL 3355c862c877ca82ce6455bc53e8d767cb8c4f433e73b1ff8ad209ad21ea32822eb97801c0e78ad1ee44c82520b8d04150f096c9e87e54d265485c81d202b94c
+DIST wit-2.30a.tar.xz 716252 SHA256 5a63e554f69462474825c056abbd1411dcd0d6a24e9232a97a6c0d118eebe970 SHA512 177ae16a39b474116925a8b6cdae465ceb3e0a3cac2d3b704703ab59eed0cf380d63ad6617b56248c9030aa5250befebc31f06de1c97b8c1801c90922e8bdc69 WHIRLPOOL c5cd75213c7e25a887593d34a5812f68c9e5d8e5806d76e05201f4a1f6e74e797740c384fd06c6fe225556729a073e00259b44ed1d623313beea51b8bde3661e
+EBUILD wit-2.30a.ebuild 852 SHA256 c19679fe19c5e9596758b5947614a1e7cb4c5b23169431a6d48c33422c74c657 SHA512 5f568f9b0bf15a0a4cc2da91511d9d3f0bb2c71a5cb351abe3b680e36e04f9731b80b193c51105d7ebb196e2a37bb33b3fa4317d505396eec156e10daaf20704 WHIRLPOOL 9d0db0b35bfb39a695b01673c0d57c037b2f9ef6560fb024a7226eb3c8d7d6c391d43559e4f3a09b1aa206eadd13f38bf8512b54067f79e84e9156f691fc562f
+MISC ChangeLog 387 SHA256 d036810d8b3754ca662e37b59423f388d783daaacd15633d6b7eb0d13e4d0b24 SHA512 2798ef5e86932a89c9218bd719196c63d801c6f53117131f7d546096edb1e19cb185bc11ddcf0de5f66a58ebfaf2816c681b3cf76e182c322b5b77a15731fc96 WHIRLPOOL 5ce27127d4115c4d232a8881a623b15ac16313f9fb1a06bafe456a5d1cbf0c1b415f96fc889c7539a10d0596e50ef7953b45f48b65708dc47da13ec3fbe5146a
+MISC metadata.xml 314 SHA256 3ba2555cace20ab845e4d04a94d00c8e54bb8433bab7270c2532582bc0ba4065 SHA512 8341452ac677184d1d272b1809ad809ab2fc4cfe6dfd728ce2d7a8dcc48288e47edf79513c9332594a7be9f30ea68c603b500aee47853b4c7f80c8d314fd6f3b WHIRLPOOL 3016c1daad8fc75510e9ea39710ebf7ea8d87c38d848ebfd540de5a2604edf623862f85d9ce03015fe35b93101315b38a0ad38ceb2affd6cb9298d0b8a8003d5
diff --git a/games-util/wit/files/wit-2.30a-makefile.patch b/games-util/wit/files/wit-2.30a-makefile.patch
new file mode 100644
index 000000000000..d705487cd8ba
--- /dev/null
+++ b/games-util/wit/files/wit-2.30a-makefile.patch
@@ -0,0 +1,120 @@
+--- 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) $@.o \
++	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
+ 		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
+-	@if test -f $@.exe; then $(STRIP) $@.exe; 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) $@.o \
++	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
+ 		$(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
+ 
+ #
+ ###############################################################################
diff --git a/games-util/wit/files/wit-2.30a-no-exec-stack.patch b/games-util/wit/files/wit-2.30a-no-exec-stack.patch
new file mode 100644
index 000000000000..db91b45cfcb1
--- /dev/null
+++ b/games-util/wit/files/wit-2.30a-no-exec-stack.patch
@@ -0,0 +1,9 @@
+--- 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
diff --git a/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch b/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch
new file mode 100644
index 000000000000..32ef56f8653c
--- /dev/null
+++ b/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch
@@ -0,0 +1,31 @@
+--- 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);
diff --git a/games-util/wit/metadata.xml b/games-util/wit/metadata.xml
new file mode 100644
index 000000000000..b9f7ddab2bc2
--- /dev/null
+++ b/games-util/wit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Enable image mount support via fuse</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-util/wit/wit-2.30a.ebuild b/games-util/wit/wit-2.30a.ebuild
new file mode 100644
index 000000000000..ee707b772e5b
--- /dev/null
+++ b/games-util/wit/wit-2.30a.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/wit/wit-2.30a.ebuild,v 1.1 2014/12/14 00:10:51 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of command line tools to manipulate Wii/GameCube ISO images and WBFS containers"
+HOMEPAGE="http://wit.wiimm.de/"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse +zlib"
+
+RDEPEND="
+	app-arch/bzip2
+	fuse? ( sys-fs/fuse )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+DOCS="doc/*.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
+	epatch "${FILESDIR}"/${P}-sizeof-pointer-memaccess.patch
+}
+
+src_compile() {
+	export NO_FUSE=$(usex fuse 0 1)
+	export NO_ZLIB=$(usex zlib 0 1)
+
+	emake INSTALL_PATH="${D}"/usr CC="$(tc-getCC)"
+	emake doc
+}