From faa636bbf3d7d77a38d563c6d2436e3056b1bbab Mon Sep 17 00:00:00 2001 From: Vale Date: Thu, 31 Dec 2015 16:35:50 -0500 Subject: [PATCH 1/5] Add recipe for gnurobbo 0.66 --- games-puzzle/gnurobbo/gnurobbo-0.66.recipe | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 games-puzzle/gnurobbo/gnurobbo-0.66.recipe diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.recipe b/games-puzzle/gnurobbo/gnurobbo-0.66.recipe new file mode 100644 index 000000000..20db43325 --- /dev/null +++ b/games-puzzle/gnurobbo/gnurobbo-0.66.recipe @@ -0,0 +1,50 @@ +SUMMARY="GNU Robbo: Classic Atari Puzzle Game" +DESCRIPTION="An open source reimplementation \ +of Janusz Pelc's Robbo for the Atari XE/XL which was distributed \ +by LK Avalon in 1989. In this retro game, you can collect and reach the \ +UFO-like object." +HOMEPAGE="http://gnurobbo.sourceforge.net/" +COPYRIGHT="2002-2010 The GNU Robbo Team" +LICENSE="GNU LGPL v2.1" +REVISION="1" +CHECKSUM_SHA256="54d2418f49e52b8f49631eb93af7789074b628d308a6d26b00cc795ad0b04d89" +SOURCE_URI="http://downloads.sourceforge.net/gnurobbo/gnurobbo-$portVersion-source.tar.gz" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + gnurobbo = $portVersion + app:gnurobbo = $portVersion + " +REQUIRES=" + haiku + lib:libsdl + lib:libsdl_mixer + lib:libsdl_image + lib:libsdl_ttf + " + +BUILD_REQUIRES=" + haiku_devel + devel:libsdl + devel:libsdl_mixer + devel:libsdl_image + devel:libsdl_ttf + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + " + +BUILD() +{ + make $jobArgs PACKAGE_DATA_DIR=$appsDir/gnurobbo/data +} + +INSTALL() +{ + mkdir -p $appsDir/gnurobbo + cp gnurobbo $appsDir/gnurobbo + cp -r data $appsDir/gnurobbo + addAppDeskbarSymlink $appsDir/gnurobbo/gnurobbo GnuRobbo +} From 4b1ecfe19774d29c249100b164c1c934f91555f4 Mon Sep 17 00:00:00 2001 From: Vale Date: Sat, 2 Jan 2016 15:00:23 -0500 Subject: [PATCH 2/5] Added transplus recipe --- .../transplus/patches/transplus-0.6.patchset | 379 ++++++++++++++++++ haiku-apps/transplus/transplus-0.6.recipe | 48 +++ 2 files changed, 427 insertions(+) create mode 100644 haiku-apps/transplus/patches/transplus-0.6.patchset create mode 100644 haiku-apps/transplus/transplus-0.6.recipe diff --git a/haiku-apps/transplus/patches/transplus-0.6.patchset b/haiku-apps/transplus/patches/transplus-0.6.patchset new file mode 100644 index 000000000..24b9d045b --- /dev/null +++ b/haiku-apps/transplus/patches/transplus-0.6.patchset @@ -0,0 +1,379 @@ +From 2a15e7e3e10adb2f919d6e3617beb6ba4a8425a4 Mon Sep 17 00:00:00 2001 +From: DarkmatterVale +Date: Sat, 2 Jan 2016 16:42:32 +0000 +Subject: make gcc2 happy + + +diff --git a/src/HTML/TransWP.h b/src/HTML/TransWP.h +index 6dc4780..7e6d035 100644 +--- a/src/HTML/TransWP.h ++++ b/src/HTML/TransWP.h +@@ -2,6 +2,8 @@ + + #define _TRANS_WP_H + ++#include ++ + enum { //-------------Common text attributes, use in WP_Attr::attr_type----------- + font = 'FONT', + color = 'COLR', +@@ -37,14 +39,14 @@ class TranslatorWP : public BArchivable { //----------Type Code is 'TRWP'------- + WP_Attr *getAttr(int32 *begin, int32 end, int32 index = 0); //-----do NOT deallocate or modify---- + //-----------Embedded Data-------------------------------------------------- + void AddEmbedded(uint32 data_type /*--See Translator Groups--*/,int32 offset,const void *data,size_t size); +- ++ + status_t GetEmbedded(uint32 *data_type /*--See Translator Groups--*/,int32 offset,const void **data,size_t *size, int32 index = 0); + status_t GetEmbedded(uint32 data_type /*--See Translator Groups--*/,int32 offset,const void **data,size_t *size, int32 index = 0); + //-------Pictures------- + void AddPicture(int32 offset,BPicture *picture); //----Vector------- + void AddPicture(int32 offset,BBitmap *bitmap); + void AddPicture(int32 offset,const void *translatorBitmap,size_t size); +- ++ + BPicture *GetPicture(int32 offset, int32 index = 0); //----Vector------- + BBitmap *GetBitmap(int32 offset,int32 index = 0); + //-------Text----------- +@@ -61,7 +63,7 @@ class TranslatorWP : public BArchivable { //----------Type Code is 'TRWP'------- + //----------Gloabal Attributes---------------------------------------------- + void pushGlobal(uint32 type,const char *name,const void *data,size_t size); + void pushGlobal(const char *data,const char *name); +- ++ + const void *getGlobal(int32 index,uint32 type,size_t *size,char **name); + const char *getGlobal(int32 index,char **name); + const void *getGlobal(const char *name,uint32 type,size_t *size,int32 index = 0); +@@ -78,4 +80,4 @@ class TranslatorWP : public BArchivable { //----------Type Code is 'TRWP'------- + attr_list *begin_attrs, *end_attrs; + }; + +-#endif +\ No newline at end of file ++#endif +diff --git a/src/HTML/main.cp b/src/HTML/main.cp +index 5393abe..fbe2ba6 100644 +--- a/src/HTML/main.cp ++++ b/src/HTML/main.cp +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +@@ -13,7 +14,7 @@ + + extern "C" _EXPORT status_t Identify(BPositionIO *inSource,const translation_format *inFormat, + BMessage *ioExtension,translator_info *outInfo, uint32 outType); +- ++ + extern "C" _EXPORT status_t Translate(BPositionIO *inSource,const translator_info *inInfo, + BMessage *ioExtension,uint32 outType,BPositionIO *outDestination); + +@@ -393,7 +394,7 @@ void pushAttrFromTag(TranslatorWP *work,BString tag /*No brackets*/,int32 begin, + } else { + sscanf(working.String(),"%f",&final_size); + final_size += baseTextSize; +- } ++ } + work->pushAttr(begin,end,size,&final_size,sizeof(float)); + } + if (tag.IFindFirst("COLOR=") != B_ERROR) { +@@ -482,4 +483,4 @@ const char *pullFlag(BString tag, const char *flagName) { + tag.Remove(0,where_are_we); + string.SetTo(tag); + return string.String(); +-} +\ No newline at end of file ++} +diff --git a/src/make2 b/src/make2 +index 17259b9..b760c07 100644 +--- a/src/make2 ++++ b/src/make2 +@@ -1,28 +1,28 @@ +-## Haiku Generic Makefile v2.6 ## ++## Haiku Generic Makefile v2.6 ## + + ## Fill in this file to specify the project being created, and the referenced + ## Makefile-Engine will do all of the hard work for you. This handles any + ## architecture of Haiku. + + # The name of the binary. +-NAME = ++NAME = HTML + + # The type of binary, must be one of: + # APP: Application + # SHARED: Shared library or add-on + # STATIC: Static library archive + # DRIVER: Kernel driver +-TYPE = APP ++TYPE = SHARED + + # If you plan to use localization, specify the application's MIME signature. +-APP_MIME_SIG = ++APP_MIME_SIG = + + # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are + # so that Pe and Eddie can fill them in for you. + #%{ +-# @src->@ ++# @src->@ + +-# Specify the source files to use. Full paths or paths relative to the ++# Specify the source files to use. Full paths or paths relative to the + # Makefile can be included. All files, regardless of directory, will have + # their object files created in the common object directory. Note that this + # means this Makefile will not work correctly if two source files with the +@@ -32,14 +32,14 @@ SRCS = HTML/main.cp + + # Specify the resource definition files to use. Full or relative paths can be + # used. +-RDEFS = ++RDEFS = + + # Specify the resource files to use. Full or relative paths can be used. + # Both RDEFS and RSRCS can be utilized in the same Makefile. +-RSRCS = ++RSRCS = + + # End Pe/Eddie support. +-# @<-src@ ++# @<-src@ + #%} + + # Specify libraries to link against. +@@ -54,65 +54,65 @@ RSRCS = + # - if your library does not follow the standard library naming scheme, + # you need to specify the path to the library and it's name. + # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") +-LIBS = ++LIBS = + + # Specify additional paths to directories following the standard libXXX.so + # or libXXX.a naming scheme. You can specify full paths or paths relative + # to the Makefile. The paths included are not parsed recursively, so + # include all of the paths where libraries must be found. Directories where + # source files were specified are automatically included. +-LIBPATHS = ++LIBPATHS = + + # Additional paths to look for system headers. These use the form + # "#include
". Directories that contain the files in SRCS are + # NOT auto-included here. +-SYSTEM_INCLUDE_PATHS = ++SYSTEM_INCLUDE_PATHS = + + # Additional paths paths to look for local headers. These use the form + # #include "header". Directories that contain the files in SRCS are + # automatically included. +-LOCAL_INCLUDE_PATHS = ++LOCAL_INCLUDE_PATHS = + + # Specify the level of optimization that you want. Specify either NONE (O0), + # SOME (O1), FULL (O2), or leave blank (for the default optimization level). +-OPTIMIZE := ++OPTIMIZE := + + # Specify the codes for languages you are going to support in this + # application. The default "en" one must be provided too. "make catkeys" + # will recreate only the "locales/en.catkeys" file. Use it as a template + # for creating catkeys for other languages. All localization files must be + # placed in the "locales" subdirectory. +-LOCALES = ++LOCALES = + + # Specify all the preprocessor symbols to be defined. The symbols will not + # have their values set automatically; you must supply the value (if any) to + # use. For example, setting DEFINES to "DEBUG=1" will cause the compiler + # option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass + # "-DDEBUG" on the compiler's command line. +-DEFINES = ++DEFINES = + + # Specify the warning level. Either NONE (suppress all warnings), + # ALL (enable all warnings), or leave blank (enable default warnings). +-WARNINGS = ++WARNINGS = + + # With image symbols, stack crawls in the debugger are meaningful. + # If set to "TRUE", symbols will be created. +-SYMBOLS := ++SYMBOLS := + + # Includes debug information, which allows the binary to be debugged easily. + # If set to "TRUE", debug info will be created. +-DEBUGGER := ++DEBUGGER := + + # Specify any additional compiler flags to be used. +-COMPILER_FLAGS = ++COMPILER_FLAGS = + + # Specify any additional linker flags to be used. +-LINKER_FLAGS = ++LINKER_FLAGS = + + # Specify the version of this binary. Example: + # -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL" + # This may also be specified in a resource. +-APP_VERSION := ++APP_VERSION := + + # (Only used when "TYPE" is "DRIVER"). Specify the desired driver install + # location in the /dev hierarchy. Example: +@@ -120,7 +120,7 @@ APP_VERSION := + # will instruct the "driverinstall" rule to place a symlink to your driver's + # binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will + # appear at /dev/video/usb when loaded. The default is "misc". +-DRIVER_PATH = ++DRIVER_PATH = + + ## Include the Makefile-Engine + DEVEL_DIRECTORY := \ +diff --git a/src/make3 b/src/make3 +index ea5b13b..b120fcb 100644 +--- a/src/make3 ++++ b/src/make3 +@@ -1,28 +1,28 @@ +-## Haiku Generic Makefile v2.6 ## ++## Haiku Generic Makefile v2.6 ## + + ## Fill in this file to specify the project being created, and the referenced + ## Makefile-Engine will do all of the hard work for you. This handles any + ## architecture of Haiku. + + # The name of the binary. +-NAME = ++NAME = + + # The type of binary, must be one of: + # APP: Application + # SHARED: Shared library or add-on + # STATIC: Static library archive + # DRIVER: Kernel driver +-TYPE = APP ++TYPE = SHARED + + # If you plan to use localization, specify the application's MIME signature. +-APP_MIME_SIG = ++APP_MIME_SIG = + + # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are + # so that Pe and Eddie can fill them in for you. + #%{ +-# @src->@ ++# @src->@ + +-# Specify the source files to use. Full paths or paths relative to the ++# Specify the source files to use. Full paths or paths relative to the + # Makefile can be included. All files, regardless of directory, will have + # their object files created in the common object directory. Note that this + # means this Makefile will not work correctly if two source files with the +@@ -32,14 +32,14 @@ SRCS = PlainText/main.cp + + # Specify the resource definition files to use. Full or relative paths can be + # used. +-RDEFS = ++RDEFS = + + # Specify the resource files to use. Full or relative paths can be used. + # Both RDEFS and RSRCS can be utilized in the same Makefile. +-RSRCS = ++RSRCS = + + # End Pe/Eddie support. +-# @<-src@ ++# @<-src@ + #%} + + # Specify libraries to link against. +@@ -54,65 +54,65 @@ RSRCS = + # - if your library does not follow the standard library naming scheme, + # you need to specify the path to the library and it's name. + # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") +-LIBS = ++LIBS = + + # Specify additional paths to directories following the standard libXXX.so + # or libXXX.a naming scheme. You can specify full paths or paths relative + # to the Makefile. The paths included are not parsed recursively, so + # include all of the paths where libraries must be found. Directories where + # source files were specified are automatically included. +-LIBPATHS = ++LIBPATHS = + + # Additional paths to look for system headers. These use the form + # "#include
". Directories that contain the files in SRCS are + # NOT auto-included here. +-SYSTEM_INCLUDE_PATHS = ++SYSTEM_INCLUDE_PATHS = + + # Additional paths paths to look for local headers. These use the form + # #include "header". Directories that contain the files in SRCS are + # automatically included. +-LOCAL_INCLUDE_PATHS = ++LOCAL_INCLUDE_PATHS = + + # Specify the level of optimization that you want. Specify either NONE (O0), + # SOME (O1), FULL (O2), or leave blank (for the default optimization level). +-OPTIMIZE := ++OPTIMIZE := + + # Specify the codes for languages you are going to support in this + # application. The default "en" one must be provided too. "make catkeys" + # will recreate only the "locales/en.catkeys" file. Use it as a template + # for creating catkeys for other languages. All localization files must be + # placed in the "locales" subdirectory. +-LOCALES = ++LOCALES = + + # Specify all the preprocessor symbols to be defined. The symbols will not + # have their values set automatically; you must supply the value (if any) to + # use. For example, setting DEFINES to "DEBUG=1" will cause the compiler + # option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass + # "-DDEBUG" on the compiler's command line. +-DEFINES = ++DEFINES = + + # Specify the warning level. Either NONE (suppress all warnings), + # ALL (enable all warnings), or leave blank (enable default warnings). +-WARNINGS = ++WARNINGS = + + # With image symbols, stack crawls in the debugger are meaningful. + # If set to "TRUE", symbols will be created. +-SYMBOLS := ++SYMBOLS := + + # Includes debug information, which allows the binary to be debugged easily. + # If set to "TRUE", debug info will be created. +-DEBUGGER := ++DEBUGGER := + + # Specify any additional compiler flags to be used. +-COMPILER_FLAGS = ++COMPILER_FLAGS = + + # Specify any additional linker flags to be used. +-LINKER_FLAGS = ++LINKER_FLAGS = + + # Specify the version of this binary. Example: + # -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL" + # This may also be specified in a resource. +-APP_VERSION := ++APP_VERSION := + + # (Only used when "TYPE" is "DRIVER"). Specify the desired driver install + # location in the /dev hierarchy. Example: +@@ -120,7 +120,7 @@ APP_VERSION := + # will instruct the "driverinstall" rule to place a symlink to your driver's + # binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will + # appear at /dev/video/usb when loaded. The default is "misc". +-DRIVER_PATH = ++DRIVER_PATH = + + ## Include the Makefile-Engine + DEVEL_DIRECTORY := \ +-- +2.2.2 + diff --git a/haiku-apps/transplus/transplus-0.6.recipe b/haiku-apps/transplus/transplus-0.6.recipe new file mode 100644 index 000000000..ad1643053 --- /dev/null +++ b/haiku-apps/transplus/transplus-0.6.recipe @@ -0,0 +1,48 @@ +SUMMARY="Extension to the data-stream translation kit" +DESCRIPTION="Translator Plus is an extension to the data-stream \ +translation kit that is aimed at document file-types. For now, only HTML \ +and plain text are supported." +HOMEPAGE="http://github.com/HaikuArchives/TransPlus" +COPYRIGHT="2000 Nathan Whitehorn" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/HaikuArchives/TransPlus/archive/e860d8e65d43fa0f7c5e095725e78ee5e104c0a4.tar.gz" +CHECKSUM_SHA256="d60788f8cdc2644f5ef2e099948903219643e75d6732119c6a6f38a238053d67" +SOURCE_DIR="TransPlus-e860d8e65d43fa0f7c5e095725e78ee5e104c0a4" +PATCHES="transplus-$portVersion.patchset" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + transplus = $portVersion + lib:Transplus = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + " + +BUILD() +{ + cd src + make OBJ_DIR=objects + make OBJ_DIR=objects -f make2 + make OBJ_DIR=objects -f make3 +} + +INSTALL() +{ + mkdir -p $addOnsDir/Translators + mkdir -p $libDir + + cp -r $sourceDir/src/objects/libtransplus $libDir + cp -r $sourceDir/src/objects/HTML $addOnsDir/Translators/ +} From 8e36e4da2af63f9db40ebdcfbb5a89e6476139b5 Mon Sep 17 00:00:00 2001 From: Vale Date: Sat, 2 Jan 2016 17:06:32 -0500 Subject: [PATCH 3/5] Add drive_encryption recipe Note: It currently does not work. It needs updates which are dependent on some work done by axeld --- .../drive_encryption-1.0.recipe | 63 +++ .../drive_encryption/licenses/TrueCrypt | 487 ++++++++++++++++++ 2 files changed, 550 insertions(+) create mode 100644 haiku-apps/drive_encryption/drive_encryption-1.0.recipe create mode 100755 haiku-apps/drive_encryption/licenses/TrueCrypt diff --git a/haiku-apps/drive_encryption/drive_encryption-1.0.recipe b/haiku-apps/drive_encryption/drive_encryption-1.0.recipe new file mode 100644 index 000000000..d28865dbb --- /dev/null +++ b/haiku-apps/drive_encryption/drive_encryption-1.0.recipe @@ -0,0 +1,63 @@ +SUMMARY="A tool to encrypt devices and file images" +DESCRIPTION="DriveEncryption is a suite of programs to allow you to \ +encrypt devices and file images. The encryption is done via the AES algorithm, \ +and protected via a password. +It can also use devices created with TrueCrypt (http://www.truecrypt.org/), \ +available for Windows and Linux, as long as you've created them to use the \ +AES encryption algorithm and a RIPEMD-160 hash algorithm protected password." +HOMEPAGE="https://github.com/chirayudesai/driveencryption" +COPYRIGHT="2007-2014 pinc Software" +LICENSE=" + TrueCrypt + MIT + " +REVISION="1" +CHECKSUM_SHA256="" +SOURCE_URI="https://github.com/axeld/driveencryption/archive/993a11ceefac15d77406b697afb60b177d99bc45.tar.gz" +SOURCE_DIR="driveencryption-993a11ceefac15d77406b697afb60b177d99bc45" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + drive_encryption = $portVersion + cmd:encrypted_drive_control = $portVersion + app:DriveEncryption = $portVersion + app:Login = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + for i in lib driver bin gui login; do + pushd $i + make $jobArgs OBJ_DIR=objects + popd + done +} + +INSTALL() +{ + mkdir -p $addOnsDir/kernel/drivers/bin $addOnsDir/kernel/drivers/dev/disk + cp -a driver/objects/encrypted_drive $addOnsDir/kernel/drivers/bin + ln -fs ../../bin/encrypted_drive $addOnsDir/kernel/drivers/dev/disk + + + mkdir -p $binDir + cp -a bin/objects/encrypted_drive_control $binDir + + mkdir -p $appsDir + cp -a gui/objects/DriveEncryption $appsDir + addAppDeskbarSymlink $appsDir/DriveEncryption +} diff --git a/haiku-apps/drive_encryption/licenses/TrueCrypt b/haiku-apps/drive_encryption/licenses/TrueCrypt new file mode 100755 index 000000000..7b797193f --- /dev/null +++ b/haiku-apps/drive_encryption/licenses/TrueCrypt @@ -0,0 +1,487 @@ +TrueCrypt License Version 3.1 + +Software distributed under this license is distributed on an "AS +IS" BASIS WITHOUT WARRANTIES OF ANY KIND. THE AUTHORS AND +DISTRIBUTORS OF THE SOFTWARE DISCLAIM ANY LIABILITY. ANYONE WHO +USES, COPIES, MODIFIES, OR (RE)DISTRIBUTES ANY PART OF THE +SOFTWARE IS, BY SUCH ACTION(S), ACCEPTING AND AGREEING TO BE +BOUND BY ALL TERMS AND CONDITIONS OF THIS LICENSE. IF YOU DO NOT +ACCEPT THEM, DO NOT USE, COPY, MODIFY, NOR (RE)DISTRIBUTE THE +SOFTWARE, NOR ANY PART(S) THEREOF. + + +I. Definitions + +1. "This Product" means the work (including, but not limited to, +source code, graphics, texts, and accompanying files) made +available under and governed by this version of this license +("License"), as may be indicated by, but is not limited to, +copyright notice(s) attached to or included in the work. + +2. "You" means (and "Your" refers to) an individual or a legal +entity (e.g., a non-profit organization, commercial +organization, government agency, etc.) exercising permissions +granted by this License. + +3. "Modification" means (and "modify" refers to) any alteration +of This Product, including, but not limited to, addition to or +deletion from the substance or structure of This Product, +translation into another language, repackaging, alteration or +removal of any file included with This Product, and addition of +any new files to This Product. + +4. "Your Product" means This Product modified by You, or any +work You derive from (or base on) any part of This Product. In +addition, "Your Product" means any work in which You include any +(modified or unmodified) portion of This Product. However, if +the work in which you include it is an aggregate software +distribution (such as an operating system distribution or a +cover CD-ROM of a magazine) containing multiple separate +products, then the term "Your Product" includes only those +products (in the aggregate software distribution) that use, +include, or depend on a modified or unmodified version of This +Product (and the term "Your Product" does not include the whole +aggregate software distribution). For the purposes of this +License, a product suite consisting of two or more products is +considered a single product (operating system distributions and +cover media of magazines are not considered product suites). + +5. "Distribution" means (and "distribute" refers to), regardless +of means or methods, conveyance, transfer, providing, or making +available of This/Your Product or portions thereof to third +parties (including, but not limited to, making This/Your +Product, or portions thereof, available for download to third +parties, whether or not any third party has downloaded the +product, or any portion thereof, made available for download). + + + +II. Use, Copying, and Distribution of This Product + +1. Provided that You comply with all applicable terms and +conditions of this License, You may make copies of This Product +(unmodified) and distribute copies of This Product (unmodified) +that are not included in another product forming Your Product +(except as permitted under Chapter III). Note: For terms and +conditions for copying and distribution of modified versions of +This Product, see Chapter III. + +2. Provided that You comply with all applicable terms and +conditions of this License, You may use This Product freely (see +also Chapter III) on any number of computers/systems for non- +commercial and/or commercial purposes. + + + +III. Modification, Derivation, and Inclusion in Other Products + +1. If all conditions specified in the following paragraphs in +this Chapter (III) are met (for exceptions, see Section III.2) +and if You comply with all other applicable terms and conditions +of this License, You may modify This Product (thus forming Your +Product), derive new works from This Product or portions thereof +(thus forming Your Product), include This Product or portions +thereof in another product (thus forming Your Product, unless +defined otherwise in Chapter I), and You may use (for non- +commercial and/or commercial purposes), copy, and/or distribute +Your Product. + + a. The name of Your Product (or of Your modified version of + This Product) must not contain the name TrueCrypt (for + example, the following names are not allowed: TrueCrypt, + TrueCrypt+, TrueCrypt Professional, iTrueCrypt, etc.) nor + any other names confusingly similar to the name TrueCrypt + (e.g., True-Crypt, True Crypt, TruKrypt, etc.) + + All occurrences of the name TrueCrypt that could reasonably + be considered to identify Your Product must be removed from + Your Product and from any associated materials. Logo(s) + included in (or attached to) Your Product (and in/to + associated materials) must not incorporate and must not be + confusingly similar to any of the TrueCrypt logos + (including, but not limited to, the non-textual logo + consisting primarily of a key in stylized form) or + portion(s) thereof. All graphics contained in This Product + (logos, icons, etc.) must be removed from Your Product (or + from Your modified version of This Product) and from any + associated materials. + + b. The following phrases must be removed from Your Product + and from any associated materials, except the text of this + License: "A TrueCrypt Foundation Release", "Released by + TrueCrypt Foundation", "This is a TrueCrypt Foundation + release." + + c. Your Product (and any associated materials, e.g., the + documentation, the content of the official web site of Your + Product, etc.) must not present any Internet address + containing the domain name truecrypt (or any domain name + that forwards to the domain name truecrypt) in a manner + that might suggest that it is where information about Your + Product may be obtained or where bugs found in Your Product + may be reported or where support for Your Product may be + available or otherwise attempt to indicate that the domain + name truecrypt is associated with Your Product. + + d. The complete source code of Your Product must be freely + and publicly available (for exceptions, see Section III.2) + at least until You cease to distribute Your Product. This + condition can be met in one or both of the following ways: + (i) You include the complete source code of Your Product + with every copy of Your Product that You make and distribute + and You make all such copies of Your Product available to + the general public free of charge, and/or (ii) You include + information (valid and correct at least until You cease to + distribute Your Product) about where the complete source + code of Your Product can be obtained free of charge (e.g., + an Internet address) or for a reasonable reproduction fee + with every copy of Your Product that You make and distribute + and, if there is a web site officially associated with Your + Product, You include the aforementioned information about + the source code on a freely and publicly accessible web + page to which such web site links via an easily viewable + hyperlink (at least until You cease to distribute Your + Product). + + The source code of Your Product must not be deliberately + obfuscated and it must not be in an intermediate form (e.g., + the output of a preprocessor). Source code means the + preferred form in which a programmer would usually modify + the program. + + Portions of the source code of Your Product not contained in + This Product (e.g., portions added by You in creating Your + Product, whether created by You or by third parties) must be + available under license(s) that (however, see also + Subsection III.1.e) allow(s) anyone to modify and derive new + works from the portions of the source code that are not + contained in This Product and to use, copy, and redistribute + such modifications and/or derivative works. The license(s) + must be perpetual, non-exclusive, royalty-free, no-charge, + and worldwide, and must not invalidate, weaken, restrict, + interpret, amend, modify, interfere with or otherwise affect + any part, term, provision, or clause of this License. The + text(s) of the license(s) must be included with every copy + of Your Product that You make and distribute. + + e. You must not change the license terms of This Product in + any way (adding any new terms is considered changing the + license terms even if the original terms are retained), + which means, e.g., that no part of This Product may be put + under another license. You must keep intact all the legal + notices contained in the source code files. You must include + the following items with every copy of Your Product that You + make and distribute: a clear and conspicuous notice stating + that Your Product or portion(s) thereof is/are governed by + this version of the TrueCrypt License, a verbatim copy of + this version of the TrueCrypt License (as contained herein), + a clear and conspicuous notice containing information about + where the included copy of the License can be found, and an + appropriate copyright notice. + + +2. You are not obligated to comply with Subsection III.1.d if +Your Product is not distributed (i.e., Your Product is available +only to You). + + + +IV. Disclaimer of Liability, Disclaimer of Warranty, +Indemnification + +You expressly acknowledge and agree to the following: + +1. IN NO EVENT WILL ANY (CO)AUTHOR OF THIS PRODUCT, OR ANY +APPLICABLE INTELLECTUAL-PROPERTY OWNER, OR ANY OTHER PARTY WHO +MAY COPY AND/OR (RE)DISTRIBUTE THIS PRODUCT OR PORTIONS THEREOF, +AS MAY BE PERMITTED HEREIN, BE LIABLE TO YOU OR TO ANY OTHER +PARTY FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, ANY +DIRECT, INDIRECT, GENERAL, SPECIAL, INCIDENTAL, PUNITIVE, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, CORRUPTION OR LOSS OF DATA, ANY LOSSES SUSTAINED BY YOU OR +THIRD PARTIES, A FAILURE OF THIS PRODUCT TO OPERATE WITH ANY +OTHER PRODUCT, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR +BUSINESS INTERRUPTION), WHETHER IN CONTRACT, STRICT LIABILITY, +TORT (INCLUDING, BUT NOT LIMITED TO, NEGLIGENCE) OR OTHERWISE, +ARISING OUT OF THE USE, COPYING, MODIFICATION, OR +(RE)DISTRIBUTION OF THIS PRODUCT (OR A PORTION THEREOF) OR OF +YOUR PRODUCT (OR A PORTION THEREOF), OR INABILITY TO USE THIS +PRODUCT (OR A PORTION THEREOF), EVEN IF SUCH DAMAGES (OR THE +POSSIBILITY OF SUCH DAMAGES) ARE/WERE PREDICTABLE OR KNOWN TO +ANY (CO)AUTHOR, INTELLECTUAL-PROPERTY OWNER, OR ANY OTHER PARTY. + +2. THIS PRODUCT IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY +KIND, WHETHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT +LIMITED TO, THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THE ENTIRE RISK AS TO +THE QUALITY AND PERFORMANCE OF THIS PRODUCT IS WITH YOU. SHOULD +THIS PRODUCT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR, OR CORRECTION. + +3. THIS PRODUCT MAY INCORPORATE IMPLEMENTATIONS OF CRYPTOGRAPHIC +ALGORITHMS THAT ARE REGULATED (E.G., SUBJECT TO EXPORT/IMPORT +CONTROL REGULATIONS) OR ILLEGAL IN SOME COUNTRIES. IT IS SOLELY +YOUR RESPONSIBILITY TO VERIFY THAT IT IS LEGAL TO IMPORT AND/OR +(RE)EXPORT AND/OR USE THIS PRODUCT (OR PORTIONS THEREOF) IN +COUNTRIES WHERE YOU INTEND TO USE IT AND/OR TO WHICH YOU INTEND +TO IMPORT IT AND/OR FROM WHICH YOU INTEND TO EXPORT IT, AND IT +IS SOLELY YOUR RESPONSIBILITY TO COMPLY WITH ANY APPLICABLE +REGULATIONS, RESTRICTIONS, AND LAWS. + +4. YOU SHALL INDEMNIFY, DEFEND AND HOLD ALL (CO)AUTHORS OF THIS +PRODUCT, AND APPLICABLE INTELLECTUAL-PROPERTY OWNERS, HARMLESS +FROM AND AGAINST ANY AND ALL LIABILITY, DAMAGES, LOSSES, +SETTLEMENTS, PENALTIES, FINES, COSTS, EXPENSES (INCLUDING +REASONABLE ATTORNEYS' FEES), DEMANDS, CAUSES OF ACTION, CLAIMS, +ACTIONS, PROCEEDINGS, AND SUITS, DIRECTLY RELATED TO OR ARISING +OUT OF YOUR USE, INABILITY TO USE, COPYING, (RE)DISTRIBUTION, +IMPORT AND/OR (RE)EXPORT OF THIS PRODUCT (OR PORTIONS THEREOF) +AND/OR YOUR BREACH OF ANY TERM OF THIS LICENSE. + + + +V. Trademarks + +This License does not grant permission to use trademarks +associated with (or applying to) This Product, except for fair +use as defined by applicable law and except for use expressly +permitted or required by this License. Any attempt otherwise to +use trademarks associated with (or applying to) This Product +automatically and immediately terminates Your rights under This +License and may constitute trademark infringement (which may be +prosecuted). + + + +VI. General Terms and Conditions, Miscellaneous Provisions + +1. ANYONE WHO USES AND/OR COPIES AND/OR MODIFIES AND/OR CREATES +DERIVATIVE WORKS OF AND/OR (RE)DISTRIBUTES THIS PRODUCT, OR ANY +PORTION(S) THEREOF, IS, BY SUCH ACTION(S), AGREEING TO BE BOUND +BY AND ACCEPTING ALL TERMS AND CONDITIONS OF THIS LICENSE (AND +THE RESPONSIBILITIES AND OBLIGATIONS CONTAINED IN THIS LICENSE). +IF YOU DO NOT ACCEPT (AND AGREE TO BE BOUND BY) ALL TERMS AND +CONDITIONS OF THIS LICENSE, DO NOT USE, COPY, MODIFY, CREATE +DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS PRODUCT, NOR ANY +PORTION(S) THEREOF. + +2. YOU MAY NOT USE, MODIFY, COPY, CREATE DERIVATIVE WORKS OF, +(RE)DISTRIBUTE, OR SUBLICENSE THIS PRODUCT, OR PORTION(S) +THEREOF, EXCEPT AS EXPRESSLY PROVIDED IN THIS LICENSE (EVEN IF +APPLICABLE LAW GIVES YOU MORE RIGHTS). ANY ATTEMPT (EVEN IF +PERMITTED BY APPLICABLE LAW) OTHERWISE TO USE, MODIFY, COPY, +CREATE DERIVATIVE WORKS OF, (RE)DISTRIBUTE, OR SUBLICENSE THIS +PRODUCT, OR PORTION(S) THEREOF, AUTOMATICALLY AND IMMEDIATELY +TERMINATES YOUR RIGHTS UNDER THIS LICENSE AND CAN CONSTITUTE +COPYRIGHT INFRINGEMENT (WHICH MAY BE PROSECUTED). ANY CONDITIONS +AND RESTRICTIONS CONTAINED IN THIS LICENSE ARE ALSO LIMITATIONS +ON THE SCOPE OF THIS LICENSE AND ALSO DEFINE THE SCOPE OF YOUR +RIGHTS UNDER THIS LICENSE. YOUR FAILURE TO COMPLY WITH THE TERMS +AND CONDITIONS OF THIS LICENSE OR FAILURE TO PERFORM ANY +APPLICABLE OBLIGATION IMPOSED BY THIS LICENSE AUTOMATICALLY AND +IMMEDIATELY TERMINATES YOUR RIGHTS UNDER THIS LICENSE AND CAN +CAUSE OR BE CONSIDERED COPYRIGHT INFRINGEMENT (WHICH MAY BE +PROSECUTED). NOTHING IN THIS LICENSE SHALL IMPLY OR BE CONSTRUED +AS A PROMISE, OBLIGATION, OR COVENANT NOT TO SUE FOR COPYRIGHT +OR TRADEMARK INFRINGEMENT IF YOU DO NOT COMPLY WITH THE TERMS +AND CONDITIONS OF THIS LICENSE. + +3. This License does not constitute or imply a waiver of any +intellectual property rights except as may be otherwise +expressly provided in this License. This License does not +transfer, assign, or convey any intellectual property rights +(e.g., it does not transfer ownership of copyrights or +trademarks). + +4. Subject to the terms and conditions of this License, You may +allow a third party to use Your copy of This Product (or a copy +that You make and distribute, or Your Product) provided that the +third party explicitly accepts and agrees to be bound by all +terms and conditions of this License and the third party is not +prohibited from using This Product (or portions thereof) by this +License (see, e.g., Section VI.7) or by applicable law. However, +You are not obligated to ensure that the third party accepts +(and agrees to be bound by all terms of) this License if You +distribute only the self-extracting package (containing This +Product) that does not allow the user to install (nor extract) +the files contained in the package until he or she accepts and +agrees to be bound by all terms and conditions of this License. + +5. Without specific prior written permission from the authors of +This Product (or from their common representative), You must not +use the name of This Product, the names of the authors of This +Product, or the names of the legal entities (or informal groups) +of which the authors were/are members/employees, to endorse or +promote Your Product or any work in which You include a modified +or unmodified version of This Product, or to endorse or promote +You or Your affiliates, or in a way that might suggest that Your +Product (or any work in which You include a modified or +unmodified version of This Product), You, or Your affiliates +is/are endorsed by one or more authors of This Product, or in a +way that might suggest that one or more authors of This Product +is/are affiliated with You (or Your affiliates) or directly +participated in the creation of Your Product or of any work in +which You include a modified or unmodified version of This +Product. + +6. IF YOU ARE NOT SURE WHETHER YOU UNDERSTAND ALL PARTS OF THIS +LICENSE OR IF YOU ARE NOT SURE WHETHER YOU CAN COMPLY WITH ALL +TERMS AND CONDITIONS OF THIS LICENSE, YOU MUST NOT USE, COPY, +MODIFY, CREATE DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS +PRODUCT, NOR ANY PORTION(S) OF IT. YOU SHOULD CONSULT WITH A +LAWYER. + +7. IF (IN RELEVANT CONTEXT) ANY PROVISION OF CHAPTER IV OF THIS +LICENSE IS UNENFORCEABLE, INVALID, OR PROHIBITED UNDER +APPLICABLE LAW IN YOUR JURISDICTION, YOU HAVE NO RIGHTS UNDER +THIS LICENSE AND YOU MUST NOT USE, COPY, MODIFY, CREATE +DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS PRODUCT, NOR ANY +PORTION(S) THEREOF. + +8. Except as otherwise provided in this License, if any +provision of this License, or a portion thereof, is found to be +invalid or unenforceable under applicable law, it shall not +affect the validity or enforceability of the remainder of this +License, and such invalid or unenforceable provision shall be +construed to reflect the original intent of the provision and +shall be enforced to the maximum extent permitted by applicable +law so as to effect the original intent of the provision as +closely as possible. + +____________________________________________________________ + + +Third-Party Licenses + +This Product contains components that were created by third +parties and that are governed by third-party licenses, which are +contained hereinafter (separated by lines consisting of +underscores). Each of the third-party licenses applies only to +(portions of) the source code file(s) in which the third-party +license is contained or in which it is explicitly referenced, +and to compiled or otherwise processed forms of such source +code. None of the third-party licenses applies to This Product +as a whole, even when it uses terms such as "product", +"program", or any other equivalent terms/phrases. This Product +as a whole is governed by the TrueCrypt License (see above). +Some of the third-party components have been modified by the +authors of This Product. Unless otherwise stated, such +modifications and additions are governed by the TrueCrypt +License (see above). Note: Unless otherwise stated, graphics and +files that are not part of the source code are governed by the +TrueCrypt License. + +____________________________________________________________ + +License agreement for Encryption for the Masses. + +Copyright (C) 1998-2000 Paul Le Roux. All Rights Reserved. + +This product can be copied and distributed free of charge, +including source code. + +You may modify this product and source code, and distribute such +modifications, and you may derive new works based on this +product, provided that: + +1. Any product which is simply derived from this product cannot +be called E4M, or Encryption for the Masses. + +2. If you use any of the source code in your product, and your +product is distributed with source code, you must include this +notice with those portions of this source code that you use. + +Or, + +If your product is distributed in binary form only, you must +display on any packaging, and marketing materials which +reference your product, a notice which states: + +"This product uses components written by Paul Le Roux +" + +3. If you use any of the source code originally by Eric Young, +you must in addition follow his terms and conditions. + +4. Nothing requires that you accept this License, as you have +not signed it. However, nothing else grants you permission to +modify or distribute the product or its derivative works. + +These actions are prohibited by law if you do not accept this +License. + +5. If any of these license terms is found to be to broad in +scope, and declared invalid by any court or legal process, you +agree that all other terms shall not be so affected, and shall +remain valid and enforceable. + +6. THIS PROGRAM IS DISTRIBUTED FREE OF CHARGE, THEREFORE THERE +IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. UNLESS OTHERWISE STATED THE PROGRAM IS PROVIDED +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE +ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS +WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE +COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +7. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY +MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM, INCLUDING BUT NOT LIMITED TO LOSS +OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH +ANY OTHER PROGRAMS, EVEN IF SUCH HOLDER OR OTHER PARTY HAD +PREVIOUSLY BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +____________________________________________________________ + +Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. +All rights reserved. + +LICENSE TERMS + +The free distribution and use of this software is allowed (with +or without changes) provided that: + + 1. source code distributions include the above copyright + notice, this list of conditions and the following + disclaimer; + + 2. binary distributions include the above copyright notice, + this list of conditions and the following disclaimer in + their documentation; + + 3. the name of the copyright holder is not used to endorse + products built using this software without specific written + permission. + +DISCLAIMER + +This software is provided 'as is' with no explicit or implied +warranties in respect of its properties, including, but not +limited to, correctness and/or fitness for purpose. +____________________________________________________________ + +Copyright (C) 2002-2004 Mark Adler, all rights reserved +version 1.8, 9 Jan 2004 + +This software is provided 'as-is', without any express or +implied warranty. In no event will the author be held liable +for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the + product documentation would be appreciated but is not + required. +2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source + distribution. +____________________________________________________________ From 3874c03d9002d3c7523cd0fa438e0f1bfeb67bb9 Mon Sep 17 00:00:00 2001 From: Vale Date: Sat, 2 Jan 2016 20:02:23 -0500 Subject: [PATCH 4/5] Add recipe for dovecot --- net-mail/dovecot/dovecot-2.2.15.recipe | 63 +++++++++ .../dovecot/patches/dovecot-2.2.15.patchset | 120 ++++++++++++++++++ 2 files changed, 183 insertions(+) create mode 100644 net-mail/dovecot/dovecot-2.2.15.recipe create mode 100755 net-mail/dovecot/patches/dovecot-2.2.15.patchset diff --git a/net-mail/dovecot/dovecot-2.2.15.recipe b/net-mail/dovecot/dovecot-2.2.15.recipe new file mode 100644 index 000000000..e06acf961 --- /dev/null +++ b/net-mail/dovecot/dovecot-2.2.15.recipe @@ -0,0 +1,63 @@ +SUMMARY="An open source IMAP and POP3 email server" +DESCRIPTION="Dovecot is an open source IMAP and POP3 email server \ +for Linux/UNIX-like systems, written with security primarily in mind. \ +Dovecot is an excellent choice for both small and large installations. \ +It's fast, simple to set up, requires no special administration and it \ +uses very little memory." +HOMEPAGE="http://dovecot.org/" +LICENSE="MIT" +COPYRIGHT="2002-2014 Timo Sirainen" +REVISION="1" +SOURCE_URI="http://dovecot.org/releases/2.2/dovecot-2.2.15.tar.gz" +CHECKSUM_SHA256="d10e7769e2367d635c93fd6589efdd05f2e3acf13c7911a40167faedf23c399f" +PATCHES="dovecot-2.2.15.patchset" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + dovecot$secondaryArchSuffix = $portVersion + cmd:doveadm$secondaryArchSuffix = $portVersion + cmd:doveconf$secondaryArchSuffix = $portVersion + cmd:dovecot$secondaryArchSuffix = $portVersion + cmd:dsync$secondaryArchSuffix = $portVersion + lib:libdovecot$secondaryArchSuffix = $portVersion + lib:libdovecot_storage$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libdovecot$secondaryArchSuffix + lib:libdovecot_storage$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix + devel:liblz4$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix + cmd:ld + cmd:make + cmd:find + cmd:awk + " + +GLOBAL_WRITABLE_FILES=" + settings/dovecot/README auto-merge + " +USER_SETTINGS_FILES=" + settings/dovecot directory manual + " + +BUILD() +{ + CFLAGS=-D_BSD_SOURCE runConfigure ./configure --libexecdir=$libDir/libexec + make +} + +INSTALL() +{ + make install +} diff --git a/net-mail/dovecot/patches/dovecot-2.2.15.patchset b/net-mail/dovecot/patches/dovecot-2.2.15.patchset new file mode 100755 index 000000000..33ccf151d --- /dev/null +++ b/net-mail/dovecot/patches/dovecot-2.2.15.patchset @@ -0,0 +1,120 @@ +From 20721e7e6f81a7e0a6b6f488b5ac4e4d0abaedcc Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Sat, 17 Jan 2015 19:24:43 +0200 +Subject: [PATCH] Various fixes for GCC2 + +--- + src/lib-master/master-service-ssl-settings.c | 9 ++++----- + src/lib-storage/list/mailbox-list-index-backend.c | 4 ++-- + src/lib-test/test-common.c | 2 +- + src/lib/test-data-stack.c | 2 +- + src/plugins/stats/stats-plugin.c | 2 ++ + 5 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c +index c9127c7..9d76db5 100644 +--- a/src/lib-master/master-service-ssl-settings.c ++++ b/src/lib-master/master-service-ssl-settings.c +@@ -72,6 +72,8 @@ master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED, + const char **error_r) + { + struct master_service_ssl_settings *set = _set; ++ const char **opts = t_strsplit_spaces(set->ssl_options, ", "); ++ const char *opt; + + if (strcmp(set->ssl, "no") == 0) { + /* disabled */ +@@ -96,18 +98,15 @@ master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED, + return FALSE; + } + #endif ++ + if (set->ssl_verify_client_cert && *set->ssl_ca == '\0') { + *error_r = "ssl_verify_client_cert set, but ssl_ca not"; + return FALSE; + } +- +- /* Now explode the ssl_options string into individual flags */ +- /* First set them all to defaults */ ++ + set->parsed_opts.compression = TRUE; + + /* Then modify anything specified in the string */ +- const char **opts = t_strsplit_spaces(set->ssl_options, ", "); +- const char *opt; + while ((opt = *opts++) != NULL) { + if (strcasecmp(opt, "no_compression") == 0) { + set->parsed_opts.compression = FALSE; +diff --git a/src/lib-storage/list/mailbox-list-index-backend.c b/src/lib-storage/list/mailbox-list-index-backend.c +index d0ef630..98a55e1 100644 +--- a/src/lib-storage/list/mailbox-list-index-backend.c ++++ b/src/lib-storage/list/mailbox-list-index-backend.c +@@ -327,6 +327,8 @@ index_list_mailbox_create(struct mailbox *box, + struct mailbox_update new_update; + enum mailbox_existence existence; + int ret; ++ const char *old_name; ++ guid_128_t old_guid; + + /* first do a quick check that it doesn't exist */ + if ((ret = index_list_node_exists(list, box->name, &existence)) < 0) { +@@ -354,8 +356,6 @@ index_list_mailbox_create(struct mailbox *box, + so use a bit kludgy create_mailbox_* variables during the + creation to return the path. we'll also support recursively + creating more mailboxes in here. */ +- const char *old_name; +- guid_128_t old_guid; + + old_name = list->create_mailbox_name; + guid_128_copy(old_guid, list->create_mailbox_guid); +diff --git a/src/lib-test/test-common.c b/src/lib-test/test-common.c +index ad1bade..2ccd83e 100644 +--- a/src/lib-test/test-common.c ++++ b/src/lib-test/test-common.c +@@ -312,9 +312,9 @@ static void run_one_fatal(enum fatal_test_state (*fatal_function)(int)) + static int index = 0; + for (;;) { + volatile int jumped = setjmp(fatal_jmpbuf); ++ expecting_fatal = TRUE; + if (jumped == 0) { + /* normal flow */ +- expecting_fatal = TRUE; + enum fatal_test_state ret = fatal_function(index); + expecting_fatal = FALSE; + if (ret == FATAL_TEST_FINISHED) { +diff --git a/src/lib/test-data-stack.c b/src/lib/test-data-stack.c +index e038a5d..ab5ce3d 100644 +--- a/src/lib/test-data-stack.c ++++ b/src/lib/test-data-stack.c +@@ -100,8 +100,8 @@ static void test_ds_recurse(int depth, int number, size_t size) + t_buffer_alloc_type(char *, number); + + for (i = 0; i < number; i++) { +- ps[i] = t_malloc(size/2); + bool re = t_try_realloc(ps[i], size); ++ ps[i] = t_malloc(size/2); + test_assert_idx(ps[i] != NULL, i); + if (!re) { + try_fails++; +diff --git a/src/plugins/stats/stats-plugin.c b/src/plugins/stats/stats-plugin.c +index df8b447..edd8236 100644 +--- a/src/plugins/stats/stats-plugin.c ++++ b/src/plugins/stats/stats-plugin.c +@@ -190,12 +190,14 @@ void mail_stats_get(struct stats_user *suser, struct mail_stats *stats_r) + memset(&usage, 0, sizeof(usage)); + stats_r->user_cpu = usage.ru_utime; + stats_r->sys_cpu = usage.ru_stime; ++#ifndef __HAIKU__ + stats_r->min_faults = usage.ru_minflt; + stats_r->maj_faults = usage.ru_majflt; + stats_r->vol_cs = usage.ru_nvcsw; + stats_r->invol_cs = usage.ru_nivcsw; + stats_r->disk_input = (unsigned long long)usage.ru_inblock * 512ULL; + stats_r->disk_output = (unsigned long long)usage.ru_oublock * 512ULL; ++#endif + (void)gettimeofday(&stats_r->clock_time, NULL); + process_read_io_stats(stats_r); + user_trans_stats_get(suser, &stats_r->trans_stats); +-- +1.8.3.4 + From a4b51ed23bf03d851dd1fa283d525c51d3bc31f4 Mon Sep 17 00:00:00 2001 From: Vale Date: Sat, 2 Jan 2016 20:04:12 -0500 Subject: [PATCH 5/5] Add recipe for sockhop --- games-puzzle/gnurobbo/gnurobbo-0.66.recipe | 12 +-- .../drive_encryption-1.0.recipe | 13 ++- haiku-libs/sockhop/sockhop-1.13.recipe | 82 +++++++++++++++++++ 3 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 haiku-libs/sockhop/sockhop-1.13.recipe diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.recipe b/games-puzzle/gnurobbo/gnurobbo-0.66.recipe index 20db43325..c07bb6211 100644 --- a/games-puzzle/gnurobbo/gnurobbo-0.66.recipe +++ b/games-puzzle/gnurobbo/gnurobbo-0.66.recipe @@ -7,8 +7,8 @@ HOMEPAGE="http://gnurobbo.sourceforge.net/" COPYRIGHT="2002-2010 The GNU Robbo Team" LICENSE="GNU LGPL v2.1" REVISION="1" -CHECKSUM_SHA256="54d2418f49e52b8f49631eb93af7789074b628d308a6d26b00cc795ad0b04d89" SOURCE_URI="http://downloads.sourceforge.net/gnurobbo/gnurobbo-$portVersion-source.tar.gz" +CHECKSUM_SHA256="54d2418f49e52b8f49631eb93af7789074b628d308a6d26b00cc795ad0b04d89" ARCHITECTURES="x86 x86_gcc2" @@ -38,13 +38,13 @@ BUILD_PREREQUIRES=" BUILD() { - make $jobArgs PACKAGE_DATA_DIR=$appsDir/gnurobbo/data + make $jobArgs PACKAGE_DATA_DIR=$appsDir/GNURobbo/data } INSTALL() { - mkdir -p $appsDir/gnurobbo - cp gnurobbo $appsDir/gnurobbo - cp -r data $appsDir/gnurobbo - addAppDeskbarSymlink $appsDir/gnurobbo/gnurobbo GnuRobbo + mkdir -p $appsDir/GNURobbo + cp gnurobbo $appsDir/GNURobbo + cp -r data $appsDir/GNURobbo + addAppDeskbarSymlink $appsDir/GNURobbo/gnurobbo GnuRobbo } diff --git a/haiku-apps/drive_encryption/drive_encryption-1.0.recipe b/haiku-apps/drive_encryption/drive_encryption-1.0.recipe index d28865dbb..9c9323d1c 100644 --- a/haiku-apps/drive_encryption/drive_encryption-1.0.recipe +++ b/haiku-apps/drive_encryption/drive_encryption-1.0.recipe @@ -7,13 +7,11 @@ available for Windows and Linux, as long as you've created them to use the \ AES encryption algorithm and a RIPEMD-160 hash algorithm protected password." HOMEPAGE="https://github.com/chirayudesai/driveencryption" COPYRIGHT="2007-2014 pinc Software" -LICENSE=" - TrueCrypt - MIT - " +LICENSE="TrueCrypt + MIT" REVISION="1" -CHECKSUM_SHA256="" SOURCE_URI="https://github.com/axeld/driveencryption/archive/993a11ceefac15d77406b697afb60b177d99bc45.tar.gz" +CHECKSUM_SHA256="18629ba278b197cf08cc13e5fe177ae3e023bf9046e1e94500f5821ff8eebfd2" SOURCE_DIR="driveencryption-993a11ceefac15d77406b697afb60b177d99bc45" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" @@ -23,6 +21,7 @@ PROVIDES=" cmd:encrypted_drive_control = $portVersion app:DriveEncryption = $portVersion app:Login = $portVersion + add_on:encrypted_drive = $portVersion " REQUIRES=" haiku @@ -50,8 +49,8 @@ BUILD() INSTALL() { mkdir -p $addOnsDir/kernel/drivers/bin $addOnsDir/kernel/drivers/dev/disk - cp -a driver/objects/encrypted_drive $addOnsDir/kernel/drivers/bin - ln -fs ../../bin/encrypted_drive $addOnsDir/kernel/drivers/dev/disk + cp -a driver/objects/encrypted_drive $addOnsDir/kernel/drivers/bin + ln -fs ../../bin/encrypted_drive $addOnsDir/kernel/drivers/dev/disk mkdir -p $binDir diff --git a/haiku-libs/sockhop/sockhop-1.13.recipe b/haiku-libs/sockhop/sockhop-1.13.recipe new file mode 100644 index 000000000..c19f4de70 --- /dev/null +++ b/haiku-libs/sockhop/sockhop-1.13.recipe @@ -0,0 +1,82 @@ +SUMMARY="Scalable distributed programming environment" +DESCRIPTION="SockHop is a system that facilitates the development of applications \ +that run on many machines at once. It is implemented in a single \ +file (libsockhop.so) that serves as both shared library for client code, \ +and as a server program for remote program invocation and control. SockHop's \ +primary design goals are ease of use, flexibility, and scalability \ +Using SockHop, writing and debugging a program that runs on many machines \ +at once is not much harder than writing a \"regular\" multithreaded program." +HOMEPAGE="http://haikuarchives.github.io/SockHop/" +COPYRIGHT="1999 Jeremy Friesner" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/HaikuArchives/SockHop/archive/edb241e6f58b462a04f2c61308d5b37a42cbaa6b.tar.gz" +CHECKSUM_SHA256="50377a2b8e20a36b10bb2baa1143ea3b5ddf21ce69cc0928a9ccb8f9b4505fba" +SOURCE_DIR="SockHop-edb241e6f58b462a04f2c61308d5b37a42cbaa6b" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + sockhop = $portVersion + cmd:sockhop = $portVersion + lib:libsockhop = $portVersion + " +REQUIRES=" + haiku + lib:libz + " + +PROVIDES_devel=" + sockhop_devel = $portVersion + devel:libsockhop = $portVersion + " +REQUIRES_devel=" + haiku_devel + sockhop == $portVersion base + " + +BUILD_REQUIRES=" + haiku_devel + devel:libz + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + cd source + cd libsockhop + make $jobArgs OBJ_DIR=objects + cd ../sockhop + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $binDir + mkdir -p $libDir + mkdir -p $includeDir + + cp -a source/sockhop/objects/sockhop $binDir + cp -a source/libsockhop/objects/libsockhop.so $libDir + cp -R include/. $includeDir + + prepareInstalledDevelLibs \ + libsockhop + packageEntries devel \ + $developDir +} + +TEST() { + cd source/tests + # Yes, I know. ;) + for i in {1..12}; do + pushd $i + make $jobArgs OBJ_DIR=objects + popd + done +}