Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79c673646f33282c7569cb8c349dfac7f6af807e
commit 79c673646f33282c7569cb8c349dfac7f6af807e Author: DeX77 <[email protected]> Date: Wed Aug 24 13:54:39 2016 +0200 unace-2.5-3-x86_64 - remove diff --git a/source/apps-extra/unace/01-only-unace.patch b/source/apps-extra/unace/01-only-unace.patch deleted file mode 100644 index 7adaa73..0000000 --- a/source/apps-extra/unace/01-only-unace.patch +++ /dev/null @@ -1,40 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Description: Do not try to include Makefiles for ace or unace.dll - and force remove in clean rule. - ---- unace-nonfree-2.5.orig/base.mk -+++ unace-nonfree-2.5/base.mk -@@ -427,9 +427,7 @@ BASE_OS2_OBJS = - ############################################################################## - - ifndef ISWMAKE --include $(MAKE_DIR)baseace.mk - include $(MAKE_DIR)baseuace.mk - else --!include $(MAKE_DIR)baseace.mk - !include $(MAKE_DIR)baseuace.mk - endif ---- unace-nonfree-2.5.orig/makefile -+++ unace-nonfree-2.5/makefile -@@ -29,8 +29,8 @@ endif - all: unace - - clean: -- rm unace -- rm linunace25.tgz -+ rm -f unace -+ rm -f linunace25.tgz - - include $(MAKE_DIR)base.mk - include $(MAKE_DIR)apps.mk ---- unace-nonfree-2.5.orig/unace.mk -+++ unace-nonfree-2.5/unace.mk -@@ -27,8 +27,6 @@ APPS_UNACE_OBJS = - - ifndef ISWMAKE - include $(MAKE_DIR)unaceexe.mk --include $(MAKE_DIR)unacedll.mk - else - !include $(MAKE_DIR)unaceexe.mk --!include $(MAKE_DIR)unacedll.mk - endif diff --git a/source/apps-extra/unace/02-no-io_h.patch b/source/apps-extra/unace/02-no-io_h.patch deleted file mode 100644 index d8ae5c0..0000000 --- a/source/apps-extra/unace/02-no-io_h.patch +++ /dev/null @@ -1,41 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Author: Michael Karcher <[email protected]> -Description: Not every arch has <io.h>, include <unistd.h> instead. - ---- unace-nonfree-2.5.orig/makefile -+++ unace-nonfree-2.5/makefile -@@ -17,7 +17,7 @@ SRCS = $(SRCSsl)/ - INCLSYSDIR = //usr/include/sys - INCLDIR = //usr/include - --DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -D__HAS_IO_H__ -+DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__ - - ifdef DEBUG - LSWITCHES = ---- unace-nonfree-2.5.orig/source/base/all/bufread/bufread.c -+++ unace-nonfree-2.5/source/base/all/bufread/bufread.c -@@ -3,6 +3,10 @@ - - #ifdef __HAS_IO_H__ - #include <io.h> -+#else -+#ifdef __unix__ -+ #include <unistd.h> -+#endif - #endif - - #include <string.h> ---- unace-nonfree-2.5.orig/source/base/all/lfn/lfn.h -+++ unace-nonfree-2.5/source/base/all/lfn/lfn.h -@@ -6,6 +6,10 @@ - - #ifdef __HAS_IO_H__ - #include <io.h> -+#else -+#ifdef __unix__ -+ #include <unistd.h> -+#endif - #endif - - #ifdef INCL_BASE_LFN_EXCLUSIVE diff --git a/source/apps-extra/unace/03-gcc-call.patch b/source/apps-extra/unace/03-gcc-call.patch deleted file mode 100644 index 21f2436..0000000 --- a/source/apps-extra/unace/03-gcc-call.patch +++ /dev/null @@ -1,40 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Author: Mike Frysinger <[email protected]> -Description: Call C-Compiler via $(CC), consider CFLAGS, remove -static flag, - drop linking against libncurses and change include dir order. - Furthermore use standard env vars and remove pointless -I paths. - ---- a/makefile -+++ b/makefile -@@ -14,17 +14,16 @@ PACKAGES_DIRsl = - SRCSsl = $(BASIC_DIR)source - SRCS = $(SRCSsl)/ - -+ifdef SYSINC - INCLSYSDIR = //usr/include/sys - INCLDIR = //usr/include -- --DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__ -- --ifdef DEBUG --LSWITCHES = -+INCLS = -I$(INCLDIR) -idirafter $(INCLSYSDIR) - else --LSWITCHES = -Wl,-s -+INCLS = - endif - -+DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__ -+ - ############################################################################## - all: unace - -@@ -47,7 +46,7 @@ UNACEEXENT_CFILES = \ - $(APPS_UNACEEXE_CFILES) - - unace: $(UNACEEXELIN_CFILES) -- gcc $(LSWITCHES) -Wl,-lncurses -static -I$(INCLDIR) -I$(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(INCLS) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -o$(EXECS_DIR)unace - ifndef DEBUG - tar cfvz linunace25.tgz unace file_id.diz licence - #sh linpack.sh diff --git a/source/apps-extra/unace/04-64bit.patch b/source/apps-extra/unace/04-64bit.patch deleted file mode 100644 index c9f401f..0000000 --- a/source/apps-extra/unace/04-64bit.patch +++ /dev/null @@ -1,120 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: Replace declare.h by a generic stdint based version. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449395 - ---- unace-nonfree-2.5.orig/source/base/all/declare.h -+++ unace-nonfree-2.5/source/base/all/declare.h -@@ -7,76 +7,47 @@ - #ifndef _DECLARE_H_INCLUDED - #define _DECLARE_H_INCLUDED - --#if !defined(__OS2__) && !defined(_WINDOWS_) -- typedef int BOOL; -+#include <stdint.h> - -- typedef char CHAR; -- typedef unsigned char UCHAR; -- typedef UCHAR *PUCHAR; -- typedef char *PSZ; -+typedef int BOOL; -+typedef BOOL *PBOOL; - -- typedef short SHORT; -- typedef unsigned short USHORT; -- typedef USHORT *PUSHORT; -- -- typedef long LONG; -- typedef unsigned long ULONG; -- -- typedef ULONG *PULONG; -- -- typedef int INT; -- typedef unsigned int UINT; -- typedef unsigned int *PUINT; -- -- typedef CHAR *LPSTR; --#endif -- --#if __WATCOMC__==1060 -- typedef long __int64[2]; -- typedef __int64 LONGLONG; -- typedef LONGLONG *PLONGLONG; -- typedef __int64 ULONGLONG; -- typedef ULONGLONG DWORDLONG; --#else -- #if !defined(_WINDOWS_) -- #if !defined(__WATCOMC__) && !defined(__int64) -- #define __int64 long long -- #endif -- -- typedef __int64 LONGLONG; -- typedef LONGLONG *PLONGLONG; -- typedef unsigned __int64 ULONGLONG; -- typedef ULONGLONG DWORDLONG; -- #endif --#endif -- -- --#if !defined(_WINDOWS_) -- typedef BOOL *PBOOL; -- typedef INT *PINT; --#endif -- --#if !defined(__wtypes_h__) -- typedef void *PVOID; -- typedef CHAR *PCHAR; -- typedef SHORT *PSHORT; -- typedef LONG *PLONG; -- typedef ULONGLONG *PULONGLONG; --#endif -- --#if defined(_GNU_H_WINDOWS32_BASE) -- typedef LONGLONG ULONGLONG; -- typedef ULONGLONG *PULONGLONG; --#endif -- --typedef signed char SCHAR; -+typedef char CHAR; -+typedef CHAR *PCHAR; -+typedef unsigned char UCHAR; -+typedef UCHAR *PUCHAR; -+typedef signed char SCHAR; -+typedef CHAR *PSZ; -+typedef CHAR *LPSTR; -+ -+typedef int INT; -+typedef INT *PINT; -+typedef unsigned int UINT; -+typedef unsigned int *PUINT; -+ -+typedef int16_t SHORT; -+typedef SHORT *PSHORT; -+typedef uint16_t USHORT; -+typedef USHORT *PUSHORT; -+ -+typedef int32_t LONG; -+typedef LONG *PLONG; -+typedef uint32_t ULONG; -+typedef ULONG *PULONG; -+ -+typedef int64_t LONGLONG; -+typedef LONGLONG *PLONGLONG; -+typedef uint64_t ULONGLONG; -+typedef ULONGLONG *PULONGLONG; -+ -+typedef void *PVOID; -+ -+/* Dear ACE team, please clean your code to remove the following types */ -+typedef LONGLONG __int64; -+typedef ULONGLONG DWORDLONG; - - #ifndef NULL -- #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__) -- #define NULL 0 -- #else -- #define NULL 0L -- #endif -+#include <stdlib.h> - #endif - - diff --git a/source/apps-extra/unace/05-warning-fixes.patch b/source/apps-extra/unace/05-warning-fixes.patch deleted file mode 100644 index 1292661..0000000 --- a/source/apps-extra/unace/05-warning-fixes.patch +++ /dev/null @@ -1,284 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: This patch fixes harmless warnings, mostly suggested parentheses. - ---- unace-nonfree-2.5.orig/source/apps/exe/convert/convert.c -+++ unace-nonfree-2.5/source/apps/exe/convert/convert.c -@@ -109,7 +109,7 @@ INT UnitCharNumber; - { - UnitCharNumber = 0; - -- while (Size > 999999999 || UnitCharNumber && Size > 99999999) -+ while (Size > 999999999 || (UnitCharNumber && Size > 99999999)) - { - Size >>= 10; - UnitCharNumber++; ---- unace-nonfree-2.5.orig/source/apps/exe/messages/messages.c -+++ unace-nonfree-2.5/source/apps/exe/messages/messages.c -@@ -192,7 +192,7 @@ INT APPS_EXE_MESSAGES_GetHotKey(PCHA - { - PCHAR AndPos; - -- if (AndPos = strchr(Str, '&')) -+ if ((AndPos = strchr(Str, '&'))) - { - strcpy(AndPos, AndPos + 1); - ---- unace-nonfree-2.5.orig/source/apps/unace/exe/commline/commline.c -+++ unace-nonfree-2.5/source/apps/unace/exe/commline/commline.c -@@ -393,7 +393,7 @@ INT I; - - void APPS_UNACE_EXE_COMMLINE_ToggleSwitch(PCHAR SwitchChar, PINT Variable) - { -- if (!(*SwitchChar) || *SwitchChar == '+' && *(SwitchChar + 1) == 0) -+ if (!(*SwitchChar) || (*SwitchChar == '+' && *(SwitchChar + 1) == 0)) - { - *Variable = 1; - } -@@ -549,9 +549,9 @@ PCHAR PointPos; - if (strrchr(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName, BASE_PATHFUNC_SEPARATOR) - > PointPos - || !PointPos -- || !BASE_CONVERT_StrICmp(PointPos, ".") -- && !BASE_CONVERT_StrICmp(PointPos, ".ace") -- && !BASE_CONVERT_StrICmp(PointPos, ".exe")) -+ || (!BASE_CONVERT_StrICmp(PointPos, ".") -+ && !BASE_CONVERT_StrICmp(PointPos, ".ace") -+ && !BASE_CONVERT_StrICmp(PointPos, ".exe"))) - { - strcat(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName, - BASE_ACESTRUC_EXTENSION); ---- unace-nonfree-2.5.orig/source/base/all/arcblk/arcblk.c -+++ unace-nonfree-2.5/source/base/all/arcblk/arcblk.c -@@ -117,7 +117,7 @@ void BASE_ARCBLK_FileHeaderSecurityRe - if ((Header->File.HEAD_FLAGS & BASE_ACESTRUC_FLAG_SECURITY) - && (*Size = BASE_ARCBLK_FileHeaderSecuritySize(Header))) - { -- if (*Security = BASE_MEMORY_GetMem(*Size)) -+ if ((*Security = BASE_MEMORY_GetMem(*Size))) - { - memcpy(*Security, BASE_ARCBLK_FileHeaderSecurity(Header), *Size); - } ---- unace-nonfree-2.5.orig/source/base/all/archives/test/test.c -+++ unace-nonfree-2.5/source/base/all/archives/test/test.c -@@ -59,7 +59,7 @@ tBASE_DIRDATA_DirData - (PVOID)&BASE_ARCHIVES_TEST.TestBuffer[TestPos], - 512 + 32 -TestPos); - -- if (!Read && !TestPos || errno) -+ if ((!Read && !TestPos) || errno) - { - break; - } ---- unace-nonfree-2.5.orig/source/base/all/comments/comments.c -+++ unace-nonfree-2.5/source/base/all/comments/comments.c -@@ -47,7 +47,11 @@ PCHAR CommentPos; - CommentSize = sizeof(BASE_COMMENTS.Comment) - 1; - } - -- memcpy(BASE_COMMENTS.Comment, CommentPos, CommentSize); -+ if(CommentSize > 0) -+ { -+ memcpy(BASE_COMMENTS.Comment, CommentPos, CommentSize); -+ } -+ - BASE_COMMENTS.CompressedSize = CommentSize; - BASE_DCPR_COMMENTS_GetComment(); - ---- unace-nonfree-2.5.orig/source/base/all/dcpr/dcpr.c -+++ unace-nonfree-2.5/source/base/all/dcpr/dcpr.c -@@ -125,8 +125,8 @@ INT R, - RestLen -= R; - } - while ((R || BASE_DCPR.NextType != BASE_DCPR.Type -- || (BASE_DCPR.NextType == BASE_ACESTRUC_BLOCKEDTYPE_LZ77_DELTA) -- && BASE_DCPR_LZ77.NextDeltaLen) -+ || ((BASE_DCPR.NextType == BASE_ACESTRUC_BLOCKEDTYPE_LZ77_DELTA) -+ && BASE_DCPR_LZ77.NextDeltaLen)) - && (RestLen > BASE_CPRDCPR_LZ77_MAXLEN)); - - return Len - RestLen; ---- unace-nonfree-2.5.orig/source/base/all/dosfuncs/lin.c -+++ unace-nonfree-2.5/source/base/all/dosfuncs/lin.c -@@ -46,7 +46,7 @@ PCHAR ChPtr; - { - BASE_PATHFUNC_CompletePath(DirToOpen); - -- if (ChPtr = strrchr(DirToOpen, BASE_PATHFUNC_SEPARATOR)) -+ if ((ChPtr = strrchr(DirToOpen, BASE_PATHFUNC_SEPARATOR))) - { - strcpy(SearchMask, ChPtr + 1); - ---- unace-nonfree-2.5.orig/source/base/all/extract/extract.c -+++ unace-nonfree-2.5/source/base/all/extract/extract.c -@@ -134,7 +134,7 @@ UINT NTFSSecuritySize; - Decompressed = BASE_DCPR_Block(&Buf[BufPos], BufSize - + BASE_CPRDCPR_LZ77_MAXLEN - BufPos); - -- if (!Decompressed && !BufPos || BASE_ERROR_EXTERN_HandleCancel(1)) -+ if ((!Decompressed && !BufPos) || BASE_ERROR_EXTERN_HandleCancel(1)) - { - break; - } -@@ -265,8 +265,8 @@ INT FilesNumber; - - while (!BASE_ERROR_EXTERN_HandleCancel(1) - && (BASE_EXTRACT.DoExtractAllVolumes -- || BASE_ARCBLK.Options.IsVolume -- && BASE_EXTRACT.DoProcessAllVolumes -+ || (BASE_ARCBLK.Options.IsVolume -+ && BASE_EXTRACT.DoProcessAllVolumes) - || FilesNumber) - && BASE_ARCBLK_LoadBlock()) - { -@@ -348,8 +348,8 @@ tLFN ArchiveName; - - if (BASE_VOLUME_FirstVolumeToProcess(ArchiveName)) - { -- if (!DoWriteData && BASE_ARCBLK.Options.IsSolid -- || !BASE_FILELIST.Number) -+ if ((!DoWriteData && BASE_ARCBLK.Options.IsSolid) -+ || !BASE_FILELIST.Number) - { - BASE_EXTRACT.DoExtractAllVolumes = 1; - BASE_FILELIST.SizeOfFiles = BASE_DIRDATA_Dir1.UnPackedSize; ---- unace-nonfree-2.5.orig/source/base/all/funcs/funcs.c -+++ unace-nonfree-2.5/source/base/all/funcs/funcs.c -@@ -24,10 +24,11 @@ void BASE_FUNCS_Copy(INT Mode) - BASE_FILELIST.DoAddFileCheckIfValidFile = - !BASE_DIRDATA_IsInArchive1 && BASE_DIRDATA_IsInArchive2; - -- if (BASE_EXTRACT.DoExtractAllVolumes -- && BASE_FILELIST_Create(1, 5, 1) -- || !BASE_EXTRACT.DoExtractAllVolumes -- && BASE_FILELIST_Create(1, Mode, 1)) -+ if ((BASE_EXTRACT.DoExtractAllVolumes -+ && BASE_FILELIST_Create(1, 5, 1)) -+ || -+ (!BASE_EXTRACT.DoExtractAllVolumes -+ && BASE_FILELIST_Create(1, Mode, 1))) - { - BASE_FUNCS_EXTERN_DoCopy(Mode); - -@@ -45,7 +46,7 @@ void BASE_FUNCS_Copy(INT Mode) - - INT BASE_FUNCS_DeleteRealFile(PCHAR FileName, BOOL IsOverwriteDelete) - { --BOOL Err; -+BOOL Err = 0; - INT Input; - UINT Attr; - -@@ -76,11 +77,12 @@ UINT Attr; - { - BASE_ERROR.ErrorCode = BASE_ERROR_USER; - } -- } -- -- if (Input && !BASE_FUNCS.DoDeleteAll) -- { -- return 1; -+ -+ if (Input > 1) -+ { -+ return 1; -+ } -+ - } - - BASE_LFN_SetFileAttributes(FileName, BASE_DOSFUNCS_NORMAL); -@@ -162,7 +164,7 @@ INT BaseLen; - INT BASE_FUNCS_CreateDestinationFile(INT Attr) - { - INT Handle, -- Input, -+ Input = 0, - Len; - - sprintf(BASE_STATE.DestinationFileName, "%s%s", -@@ -224,7 +226,7 @@ INT Handle, - } - - BASE_FUNCS.DidNotCopyAll |= -- (Input = (Input && !BASE_FUNCS.DoOverwriteAll -+ (Input = ((Input && !BASE_FUNCS.DoOverwriteAll) - || BASE_FUNCS_DeleteRealFile(BASE_STATE.DestinationFileName, 1))); - - if (Input) ---- unace-nonfree-2.5.orig/source/base/all/lfn/lin.c -+++ unace-nonfree-2.5/source/base/all/lfn/lin.c -@@ -50,7 +50,7 @@ tLFN SearchFile, - { - SepStr = getenv("PATH"); - -- if (Env = (PCHAR) BASE_MEMORY_GetMem(strlen(SepStr) + 1)) -+ if ((Env = (PCHAR) BASE_MEMORY_GetMem(strlen(SepStr) + 1))) - { - strcpy(Env, SepStr); - SepStr = Env; ---- unace-nonfree-2.5.orig/source/base/all/lfn/nont.c -+++ unace-nonfree-2.5/source/base/all/lfn/nont.c -@@ -52,7 +52,7 @@ INT NameNumber, - - do - { -- if (NextSlashPos = (PCHAR) strchr(NamePos, BASE_PATHFUNC_SEPARATOR)) -+ if ((NextSlashPos = (PCHAR) strchr(NamePos, BASE_PATHFUNC_SEPARATOR))) - { - NameLen = NextSlashPos - NamePos; - } ---- unace-nonfree-2.5.orig/source/base/all/memory/nodos32.c -+++ unace-nonfree-2.5/source/base/all/memory/nodos32.c -@@ -14,7 +14,7 @@ INT OldSize; - - OldSize = BASE_MEMORY_Size(OldPointer); - -- if (NewPointer = realloc((PVOID) ((PULONG) OldPointer - 1), NewSize + 4)) -+ if ((NewPointer = realloc((PVOID) ((PULONG) OldPointer - 1), NewSize + 4))) - { - BASE_MEMORY.MaxAllocate += OldSize - NewSize; - *(PULONG) NewPointer = NewSize; ---- unace-nonfree-2.5.orig/source/base/all/pathfunc/pathfunc.c -+++ unace-nonfree-2.5/source/base/all/pathfunc/pathfunc.c -@@ -140,7 +140,7 @@ INT I, - DoRepeat = 0; - strcpy(CompareStr1, SlashPos); - -- if (NextSlashPos = strchr(SlashPos + 1, BASE_PATHFUNC_SEPARATOR)) -+ if ((NextSlashPos = strchr(SlashPos + 1, BASE_PATHFUNC_SEPARATOR))) - { - CompareStr1[NextSlashPos - SlashPos] = 0; - } -@@ -345,11 +345,12 @@ INT CurrentDirLen; - || !strchr(Path, ':')) - && Path[0] != '/') - */ -- if (Path[0] == '\\' && Path[1] != '\\' -- || Path[0] != BASE_PATHFUNC_SEPARATOR -+ if ((Path[0] == '\\' && Path[1] != '\\') -+ || (Path[0] != BASE_PATHFUNC_SEPARATOR - #ifndef __unix__ - && !strchr(Path, ':') - #endif -+ ) - ) - { - getcwd(CurrentDir, sizeof(CurrentDir)); -@@ -390,7 +391,7 @@ BOOL BASE_PATHFUNC_IsNTFSStreamName(P - { - PCHAR Ptr; - -- if (Ptr = strrchr(Path, ':')) -+ if ((Ptr = strrchr(Path, ':'))) - { - return *(Ptr + 1) != '\\'; - } ---- unace-nonfree-2.5.orig/source/base/all/state/state.h -+++ unace-nonfree-2.5/source/base/all/state/state.h -@@ -54,6 +54,7 @@ void BASE_STATE_OutputProgress(INT Re - void BASE_STATE_OutputCRCOk(BOOL CRCIsOk); - - void BASE_STATE_EXTERN_IsCRCOk(PBOOL IsCRCOk, BOOL IsEncrypted); -+void BASE_STATE_EXTERN_IsCRCOkSet(PBOOL IsCRCOk, BOOL IsEncrypted); - void BASE_STATE_EXTERN_OutputProgressData(PCHAR Buf, INT Bytes); - - void BASE_STATE_EXTERN_OutputProcess(PCHAR OperationStr, PCHAR FileName, diff --git a/source/apps-extra/unace/06-fix-bad-pointer-arith.patch b/source/apps-extra/unace/06-fix-bad-pointer-arith.patch deleted file mode 100644 index a62d052..0000000 --- a/source/apps-extra/unace/06-fix-bad-pointer-arith.patch +++ /dev/null @@ -1,228 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: This patch removes non-portable pointer arithmetics and useless - casts of pointers to integers. - ---- unace-nonfree-2.5.orig/source/apps/exe/input/input.c -+++ unace-nonfree-2.5/source/apps/exe/input/input.c -@@ -169,6 +169,7 @@ CHAR ShortStr1[80], - TempStr[200]; - INT TimeCount; - UINT ButtonNumber; -+PCHAR ButtonPtr; - PCHAR Output; - - APPS_EXE_CONVERT_MakeStrShorter(ShortStr1, Description1, 79); -@@ -207,11 +208,11 @@ PCHAR Output; - APPS_EXE_INPUT.LastKey = APPS_EXE_MESSAGES.YANC[3]; - } - } -- while (!(ButtonNumber = -- (LONG) strchr(APPS_EXE_MESSAGES.YANC, APPS_EXE_INPUT.LastKey)) -+ while (!(ButtonPtr = -+ strchr(APPS_EXE_MESSAGES.YANC, APPS_EXE_INPUT.LastKey)) - && !BASE_ERROR_EXTERN_HandleCancel(0)); - -- ButtonNumber -= (LONG) APPS_EXE_MESSAGES.YANC; -+ ButtonNumber = ButtonPtr - APPS_EXE_MESSAGES.YANC; - - if (!BASE_ERROR.ErrorCode) - { ---- unace-nonfree-2.5.orig/source/apps/unace/exe/commline/commline.c -+++ unace-nonfree-2.5/source/apps/unace/exe/commline/commline.c -@@ -42,15 +42,17 @@ - - void APPS_UNACE_EXE_COMMLINE_Init(void) - { -+ INT SearchExcludeListMax; -+ - APPS_EXE_COMMLINE.TimeOutLimit = 600; - - BASE_FILELIST.SearchExcludeListEnd = - BASE_FILELIST.SearchExcludeList = -- (PCHAR) BASE_MEMORY_GetMemBase2((PINT) -- &BASE_FILELIST.SearchExcludeListMax, -+ (PCHAR) BASE_MEMORY_GetMemBase2(&SearchExcludeListMax, - 1); - -- BASE_FILELIST.SearchExcludeListMax += (INT) BASE_FILELIST.SearchExcludeList; -+ BASE_FILELIST.SearchExcludeListMax = SearchExcludeListMax + -+ BASE_FILELIST.SearchExcludeList; - - APPS_EXE_OUTPUT.DoUseStdOutput = 1; - -@@ -265,12 +267,12 @@ INT Handle, - - void APPS_UNACE_EXE_COMMLINE_GetFileListInit(void) - { -+ INT SearchListMax; - BASE_FILELIST.SearchListEnd = - BASE_FILELIST.SearchList = -- (PCHAR) BASE_MEMORY_GetMemBase2((PINT) -- &BASE_FILELIST.SearchListMax, 1); -+ (PCHAR) BASE_MEMORY_GetMemBase2(&SearchListMax,1); - -- BASE_FILELIST.SearchListMax += (INT) BASE_FILELIST.SearchListEnd; -+ BASE_FILELIST.SearchListMax = SearchListMax + BASE_FILELIST.SearchListEnd; - } - - /*-----------------APPS_UNACE_EXE_COMMLINE_GetFileListDone---------------*/ ---- unace-nonfree-2.5.orig/source/base/all/arcblk/arcblk.c -+++ unace-nonfree-2.5/source/base/all/arcblk/arcblk.c -@@ -218,8 +218,8 @@ void BASE_ARCBLK_ConvertHeader32ToHea - memmove(&BASE_ARCBLK.Header.File.FTIME, - &BASE_ARCBLK.Header.File32.FTIME, - sizeof(BASE_ARCBLK.Header) -- - ((ULONG)&BASE_ARCBLK.Header.File.FTIME -- - (ULONG)&BASE_ARCBLK.Header)); -+ - ((PCHAR)&BASE_ARCBLK.Header.File.FTIME -+ - (PCHAR)&BASE_ARCBLK.Header)); - - BASE_ARCBLK.Header.File.PSIZE = PSIZE; - BASE_ARCBLK.Header.File.SIZE = SIZE; -@@ -239,8 +239,8 @@ void BASE_ARCBLK_ConvertHeader32ToHea - memmove(&BASE_ARCBLK.Header.Recovery.CLUSTER, - &BASE_ARCBLK.Header.Recovery32.CLUSTER, - sizeof(BASE_ARCBLK.Header) -- - ((ULONG)&BASE_ARCBLK.Header.Recovery.CLUSTER -- - (ULONG)&BASE_ARCBLK.Header)); -+ - ((PCHAR)&BASE_ARCBLK.Header.Recovery.CLUSTER -+ - (PCHAR)&BASE_ARCBLK.Header)); - - BASE_ARCBLK.Header.Recovery.REC_BLK_SIZE = REC_BLK_SIZE; - BASE_ARCBLK.Header.Recovery.REL_STRT = REL_STRT; -@@ -259,8 +259,8 @@ void BASE_ARCBLK_ConvertHeader32ToHea - memmove(&BASE_ARCBLK.Header.Basic.other, - &BASE_ARCBLK.Header.Basic32.other, - sizeof(BASE_ARCBLK.Header) -- - ((ULONG)&BASE_ARCBLK.Header.Basic.other -- - (ULONG)&BASE_ARCBLK.Header)); -+ - ((PCHAR)&BASE_ARCBLK.Header.Basic.other -+ - (PCHAR)&BASE_ARCBLK.Header)); - - BASE_ARCBLK.Header.Basic.ADDSIZE = ADDSIZE; - ---- unace-nonfree-2.5.orig/source/base/all/archives/ace/ace.c -+++ unace-nonfree-2.5/source/base/all/archives/ace/ace.c -@@ -35,12 +35,12 @@ ULONGLONG FilePos, - if (!memcmp(&BASE_ARCHIVES_TEST.TestBuffer[I], BASE_ACESTRUC_ACESIGN, - BASE_ACESTRUC_ACESIGNLEN) - && (FilePos = BASE_DIRDATA_Dir1.ArchiveBegin + I -- - ((INT) BASE_ARCBLK.Header.Main.ACESIGN -- - (INT) &BASE_ARCBLK.Header)) -+ - ((PCHAR) BASE_ARCBLK.Header.Main.ACESIGN -+ - (PCHAR) &BASE_ARCBLK.Header)) - >= 0) - { -- Flags = ((INT) BASE_ARCBLK.Header.Main.ACESIGN - (INT) &BASE_ARCBLK.Header); -- Flags = ((INT) &BASE_ARCBLK.Header.Main.ACESIGN - (INT) &BASE_ARCBLK.Header); -+ Flags = ((PCHAR) BASE_ARCBLK.Header.Main.ACESIGN - (PCHAR) &BASE_ARCBLK.Header); -+ Flags = ((PCHAR) &BASE_ARCBLK.Header.Main.ACESIGN - (PCHAR) &BASE_ARCBLK.Header); - - BASE_DOSFUNCS_LSeek(BASE_ARCHIVES_TEST.ArchiveHandle, FilePos, SEEK_SET); - read(BASE_ARCHIVES_TEST.ArchiveHandle, (PCHAR) &BASE_ARCBLK.Header, 4); ---- unace-nonfree-2.5.orig/source/base/all/filelist/filelist.c -+++ unace-nonfree-2.5/source/base/all/filelist/filelist.c -@@ -314,6 +314,7 @@ INT BASE_FILELIST_Create(BOOL DoAddD - BOOL DoOutputNoFilesError) - { - PVOID SavedScreenPtr; -+ULONG PosIndex, LastIndex; - - BASE_MSGOUT_EXTERN_ListCreateBegin(&SavedScreenPtr); - -@@ -344,14 +345,14 @@ PVOID SavedScreenPtr; - BASE_FILELIST.Number - * sizeof(tBASE_FILELIST_FileData)); - -- BASE_FILELIST.Pos -= (ULONG) BASE_FILELIST.List; -- BASE_FILELIST.Last -= (ULONG) BASE_FILELIST.List; -- -+ PosIndex = BASE_FILELIST.Pos - BASE_FILELIST.List; -+ LastIndex = BASE_FILELIST.Last - BASE_FILELIST.List; -+ - BASE_FILELIST.List = (PCHAR) BASE_MEMORY_ReAlloc(BASE_FILELIST.List, -- (ULONG) BASE_FILELIST.Last); -+ LastIndex); - -- BASE_FILELIST.Pos += (ULONG) BASE_FILELIST.List; -- BASE_FILELIST.Last += (ULONG) BASE_FILELIST.List; -+ BASE_FILELIST.Pos = BASE_FILELIST.List + PosIndex; -+ BASE_FILELIST.Last = BASE_FILELIST.List + LastIndex; - - BASE_MEMORY_Optimize(); - ---- unace-nonfree-2.5.orig/source/base/all/lfn/nont.c -+++ unace-nonfree-2.5/source/base/all/lfn/nont.c -@@ -131,7 +131,7 @@ CHAR NumberStr[8]; - CharPos1 = &Name[strlen(Name)]; - } - -- Len = (UINT) CharPos1 - (UINT) Name; -+ Len = (PCHAR) CharPos1 - (PCHAR) Name; - - for (I = 0; I < Len; I++) - { ---- unace-nonfree-2.5.orig/source/base/all/memory/memory.c -+++ unace-nonfree-2.5/source/base/all/memory/memory.c -@@ -238,8 +238,8 @@ INT I, J; - - BASE_MEMORY_EXTERN_OptimizeOtherMemory(); - -- I = (INT) BASE_FILELIST.Last - (INT) BASE_FILELIST.List; -- J = (INT) BASE_FILELIST.Pos - (INT) BASE_FILELIST.List; -+ I = BASE_FILELIST.Last - BASE_FILELIST.List; -+ J = BASE_FILELIST.Pos - BASE_FILELIST.List; - BASE_FILELIST.List = (PCHAR)BASE_MEMORY_ReAllocSameSize(BASE_FILELIST.List); - BASE_FILELIST.Last = BASE_FILELIST.List + I; - BASE_FILELIST.Pos = BASE_FILELIST.List + J; ---- unace-nonfree-2.5.orig/source/base/all/pathfunc/pathfunc.c -+++ unace-nonfree-2.5/source/base/all/pathfunc/pathfunc.c -@@ -195,18 +195,18 @@ INT SourceIndex, - - if (WildcardPos < PointPos && WildcardPos) - { -- SourceIndex = (LONG) WildcardPos - (LONG) SourceStr; -+ SourceIndex = WildcardPos - SourceStr; - } - else - { - if (PointPos) - { -- SourceIndex = (LONG) PointPos - (LONG) SourceStr; -+ SourceIndex = PointPos - SourceStr; - } - else - { - SourceIndex = WildcardPos ? -- (LONG) WildcardPos - (LONG) SourceStr : -+ WildcardPos - SourceStr : - strlen(SourceStr); - } - } -@@ -227,7 +227,7 @@ INT SourceIndex, - - if (PointPos) - { -- SourceIndex = (INT) PointPos - (INT) SourceStr + 1; -+ SourceIndex = PointPos - SourceStr + 1; - CharsToCopy = 0; - - while (SourceStr[SourceIndex] && SourceStr[SourceIndex] != '*') -@@ -276,7 +276,7 @@ INT Result; - return 0; - } - -- Result = (UINT) SlashPos - (UINT) Path + 1; -+ Result = SlashPos - Path + 1; - } - else - { -@@ -323,7 +323,7 @@ PCHAR SlashPos; - } - - *SlashPos = 0; -- SlashPos = SlashPos - (UINT) Dir + (UINT) FileName; -+ SlashPos = SlashPos - Dir + FileName; - - if (*SlashPos == BASE_PATHFUNC_SEPARATOR) - { diff --git a/source/apps-extra/unace/07-fix-free-aliasing-issue.patch b/source/apps-extra/unace/07-fix-free-aliasing-issue.patch deleted file mode 100644 index 4cf5211..0000000 --- a/source/apps-extra/unace/07-fix-free-aliasing-issue.patch +++ /dev/null @@ -1,174 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: This patch redefines how BASE_MEMORY_FreeCheck works, and avoids - tons of "may break strict aliasing rules" warnings. It also removes - casts on invocation. - ---- unace-nonfree-2.5.orig/source/apps/exe/messages/messages.c -+++ unace-nonfree-2.5/source/apps/exe/messages/messages.c -@@ -107,7 +107,7 @@ ULONG Bits; - - APPS_EXE_MESSAGES_Skip(Start - 22); - -- BASE_MEMORY_FreeCheck((PVOID *) &APPS_EXE_MESSAGES.MessagesBuf); -+ BASE_MEMORY_FreeCheck(APPS_EXE_MESSAGES.MessagesBuf); - - if (!(APPS_EXE_MESSAGES.MessagesBuf = - (PCHAR) BASE_MEMORY_GetMem(*Size + 1))) ---- unace-nonfree-2.5.orig/source/base/all/archives/read/read.c -+++ unace-nonfree-2.5/source/base/all/archives/read/read.c -@@ -22,8 +22,8 @@ - - void BASE_ARCHIVES_READ_FreeArchiveList(void) - { -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_ARCHIVES_READ.FileData); -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_ARCHIVES_READ.FileNames); -+ BASE_MEMORY_FreeCheck(BASE_ARCHIVES_READ.FileData); -+ BASE_MEMORY_FreeCheck(BASE_ARCHIVES_READ.FileNames); - } - - /*-----------------BASE_ARCHIVES_READ_GetArchiveList---------------------*/ ---- unace-nonfree-2.5.orig/source/base/all/bufread/bufread.c -+++ unace-nonfree-2.5/source/base/all/bufread/bufread.c -@@ -134,7 +134,7 @@ void BASE_BUFREAD_Close(void) - { - close(BASE_BUFREAD.Handle); - BASE_BUFREAD.Handle = -1; -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_BUFREAD.Buf); -+ BASE_MEMORY_FreeCheck(BASE_BUFREAD.Buf); - } - - /*-----------------BASE_BUFREAD_Tell-------------------------------------*/ ---- unace-nonfree-2.5.orig/source/base/all/dcpr/comments/comments.c -+++ unace-nonfree-2.5/source/base/all/dcpr/comments/comments.c -@@ -45,7 +45,7 @@ void BASE_DCPR_COMMENTS_Done(void) - { - if (BASE_DCPR.DoFreeReadBuf) - { -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_DCPR.ReadBuf); -+ BASE_MEMORY_FreeCheck(BASE_DCPR.ReadBuf); - } - } - ---- unace-nonfree-2.5.orig/source/base/all/dcpr/dcpr.c -+++ unace-nonfree-2.5/source/base/all/dcpr/dcpr.c -@@ -301,8 +301,8 @@ void BASE_DCPR_Done(void) - { - if (BASE_DCPR.IsInitialized) - { -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_DCPR.ReadBuf); -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_DCPR_LZ77.Dictionary); -+ BASE_MEMORY_FreeCheck(BASE_DCPR.ReadBuf); -+ BASE_MEMORY_FreeCheck(BASE_DCPR_LZ77.Dictionary); - BASE_DCPR.IsInitialized = 0; - BASE_MEMORY_Optimize(); - } ---- unace-nonfree-2.5.orig/source/base/all/dcpr/pic/pic.c -+++ unace-nonfree-2.5/source/base/all/dcpr/pic/pic.c -@@ -137,7 +137,7 @@ void BASE_DCPR_PIC_Done(void) - BASE_DCPR_PIC.Data[0] -= BASE_DCPR_PIC.Planes; - BASE_DCPR_PIC.Data[1] -= BASE_DCPR_PIC.Planes; - -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_DCPR_PIC.Data[0]); -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_DCPR_PIC.Data[1]); -+ BASE_MEMORY_FreeCheck(BASE_DCPR_PIC.Data[0]); -+ BASE_MEMORY_FreeCheck(BASE_DCPR_PIC.Data[1]); - } - } ---- unace-nonfree-2.5.orig/source/base/all/extract/extract.c -+++ unace-nonfree-2.5/source/base/all/extract/extract.c -@@ -232,10 +232,10 @@ UINT NTFSSecuritySize; - { - BASE_LFN_SetFileAttributes(BASE_STATE.DestinationFileName, Attr); - BASE_DOSFUNCS_SetFileSecurity(BASE_STATE.DestinationFileName, NTFSSecurity); -- BASE_MEMORY_FreeCheck((PVOID)&NTFSSecurity); -+ BASE_MEMORY_FreeCheck(NTFSSecurity); - } - -- BASE_MEMORY_FreeCheck((PVOID *) &Buf); -+ BASE_MEMORY_FreeCheck(Buf); - - return; - ---- unace-nonfree-2.5.orig/source/base/all/filelist/filelist.c -+++ unace-nonfree-2.5/source/base/all/filelist/filelist.c -@@ -290,7 +290,7 @@ INT BufSize; - if (!(BASE_FILELIST.ListFileData = - (pBASE_FILELIST_FileData) BASE_MEMORY_GetMemBase2(&BufSize, 1))) - { -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_FILELIST.List); -+ BASE_MEMORY_FreeCheck(BASE_FILELIST.List); - - return; - } -@@ -303,8 +303,8 @@ INT BufSize; - - void BASE_FILELIST_Done(void) - { -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_FILELIST.List); -- BASE_MEMORY_FreeCheck((PVOID *) &BASE_FILELIST.ListFileData); -+ BASE_MEMORY_FreeCheck(BASE_FILELIST.List); -+ BASE_MEMORY_FreeCheck(BASE_FILELIST.ListFileData); - BASE_MEMORY_Optimize(); - } - ---- unace-nonfree-2.5.orig/source/base/all/lfn/lin.c -+++ unace-nonfree-2.5/source/base/all/lfn/lin.c -@@ -67,7 +67,7 @@ tLFN SearchFile, - } - } - -- BASE_MEMORY_FreeCheck((PVOID*)&Env); -+ BASE_MEMORY_FreeCheck(Env); - } - } - ---- unace-nonfree-2.5.orig/source/base/all/memory/memory.c -+++ unace-nonfree-2.5/source/base/all/memory/memory.c -@@ -150,13 +150,12 @@ INT MemSize; - - /*-----------------BASE_MEMORY_FreeCheck---------------------------------*/ - --void BASE_MEMORY_FreeCheck(PVOID *Pointer) -+void BASE_MEMORY_FreeCheck_(PVOID Pointer) - { -- if (*Pointer) -+ if (Pointer) - { -- BASE_MEMORY.MaxAllocate += BASE_MEMORY_Size(*Pointer); -- free((PVOID) (((PULONG) *Pointer) - 1)); -- *Pointer = NULL; -+ BASE_MEMORY.MaxAllocate += BASE_MEMORY_Size(Pointer); -+ free((PVOID) (((PULONG) Pointer) - 1)); - } - } - -@@ -183,7 +182,7 @@ INT OldSize, - } - - memcpy(NewPointer, OldPointer, OldSize); -- BASE_MEMORY_FreeCheck(&OldPointer); -+ BASE_MEMORY_FreeCheck(OldPointer); - - if (BASE_MEMORY_MemMax() < MemMaxSize) - { -@@ -193,7 +192,7 @@ INT OldSize, - } - - memcpy(OldPointer, NewPointer, OldSize); -- BASE_MEMORY_FreeCheck(&NewPointer); -+ BASE_MEMORY_FreeCheck(NewPointer); - - return OldPointer; - } ---- unace-nonfree-2.5.orig/source/base/all/memory/memory.h -+++ unace-nonfree-2.5/source/base/all/memory/memory.h -@@ -32,7 +32,8 @@ PVOID BASE_MEMORY_GetMemBase2Max(PINT - PVOID BASE_MEMORY_GetMemBase2PlusMax(PINT Size, INT Base, INT Maximum, - INT Plus); - --void BASE_MEMORY_FreeCheck(PVOID *Pointer); -+void BASE_MEMORY_FreeCheck_(PVOID Pointer); -+#define BASE_MEMORY_FreeCheck(ptr) do { BASE_MEMORY_FreeCheck_(ptr); ptr=0; } while(0) - PVOID BASE_MEMORY_ReAlloc(PVOID OldPointer, INT NewSize); - PVOID BASE_MEMORY_ReAllocSameSize(PVOID OldPointer); - void BASE_MEMORY_InitAlloc(void); diff --git a/source/apps-extra/unace/08-ulonglong-printf.patch b/source/apps-extra/unace/08-ulonglong-printf.patch deleted file mode 100644 index a2b3aa0..0000000 --- a/source/apps-extra/unace/08-ulonglong-printf.patch +++ /dev/null @@ -1,29 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: This patch fixes a portability issue about printing big numbers. - ---- unace-nonfree-2.5.orig/source/apps/exe/convert/convert.c -+++ unace-nonfree-2.5/source/apps/exe/convert/convert.c -@@ -31,7 +31,7 @@ INT StrLen, - ByteSize = (ByteSize / 1000000) * 100000000 + (ByteSize / 1000) * 10000 - + ByteSize % 1000; - -- sprintf(Str, "%lld ", ByteSize); -+ sprintf(Str, "%llu ", (unsigned long long)ByteSize); - - StrLen = strlen(Str) - 1; - Str[StrLen] = UNITCHARS[UnitCharNumber]; -@@ -117,12 +117,12 @@ INT UnitCharNumber; - - if (UnitCharNumber) - { -- sprintf(SizeStr, "%8lld ", Size); -+ sprintf(SizeStr, "%8llu ", (unsigned long long)Size); - SizeStr[strlen(SizeStr) - 1] = UNITCHARS[UnitCharNumber]; - } - else - { -- sprintf(SizeStr, "%9lld", Size); -+ sprintf(SizeStr, "%9llu", (unsigned long long)Size); - } - } - diff --git a/source/apps-extra/unace/09-utf8-filenames.patch b/source/apps-extra/unace/09-utf8-filenames.patch deleted file mode 100644 index f243a19..0000000 --- a/source/apps-extra/unace/09-utf8-filenames.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: This patch makes unace use utf8 filenames on linux instead of - Latin1. - ---- unace-nonfree-2.5.orig/source/base/all/arcblk/arcblk.c -+++ unace-nonfree-2.5/source/base/all/arcblk/arcblk.c -@@ -282,12 +282,8 @@ void BASE_ARCBLK_ConvertHeader32ToHea - #if defined(__MACOSX__) - BASE_ARCBLK.Header.File.FNAME_SIZE = BASE_UNINORM_CP850ToUTF8NFD( - BASE_ARCBLK.Header.File.FNAME, BASE_ARCBLK.Header.File.FNAME_SIZE); --#elif defined(__LINUX__) -- /* may not work for every linux user */ -- BASE_ARCBLK.Header.File.FNAME_SIZE = BASE_UNINORM_CP850ToANSI( -- BASE_ARCBLK.Header.File.FNAME, BASE_ARCBLK.Header.File.FNAME_SIZE); - #elif defined(__unix__) -- /* for every other unix assume UTF-8 NFC normalization */ -+ /* for unix, assume UTF-8 NFC normalization */ - BASE_ARCBLK.Header.File.FNAME_SIZE = BASE_UNINORM_CP850ToUTF8NFC( - BASE_ARCBLK.Header.File.FNAME, BASE_ARCBLK.Header.File.FNAME_SIZE); - #endif diff --git a/source/apps-extra/unace/10-uninorm-signedness.patch b/source/apps-extra/unace/10-uninorm-signedness.patch deleted file mode 100644 index d303f01..0000000 --- a/source/apps-extra/unace/10-uninorm-signedness.patch +++ /dev/null @@ -1,57 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: Fixes prototypes in unincore.h to match uninorm.c. - ---- unace-nonfree-2.5.orig/source/base/all/uninorm/unincore.h -+++ unace-nonfree-2.5/source/base/all/uninorm/unincore.h -@@ -3,28 +3,30 @@ - * - */ - -+typedef unsigned int uint; -+ - /* integer string functions */ --int istrlen (int * str ); --int istrcmp (int * s1, int * s2 ); -+uint istrlen (uint * str ); -+uint istrcmp (uint * s1, uint * s2 ); - - /* unicode data accessors */ --int is_excluded (int c ); --int get_combining_class (int c ); --int get_recombined_codepoint (int c1, int c2 ); --int * get_decomposition (int * buf, int c ); -+uint is_excluded (uint c ); -+uint get_combining_class (uint c ); -+int get_recombined_codepoint (uint c1, uint c2 ); -+uint * get_decomposition (uint * buf, uint c ); - - /* utf en/decoding functions */ - void encode_utf8(char *buf, unsigned *str); - void decode_utf8(unsigned *buf, char *str); - - /* (de)composition functions */ --void decompose_recursive (int * buf, int c ); --void canonical_order (int * str ); --void canonical_composition (int * str ); --void canonical_decomposition (int * buf, int * str ); -+void decompose_recursive (uint * buf, uint c ); -+void canonical_order (uint * str ); -+void canonical_composition (uint * str ); -+void canonical_decomposition (uint * buf, uint * str ); - - /* normalization functions */ --void normalize_nfd (int * buf, int * str ); --void normalize_nfc (int * buf, int * str ); -+void normalize_nfd (uint * buf, uint * str ); -+void normalize_nfc (uint * buf, uint * str ); - void normalize_nfd_utf8 (char * buf, char * str ); - void normalize_nfc_utf8 (char * buf, char * str ); ---- unace-nonfree-2.5.orig/source/base/all/uninorm/uninorm.c -+++ unace-nonfree-2.5/source/base/all/uninorm/uninorm.c -@@ -101,4 +101,4 @@ INT BASE_UNINORM_CP850ToUTF8NFD(UCHAR *u - } - } - --*/ -\ No newline at end of file -+*/ diff --git a/source/apps-extra/unace/11-possibly-critical.patch b/source/apps-extra/unace/11-possibly-critical.patch deleted file mode 100644 index 0146620..0000000 --- a/source/apps-extra/unace/11-possibly-critical.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: Fixes a possible security issue by initialising a local variable. - ---- unace-nonfree-2.5.orig/source/base/all/dcpr/comments/comments.c -+++ unace-nonfree-2.5/source/base/all/dcpr/comments/comments.c -@@ -62,6 +62,8 @@ INT CommentPos, - - if (BASE_COMMENTS.CompressedSize) - { -+ MatchPos = 0; -+ - CommentPos = 0; - memset(&Hash, 0, sizeof(Hash)); - BASE_DCPR_COMMENTS_Init(); diff --git a/source/apps-extra/unace/12-cast-filetime.patch b/source/apps-extra/unace/12-cast-filetime.patch deleted file mode 100644 index 8f0b439..0000000 --- a/source/apps-extra/unace/12-cast-filetime.patch +++ /dev/null @@ -1,96 +0,0 @@ -Author: Michael Karcher <[email protected]> -Description: Expresses access to bitfield as 32 bit variable using a union to - not violate the strict aliasing rule. The code is still inherently - non-portable. - ---- unace-nonfree-2.5.orig/source/apps/exe/acefuncs/acefuncs.c -+++ unace-nonfree-2.5/source/apps/exe/acefuncs/acefuncs.c -@@ -33,8 +33,10 @@ CHAR ShortStr[80], - OutputStr[160]; - PCHAR OutputFileName; - INT I; --tBASE_DOSFUNCS_FileTime -- FileTime; -+union { -+tBASE_DOSFUNCS_FileTime Fields; -+ULONG Raw; -+} FileTime; - - BASE_FILELIST_Init(); - BASE_FILELIST_VolumeCreate(); -@@ -79,7 +81,7 @@ tBASE_DOSFUNCS_FileTime - - APPS_EXE_CONVERT_MakeStrShorter(ShortStr, OutputFileName, 35); - -- *(PULONG) &FileTime = BASE_ARCBLK.Header.File.FTIME; -+ FileTime.Raw = BASE_ARCBLK.Header.File.FTIME; - - BASE_STATE.SummaryUnComprBytes += BASE_ARCBLK.Header.File.SIZE; - BASE_STATE.SummaryComprBytes += BASE_ARCBLK.Header.File.PSIZE; -@@ -87,8 +89,9 @@ tBASE_DOSFUNCS_FileTime - - sprintf( - OutputStr, "%2d.%2d.%2d_%2d:%2d %c%c%s %s %4d%% %c%s", -- FileTime.Day, FileTime.Month, (80 + FileTime.Year) % 100, -- FileTime.Hour, FileTime.Minute, -+ FileTime.Fields.Day, FileTime.Fields.Month, -+ (80 + FileTime.Fields.Year) % 100, -+ FileTime.Fields.Hour, FileTime.Fields.Minute, - BASE_ARCBLK.Header.File.HEAD_FLAGS & BASE_ACESTRUC_FLAG_SPLITBEFORE ? - '\x11' : ' ', - BASE_ARCBLK.Header.File.HEAD_FLAGS & BASE_ACESTRUC_FLAG_SPLITAFTER ? ---- unace-nonfree-2.5.orig/source/base/all/archives/ace/ace.c -+++ unace-nonfree-2.5/source/base/all/archives/ace/ace.c -@@ -183,13 +183,13 @@ tLFN ArchiveFileName; - break; - } - -- BASE_ARCHIVES_READ.FileData[BASE_ARCHIVES_READ.FileNumber].Size = -+ BASE_ARCHIVES_READ.FileData[BASE_ARCHIVES_READ.FileNumber].Size = - BASE_ARCBLK.Header.File.SIZE; - -- BASE_ARCHIVES_READ.FileData[BASE_ARCHIVES_READ.FileNumber].PackedSize = -+ BASE_ARCHIVES_READ.FileData[BASE_ARCHIVES_READ.FileNumber].PackedSize = - BASE_ARCBLK.Header.File.PSIZE; - -- BASE_ARCHIVES_READ.FileData[BASE_ARCHIVES_READ.FileNumber].Time = -+ BASE_ARCHIVES_READ.FileData[BASE_ARCHIVES_READ.FileNumber].Time.Fields = - BASE_DOSFUNCS_CalcFileTime(BASE_ARCBLK.Header.File.FTIME); - - Attributes |= ---- unace-nonfree-2.5.orig/source/base/all/filelist/filelist.c -+++ unace-nonfree-2.5/source/base/all/filelist/filelist.c -@@ -242,7 +242,7 @@ tBASE_LFN_DBL - { - BASE_FILELIST.ListFileData[BASE_FILELIST.Number].Size = FileSize; - -- BASE_FILELIST.ListFileData[BASE_FILELIST.Number].Time = -+ BASE_FILELIST.ListFileData[BASE_FILELIST.Number].Time.Fields = - BASE_DOSFUNCS_CalcFileTime(FileTime); - - if ((BASE_FILELIST.ListFileData[BASE_FILELIST.Number].Attr = Attr) -@@ -397,7 +397,7 @@ tLFN PureFileName; - if (BASE_PATHFUNC_WildCardCheck(ListPosition, PureFileName + AddDirLen)) - { - BASE_FILELIST_AddFile(FileName, FileData.Size, -- *(PULONG) &FileData.Time, FileData.Attr); -+ FileData.Time.Raw, FileData.Attr); - - return; - } ---- unace-nonfree-2.5.orig/source/base/all/filelist/filelist.h -+++ unace-nonfree-2.5/source/base/all/filelist/filelist.h -@@ -31,8 +31,11 @@ - - typedef struct - { -- tBASE_DOSFUNCS_FileTime -- Time; -+ union { -+ tBASE_DOSFUNCS_FileTime -+ Fields; -+ ULONG Raw; -+ } Time; - ULONGLONG - Size, - PackedSize; diff --git a/source/apps-extra/unace/13-maximum-file-name-length.patch b/source/apps-extra/unace/13-maximum-file-name-length.patch deleted file mode 100644 index d97ba30..0000000 --- a/source/apps-extra/unace/13-maximum-file-name-length.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: P Stahlman <https://launchpad.net/~pstahlman> -Description: Increase buffer to cater for maximum file name length (LP: #179684). -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/unace-nonfree/+bug/179684 -Origin: https://launchpadlibrarian.net/35753473/acefuncs.c.patch - ---- unace-nonfree-2.5.orig/source/apps/exe/acefuncs/acefuncs.c -+++ unace-nonfree-2.5/source/apps/exe/acefuncs/acefuncs.c -@@ -27,7 +27,7 @@ - - void APPS_EXE_ACEFUNCS_List(BOOL Verbose) - { --CHAR ShortStr[80], -+CHAR ShortStr[BASE_LFN_MAXLEN], - SizeStr1[80], - SizeStr2[80], - OutputStr[160]; diff --git a/source/apps-extra/unace/14-endianness-detection.patch b/source/apps-extra/unace/14-endianness-detection.patch deleted file mode 100644 index 1c806cf..0000000 --- a/source/apps-extra/unace/14-endianness-detection.patch +++ /dev/null @@ -1,31 +0,0 @@ -Author: Guy Martin <[email protected]> -Description: This patch make the check for endianness actually occur. -Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=222301 -Origin: https://bugs.gentoo.org/attachment.cgi?id=241251 - ---- a/source/base/all/all.h -+++ b/source/base/all/all.h -@@ -61,7 +61,8 @@ memmove((ptr), &__tmp, sizeof(*(ptr))); - #define put_unaligned(ptr, val) ((void)( *(ptr) = (val) )) - #endif /* __EMULATE_UNALIGNED__ */ - --#ifdef __BIG_ENDIAN__ -+#include <endian.h> -+#if __BYTE_ORDER == __BIG_ENDIAN - #define ADJUST_ENDIANNESS16(Ptr) {\ - USHORT x = get_unaligned((USHORT*) (Ptr));\ - put_unaligned((USHORT*) (Ptr), x >> 8 | x << 8);\ -@@ -78,10 +79,12 @@ memmove((ptr), &__tmp, sizeof(*(ptr))); - x2 = x2 >> 16 | x2 << 16;\ - put_unaligned(((ULONG*) (Ptr)), (x2&0xff00ff00) >> 8 | (x2&0x00ff00ff) << 8);\ - } --#else -+#elif __BYTE_ORDER == __LITTLE_ENDIAN - #define ADJUST_ENDIANNESS16(Ptr) - #define ADJUST_ENDIANNESS32(Ptr) - #define ADJUST_ENDIANNESS64(Ptr) -+#else -+#error Please define system endianness - #endif - - #endif diff --git a/source/apps-extra/unace/15-format-security.patch b/source/apps-extra/unace/15-format-security.patch deleted file mode 100644 index 2648816..0000000 --- a/source/apps-extra/unace/15-format-security.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Description: Fix format string vulnarability. - ---- unace-nonfree-2.5.orig/source/apps/exe/output/output.c -+++ unace-nonfree-2.5/source/apps/exe/output/output.c -@@ -125,7 +125,7 @@ CHAR DeleteStr[223]; - memset(&DeleteStr[74], ' ', 74); - DeleteStr[222] = 0; - -- printf(DeleteStr); -+ printf("%s", DeleteStr); - #ifndef __sun__ - fflush(stdout); - #endif diff --git a/source/apps-extra/unace/16-buffer-overflows.patch b/source/apps-extra/unace/16-buffer-overflows.patch deleted file mode 100644 index 9f78d70..0000000 --- a/source/apps-extra/unace/16-buffer-overflows.patch +++ /dev/null @@ -1,42 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Description: Fix buffer overflows when using long filenames or - passwords as arguments. Thanks, Antoine Cervoise. -Bug-Debian: https://bugs.debian.org/736929 - ---- a/source/apps/unace/exe/commline/commline.c -+++ b/source/apps/unace/exe/commline/commline.c -@@ -474,8 +474,10 @@ INT SwitchNumber, - - case APPS_UNACE_EXE_COMMLINE_SWITCH_P: - { -- strcpy(BASE_OPTIONS.ExtractOptions.CryptionData.Password, -- Switch + 1); -+ const size_t size = sizeof(BASE_OPTIONS.ExtractOptions.CryptionData.Password) - 1; -+ strncpy(BASE_OPTIONS.ExtractOptions.CryptionData.Password, -+ Switch + 1, size); -+ BASE_OPTIONS.ExtractOptions.CryptionData.Password[size] = 0; - - BASE_CRYPT.DoUseCurrentPassword = 1; - -@@ -539,8 +541,10 @@ PCHAR PointPos; - { - if (APPS_EXE_COMMLINE.ArgumentCount < APPS_EXE_COMMLINE.ArgumentsNumber) - { -- strcpy(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName, -- APPS_EXE_COMMLINE.Arguments[APPS_EXE_COMMLINE.ArgumentCount++]); -+ const size_t size = sizeof(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName) - 1; -+ strncpy(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName, -+ APPS_EXE_COMMLINE.Arguments[APPS_EXE_COMMLINE.ArgumentCount++], size); -+ APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName[size] = 0; - - BASE_PATHFUNC_ToSystemPathSeparator(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName); - -@@ -555,6 +559,8 @@ PCHAR PointPos; - && !BASE_CONVERT_StrICmp(PointPos, ".ace") - && !BASE_CONVERT_StrICmp(PointPos, ".exe"))) - { -+ if (size - strlen(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName) >= -+ strlen(BASE_ACESTRUC_EXTENSION)) - strcat(APPS_UNACE_EXE_COMMLINE.WildcardedArchiveName, - BASE_ACESTRUC_EXTENSION); - } diff --git a/source/apps-extra/unace/17-undefined-behavior-strcpy.patch b/source/apps-extra/unace/17-undefined-behavior-strcpy.patch deleted file mode 100644 index 649840a..0000000 --- a/source/apps-extra/unace/17-undefined-behavior-strcpy.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Description: Avoid undefined behaviour when strcpy(3) is - called with the same pointer as source and destination. - Thanks, Jakub Wilk. -Bug-Debian: https://bugs.debian.org/775132 - ---- a/source/base/all/lfn/lfn.c -+++ b/source/base/all/lfn/lfn.c -@@ -30,8 +30,6 @@ INT BASE_LFN_ChangeDir(PCHAR Directo - PCHAR BASE_LFN_GetCurrentDir(PCHAR Directory, size_t Size) - { - Directory = (PCHAR) getcwd(Directory, Size); -- -- strcpy(Directory, BASE_LFN_LongName(Directory)); - - return Directory; - } diff --git a/source/apps-extra/unace/18-stack-corruption.patch b/source/apps-extra/unace/18-stack-corruption.patch deleted file mode 100644 index 2677a9e..0000000 --- a/source/apps-extra/unace/18-stack-corruption.patch +++ /dev/null @@ -1,62 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Description: Fix a stack corruption while trying to verify integrity - of a fuzzed file. Thanks again, Jakub Wilk. -Bug-Debian: https://bugs.debian.org/775134 - ---- a/source/base/all/uninorm/uninorm.c -+++ b/source/base/all/uninorm/uninorm.c -@@ -36,6 +36,9 @@ INT BASE_UNINORM_CP850ToUTF8NFC(UCHAR *c - UINT Unicode[BASE_LFN_MAXLEN+1], Normalized[BASE_LFN_MAXLEN+1], *destptr = Unicode; - UCHAR *srcptr = cp850String, *resultstr = cp850String; - -+ if ((UINT) len >= BASE_LFN_MAXLEN) -+ len = BASE_LFN_MAXLEN - 1; -+ - srcptr[len] = 0; - /* First, convert that DOS CP850 encoded String to Unicode */ - while (*srcptr) -@@ -48,6 +51,7 @@ INT BASE_UNINORM_CP850ToUTF8NFC(UCHAR *c - /* Then normalize and return UTF-8 encoded in place of the input string */ - normalize_nfc(Normalized, Unicode); - encode_utf8(resultstr, Normalized); -+ resultstr[len] = 0; - - - return strlen(resultstr); ---- a/source/base/all/uninorm/unincore.c -+++ b/source/base/all/uninorm/unincore.c -@@ -17,6 +17,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include "base/all/includes.h" /* BASE_LFN_MAXLEN */ - #include "unidata.h" - - /* Hangul constants */ -@@ -33,7 +34,7 @@ - - /* convenience null */ - #define null 0 --#define MAX_FILENAME_SIZE 2048 -+#define MAX_FILENAME_SIZE BASE_LFN_MAXLEN - - - /** -@@ -367,7 +368,7 @@ void canonical_decomposition(uint *buf, - uint temp[MAX_FILENAME_SIZE]; - temp[0] = null; - -- for (i = 0; i < length; ++i) -+ for (i = 0; i < length && pos < MAX_FILENAME_SIZE; ++i) - { - decompose_recursive(temp, str[i]); - len = istrlen(temp); -@@ -458,7 +459,7 @@ void encode_utf8(char *buf, uint *str) - int i, j = 0; - int len = istrlen(str); - -- for (i = 0; i < len; ++i) -+ for (i = 0; i < len && j < MAX_FILENAME_SIZE; ++i) - { - uint c = str[i]; - diff --git a/source/apps-extra/unace/19-max-allocate.patch b/source/apps-extra/unace/19-max-allocate.patch deleted file mode 100644 index 5e74b82..0000000 --- a/source/apps-extra/unace/19-max-allocate.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Fabian Greffrath <[email protected]> -Description: Allocate a whole 16 MB at once instead of iterating in - 128 kB steps. Thanks again, Jakub Wilk. -Bug-Debian: https://bugs.debian.org/775508 - ---- a/source/base/all/memory/lin.c -+++ b/source/base/all/memory/lin.c -@@ -22,6 +22,7 @@ struct rusage ru; - - Buf = NULL; - -+#if 0 - while (Size < BASE_MEMORY_EXTERN_MaxMemoryRequirement() - && (NewBuf = (char*) realloc(Buf, Size + STEP))) - { -@@ -48,6 +49,8 @@ struct rusage ru; - - free(Buf); - BASE_MEMORY.MaxAllocate = Size; -+#endif -+ BASE_MEMORY.MaxAllocate = BASE_MEMORY_EXTERN_MaxMemoryRequirement(); - - BASE_MEMORY_InitAlloc(); - } diff --git a/source/apps-extra/unace/FrugalBuild b/source/apps-extra/unace/FrugalBuild deleted file mode 100644 index 98d142f..0000000 --- a/source/apps-extra/unace/FrugalBuild +++ /dev/null @@ -1,67 +0,0 @@ -# Compiling Time: 20.50 SBU -# Maintainer: DeX77 <[email protected]> - -pkgname=unace -pkgver=2.5 -pkgrel=3 -pkgdesc="An extraction tool for the proprietary ace archive format" -archs=('i686' 'x86_64') -groups=('apps-extra') -url="http://www.winace.de/"; -license=("custom") -depends=(ncurses) -source=(http://ftp.debian.org/debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz \ - 01-only-unace.patch \ - 02-no-io_h.patch \ - 03-gcc-call.patch \ - 04-64bit.patch \ - 05-warning-fixes.patch \ - 06-fix-bad-pointer-arith.patch \ - 07-fix-free-aliasing-issue.patch \ - 08-ulonglong-printf.patch \ - 09-utf8-filenames.patch \ - 10-uninorm-signedness.patch \ - 11-possibly-critical.patch \ - 12-cast-filetime.patch \ - 13-maximum-file-name-length.patch \ - 14-endianness-detection.patch \ - 15-format-security.patch \ - 16-buffer-overflows.patch \ - 17-undefined-behavior-strcpy.patch \ - 18-stack-corruption.patch \ - 19-max-allocate.patch ) - -sha1sums=('f658f03aa6f663c1a90af85e3e8c6e7ef12adb42' \ - 'c74674f02b66b89b6fede739d511f36d98472787' \ - '1117ed498bed5144b34706a4f5c04b3ddd31156c' \ - 'ff3edcfecef4a4d50e58f10d67d0c8c5752c9fa0' \ - 'e8541dcc223d578b2753e18e87471315ddf57e24' \ - 'e1724d46284b20b49360ae9c95291a90cce19043' \ - 'a14afe829d44f38df3e03eacb78f39130cec311b' \ - '2c64f92e342a4e13a642025b71d44976b36643af' \ - '8bfa22cfbff96d39a9f97d095bf23afdbcc05608' \ - '807cb90abcbde81b0e85379048b12ad9010aff64' \ - '247a467acc04ff5ddc6ef452f0e881b0766fa8fd' \ - 'b07c78c2a4995710a16ffdcd43a840a2b6e406e3' \ - '938853d85ae58d6061c05edd92371fb5572960b9' \ - '31b4fadc9ea0e94f9b820d1ed9a5c4e4a08aa1f9' \ - '7adf612ec10d4dbed024e76b3df0d0c32da7e3ec' \ - '37c10f807a933eddb081fbaa4859f6ad782bf457' \ - '6b59e5164cc75b8ed53aeb16b1d275a14164a317' \ - 'f0cf7e33e46b568f4646a4e1d4e20a98c64f2850' \ - '2859ab531a1195b33b1b3122e95c55ae23a1568d' \ - 'f8baf12be3a71fb6aa1f3e707c5ab636a8821b1a') - - -up2date="lynx -dump ${url}popdl.html | egrep -o 'r Linux ([[:digit:].]+)' | \ - egrep -o '([[:digit:].]+)'" - -build(){ - Fcd - Fpatchall - Fmake - Finstall 755 $_F_cd_path/unace usr/bin/unace - Finstall 644 $_F_cd_path/licence usr/share/$pkgname/licence -} - -# optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
