Date: Friday, August 14, 2020 @ 15:01:27 Author: alucryd Revision: 679165
upgpkg: wit 3.03a-1 Modified: wit/trunk/PKGBUILD wit/trunk/wit-makefile.patch wit/trunk/wit-no-exec-stack.patch wit/trunk/wit-titles.patch -------------------------+ PKGBUILD | 28 ++++++----- wit-makefile.patch | 111 ++++++++++++++++++++-------------------------- wit-no-exec-stack.patch | 4 - wit-titles.patch | 6 +- 4 files changed, 70 insertions(+), 79 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-14 14:32:22 UTC (rev 679164) +++ PKGBUILD 2020-08-14 15:01:27 UTC (rev 679165) @@ -2,7 +2,7 @@ # Contributor: Gordin <[email protected]> pkgname=wit -pkgver=3.02a +pkgver=3.03a pkgrel=1 pkgdesc='Wiimms ISO Tools' arch=(x86_64) @@ -15,25 +15,29 @@ libncursesw.so zlib ) -makedepends=(clang) +makedepends=( + clang + git +) optdepends=( 'bash: Update titles lists' 'wget: Update titles lists' ) install=wit.install +_commit=fb217fb75b4f449dd00ecbeeae7a35082e87218c source=( - https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${pkgver}.txz + git+https://github.com/Wiimm/wiimms-iso-tools.git#commit=${_commit} wit-makefile.patch wit-no-exec-stack.patch wit-titles.patch ) -sha256sums=('b7a91ac2cfc40cbf0f8c0627a7888fa9f41b3549b0276039fddd076df6dc5d40' - '71de6228dd9f3d6c6978c98874415f73d97b09a008c7fb94813606c9b6834e7e' - 'b6028504dfef12b8a2f0073d462eb647531033151d0b89b0027a590c7cdc60ef' - 'ace3f1245430e9db8962ecb0d4f459ab73bb43f2d5d536a6fac82ad9b34186fa') +b2sums=('SKIP' + '2440f01dc499477b9c237d2bc6d9a6a712ac22887df022b6a84c6ec6ac9b095aa5944db6c5af9773a2e2446df6cc7774783c8cfd59ed815d9cb413ae8e1c0efb' + 'a9e615aac8ebafcf98079160f3e2140e1389e42baf7896a2fd845133e47ebcea9199eef847b84732d4dc4fec6107f45e96fb4ab3d4acf5421c88e02f3564eb62' + '4e241a0c37fd2a082d4285d3685833e3805e35db829961183df02bb426d5679b62f8985f59604512b2615002faa28a9d8947ca9c6fc86a025bee5ab7bbf1bcf7') prepare() { - cd wiimms-iso-tools.source-${pkgver} + cd wiimms-iso-tools patch -Np1 -i ../wit-makefile.patch patch -Np1 -i ../wit-no-exec-stack.patch @@ -41,13 +45,13 @@ } build() { - make INSTALL_PATH="${pkgdir}/usr" CC=clang -C wiimms-iso-tools.source-${pkgver} tools - make INSTALL_PATH="${pkgdir}/usr" CC=clang -C wiimms-iso-tools.source-${pkgver} doc + make INSTALL_PATH="${pkgdir}/usr" CC=clang -C wiimms-iso-tools/project tools + make INSTALL_PATH="${pkgdir}/usr" CC=clang -C wiimms-iso-tools/project doc } package () { - make INSTALL_PATH="${pkgdir}/usr" CC=clang -C wiimms-iso-tools.source-${pkgver} install - install -Dm 644 wiimms-iso-tools.source-${pkgver}/doc/*.txt -t "${pkgdir}"/usr/share/doc/wit/ + make INSTALL_PATH="${pkgdir}/usr" CC=clang -C wiimms-iso-tools/project install + install -Dm 644 wiimms-iso-tools/project/doc/*.txt -t "${pkgdir}"/usr/share/doc/wit/ } # vim: ts=2 sw=2 et: Modified: wit-makefile.patch =================================================================== --- wit-makefile.patch 2020-08-14 14:32:22 UTC (rev 679164) +++ wit-makefile.patch 2020-08-14 15:01:27 UTC (rev 679165) @@ -1,20 +1,18 @@ -Don't link libdl into wfuse as it's unnecessary, use system bzip2, respect user -CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. - ---- wiimms-iso-tools.source-3.02a/Makefile -+++ wiimms-iso-tools.source-3.02a/Makefile -@@ -171,7 +171,7 @@ +diff -rupN wiimms-iso-tools.orig/project/Makefile wiimms-iso-tools/project/Makefile +--- wiimms-iso-tools.orig/project/Makefile 2020-08-14 16:44:53.248171741 +0200 ++++ wiimms-iso-tools/project/Makefile 2020-08-14 16:54:48.841047552 +0200 +@@ -171,7 +171,7 @@ endif TOPT_wit := $(OPT_STATIC) TOPT_wwt := $(OPT_STATIC) TOPT_wdf := $(OPT_STATIC) -TOPT_wfuse := -lfuse -lpthread -ldl +TOPT_wfuse := -lfuse -lpthread - + #TOPT_ALL := $(TOPT_wit) $(TOPT_wwt) $(TOPT_wdf) $(TOPT_wfuse) - -@@ -206,8 +206,8 @@ + +@@ -206,8 +206,8 @@ else endif - + # lib summary -LIB_LIST += libbz2 lzma -LIB_OBJECTS += $(LIBBZ2_OBJ) $(LZMA_OBJ) @@ -21,32 +19,32 @@ +LIB_LIST += lzma +LIB_OBJECTS += $(LZMA_OBJ) RM_FILES += $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o}) - - -@@ -297,10 +297,8 @@ + + +@@ -297,10 +297,8 @@ DEFINES1 += -D_7ZIP_ST=1 # disable 7zip 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),cygwin) - CFLAGS += -Wno-format-truncation - else ifeq ($(SYSTEM),mac) -@@ -317,7 +315,7 @@ + + ifeq ($(SYSTEM_LINUX),1) + LIBS += -ltinfo +@@ -327,7 +325,7 @@ LDFLAGS := $(strip $(LDFLAGS)) ifeq ($(HAVE_ZLIB),1) LIBS += -lz endif -LIBS += -lm -lncurses $(XLIBS) +LIBS += -lm $(shell pkg-config --libs ncurses) -lbz2 $(XLIBS) - + DISTRIB_RM = ./wit-v$(VERSION)-r DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT) -@@ -370,83 +368,70 @@ +@@ -380,83 +378,70 @@ default_rule: all # general rules - + $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS) - @printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)" - @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \ @@ -53,7 +51,7 @@ + $(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 @@ -60,45 +58,45 @@ + 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_TOOL)" 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_INST)" "link" "wdf -> $@" "" - @ln -f wdf "$@" + ln -f wdf "$@" - + #-------------------------- - + $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile - @printf "$(LOGFORMAT_CC)" +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_CC)" object "$@" "$(MODE)" - @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ + $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ - + #-------------------------- - + $(ASM_OBJECTS): %.o: %.S Makefile - @printf "$(LOGFORMAT_CC)" 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) @@ -105,9 +103,9 @@ - @$(GEN_TEMPLATE) $@ + chmod 775 $(GEN_TEMPLATE) + $(GEN_TEMPLATE) $@ - + #-------------------------- - + $(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@ - @printf "$(LOGFORMAT)" text "$@" "" - @chmod 775 $(GEN_TEXT_FILE) @@ -114,38 +112,38 @@ - @$(GEN_TEXT_FILE) $(TEXT_DIR) $@ + chmod 775 $(GEN_TEXT_FILE) + $(GEN_TEXT_FILE) $(TEXT_DIR) $@ - + #-------------------------- - + $(UI_FILES): gen-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 - + # ############################################################################### # lib specific rules - + $(LIBBZ2_OBJ): %.o: %.c Makefile - @printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE) [libbz2]" - @$(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@ + $(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@ - + $(LZMA_OBJ): %.o: %.c Makefile - @printf "$(LOGFORMAT_CC)" object "$(subst src/lzma/,,$@)" "$(MODE) [lzma]" - @$(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@ + $(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@ - + # ############################################################################### -@@ -644,9 +629,8 @@ - +@@ -654,9 +633,8 @@ doc: $(MAIN_TOOLS) templates.sed gen-doc + .PHONY : gen-doc gen-doc: - @printf "$(LOGFORMAT)" create documentation "" @@ -153,21 +151,11 @@ - @$(GEN_TEMPLATE) + chmod ug+x $(GEN_TEMPLATE) + $(GEN_TEMPLATE) - - # + + # #-------------------------- -@@ -764,8 +748,7 @@ - #-------------------------- - - templates.sed: Makefile -- @printf "$(LOGFORMAT)" create templates.sed "" -- @echo -e '' \ -+ echo -e '' \ - '/^~/ d;\n' \ - 's|@.@@@|$(VERSION_NUM)|g;\n' \ - 's|@@@@-@@-@@|$(DATE)|g;\n' \ -@@ -828,13 +811,12 @@ - +@@ -840,13 +818,12 @@ templates.sed: Makefile + .PHONY : test test: - @printf "$(LOGFORMAT)" enable test "-> define -DTEST" @@ -182,7 +170,6 @@ - @rm -f $(MODE_FILE).tmp + cp $(MODE_FILE).tmp $(MODE_FILE) + rm -f $(MODE_FILE).tmp - - # + + # #-------------------------- - Modified: wit-no-exec-stack.patch =================================================================== --- wit-no-exec-stack.patch 2020-08-14 14:32:22 UTC (rev 679164) +++ wit-no-exec-stack.patch 2020-08-14 15:01:27 UTC (rev 679165) @@ -1,5 +1,5 @@ ---- wit-2.30a/src/crypto/ssl-asm.S -+++ wit-2.30a/src/crypto/ssl-asm.S +--- wit-2.30a/project/src/crypto/ssl-asm.S ++++ wit-2.30a/project/src/crypto/ssl-asm.S @@ -37,3 +37,6 @@ #define WIT_INCLUDE_SSL_ASM #include "ssl-asm.h" Modified: wit-titles.patch =================================================================== --- wit-titles.patch 2020-08-14 14:32:22 UTC (rev 679164) +++ wit-titles.patch 2020-08-14 15:01:27 UTC (rev 679165) @@ -1,6 +1,6 @@ -diff -rupN wit.orig/setup/load-titles.sh wit/setup/load-titles.sh ---- wit.orig/setup/load-titles.sh 2014-08-19 17:54:05.351879800 +0200 -+++ wit/setup/load-titles.sh 2014-08-19 18:04:14.235375300 +0200 +diff -rupN wit.orig/project/setup/load-titles.sh wit/project/setup/load-titles.sh +--- wit.orig/project/setup/load-titles.sh 2014-08-19 17:54:05.351879800 +0200 ++++ wit/project/setup/load-titles.sh 2014-08-19 18:04:14.235375300 +0200 @@ -30,12 +30,11 @@ NEEDED="wit wget tr"
