Date: Friday, May 29, 2020 @ 17:23:37 Author: alucryd Revision: 637176
upgpkg: wit 3.02a-1 Added: wit/trunk/wit-makefile.patch wit/trunk/wit-no-exec-stack.patch Modified: wit/trunk/PKGBUILD (contents, properties) -------------------------+ PKGBUILD | 58 ++++++++------ wit-makefile.patch | 188 ++++++++++++++++++++++++++++++++++++++++++++++ wit-no-exec-stack.patch | 10 ++ 3 files changed, 231 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-29 17:01:29 UTC (rev 637175) +++ PKGBUILD 2020-05-29 17:23:37 UTC (rev 637176) @@ -2,44 +2,52 @@ # Contributor: Gordin <[email protected]> pkgname=wit -pkgver=3.01a -_revision=7464 +pkgver=3.02a pkgrel=1 pkgdesc='Wiimms ISO Tools' -arch=('x86_64') -url='https://wit.wiimm.de' -license=('GPL2') -depends=('fuse2' 'zlib') -makedepends=('subversion') -optdepends=('bash: Update titles lists' - 'wget: Update titles lists') -install='wit.install' -source=("wit::svn+http://opensvn.wiimm.de/wii/trunk/wiimms-iso-tools#revision=${_revision}"; - 'wit-titles.patch') -sha256sums=('SKIP' +arch=(x86_64) +url=https://wit.wiimm.de +license=(GPL2) +depends=( + bzip2 + fuse2 + glibc + libncursesw.so + zlib +) +makedepends=(clang) +optdepends=( + 'bash: Update titles lists' + 'wget: Update titles lists' +) +install=wit.install +source=( + https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${pkgver}.txz + wit-makefile.patch + wit-no-exec-stack.patch + wit-titles.patch +) +sha256sums=('b7a91ac2cfc40cbf0f8c0627a7888fa9f41b3549b0276039fddd076df6dc5d40' + '71de6228dd9f3d6c6978c98874415f73d97b09a008c7fb94813606c9b6834e7e' + 'b6028504dfef12b8a2f0073d462eb647531033151d0b89b0027a590c7cdc60ef' 'ace3f1245430e9db8962ecb0d4f459ab73bb43f2d5d536a6fac82ad9b34186fa') prepare() { - cd wit + cd wiimms-iso-tools.source-${pkgver} + patch -Np1 -i ../wit-makefile.patch + patch -Np1 -i ../wit-no-exec-stack.patch patch -Np1 -i ../wit-titles.patch } build() { - cd wit - - export LDFLAGS="$LDFLAGS,-z,noexecstack" - - make INSTALL_PATH="${pkgdir}/usr" tools - make doc + 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 } package () { - cd wit - - make install - install -dm 755 "${pkgdir}"/usr/share/doc/wit - install -m 644 doc/*.txt "${pkgdir}"/usr/share/doc/wit/ + 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/ } # vim: ts=2 sw=2 et: Property changes on: wit/trunk/PKGBUILD ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Added: wit-makefile.patch =================================================================== --- wit-makefile.patch (rev 0) +++ wit-makefile.patch 2020-05-29 17:23:37 UTC (rev 637176) @@ -0,0 +1,188 @@ +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 @@ + 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 @@ + 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}) + + +@@ -297,10 +297,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),cygwin) + CFLAGS += -Wno-format-truncation + else ifeq ($(SYSTEM),mac) +@@ -317,7 +315,7 @@ + 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 @@ + # 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] \ ++ $(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_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) +- @$(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 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 @@ + + .PHONY : gen-doc + gen-doc: +- @printf "$(LOGFORMAT)" create documentation "" +- @chmod ug+x $(GEN_TEMPLATE) +- @$(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 @@ + + .PHONY : test + test: +- @printf "$(LOGFORMAT)" enable test "-> define -DTEST" +- @rm -f *.o $(ALL_TOOLS_X) +- @echo "-DTEST" >>$(MODE_FILE) +- @sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp ++ rm -f *.o $(ALL_TOOLS_X) ++ echo "-DTEST" >>$(MODE_FILE) ++ sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp + # 2 steps to bypass a cygwin mv failure +- @cp $(MODE_FILE).tmp $(MODE_FILE) +- @rm -f $(MODE_FILE).tmp ++ cp $(MODE_FILE).tmp $(MODE_FILE) ++ rm -f $(MODE_FILE).tmp + + # + #-------------------------- + Added: wit-no-exec-stack.patch =================================================================== --- wit-no-exec-stack.patch (rev 0) +++ wit-no-exec-stack.patch 2020-05-29 17:23:37 UTC (rev 637176) @@ -0,0 +1,10 @@ +--- 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 +
