From 29c13083366f5e64595ba014b6c64a7530b39707 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 2 Jan 2018 15:25:47 +0100 Subject: [PATCH] gnupg, bump version (#2035) --- ...nupg-1.4.21.recipe => gnupg-1.4.22.recipe} | 23 ++-- ...{gnupg-2.2.2.recipe => gnupg-2.2.4.recipe} | 18 ++- app-crypt/gnupg/licenses/CC0 v1.0 | 123 ++++++++++++++++++ ...-1.4.21.patchset => gnupg-1.4.22.patchset} | 36 ++++- ...pg-2.2.2.patchset => gnupg-2.2.4.patchset} | 0 5 files changed, 176 insertions(+), 24 deletions(-) rename app-crypt/gnupg/{gnupg-1.4.21.recipe => gnupg-1.4.22.recipe} (76%) rename app-crypt/gnupg/{gnupg-2.2.2.recipe => gnupg-2.2.4.recipe} (88%) create mode 100644 app-crypt/gnupg/licenses/CC0 v1.0 rename app-crypt/gnupg/patches/{gnupg-1.4.21.patchset => gnupg-1.4.22.patchset} (65%) rename app-crypt/gnupg/patches/{gnupg-2.2.2.patchset => gnupg-2.2.4.patchset} (100%) diff --git a/app-crypt/gnupg/gnupg-1.4.21.recipe b/app-crypt/gnupg/gnupg-1.4.22.recipe similarity index 76% rename from app-crypt/gnupg/gnupg-1.4.21.recipe rename to app-crypt/gnupg/gnupg-1.4.22.recipe index 18be7ac93..3145e8935 100644 --- a/app-crypt/gnupg/gnupg-1.4.21.recipe +++ b/app-crypt/gnupg/gnupg-1.4.22.recipe @@ -10,17 +10,17 @@ COPYRIGHT="1998-2016 Free Software Foundation, Inc." LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" -CHECKSUM_SHA256="6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276" +CHECKSUM_SHA256="9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4" PATCHES="gnupg-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" gnupg = $portVersion - cmd:gpg = $portVersion compat >= 1.4 - cmd:gpg_zip = $portVersion compat >= 1.4 - cmd:gpgsplit = $portVersion compat >= 1.4 - cmd:gpgv = $portVersion compat >= 1.4 + cmd:gpg = $portVersion + cmd:gpg_zip = $portVersion + cmd:gpgsplit = $portVersion + cmd:gpgv = $portVersion " REQUIRES=" haiku @@ -28,6 +28,7 @@ REQUIRES=" lib:libiconv lib:libintl lib:libreadline + lib:libssl lib:libusb_0.1 lib:libz " @@ -44,22 +45,14 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf - cmd:autoheader - cmd:automake - cmd:autoreconf - cmd:bison - cmd:find cmd:gcc - cmd:ld + cmd:libtoolize cmd:make - cmd:msgfmt - cmd:perl - cmd:tar " BUILD() { - autoreconf -fi + autoreconf -vfi runConfigure ./configure make $jobArgs } diff --git a/app-crypt/gnupg/gnupg-2.2.2.recipe b/app-crypt/gnupg/gnupg-2.2.4.recipe similarity index 88% rename from app-crypt/gnupg/gnupg-2.2.2.recipe rename to app-crypt/gnupg/gnupg-2.2.4.recipe index 1857a2c6b..3cdecb7ea 100644 --- a/app-crypt/gnupg/gnupg-2.2.2.recipe +++ b/app-crypt/gnupg/gnupg-2.2.4.recipe @@ -6,11 +6,17 @@ well as access modules for all kinds of public key directories. GnuPG, also \ known as GPG, is a command line tool with features for easy integration with \ other applications." HOMEPAGE="https://gnupg.org/" -COPYRIGHT="1998-2017 Free Software Foundation, Inc." -LICENSE="GNU GPL v3" +COPYRIGHT="1998-2017 Free Software Foundation, Inc. + 2000, Dimitrios Souflis + 2008, 2009, 2010, 2012-2016 William Ahern" +LICENSE="CC0 v1.0 + GNU GPL v2 + GNU GPL v3 + GNU LGPL v2.1 + GNU LGPL v3" REVISION="1" SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" -CHECKSUM_SHA256="bfb62c7412ceb3b9422c6c7134a34ff01a560f98eb981c2d96829c1517c08197" +CHECKSUM_SHA256="401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec" PATCHES="gnupg-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -100,7 +106,6 @@ BUILD() autogen.sh runConfigure ./configure \ --libexecdir=$libDir/gnupg \ - --enable-wks-server \ --enable-wks-tools \ --with-bzip2 make $jobArgs @@ -110,13 +115,14 @@ INSTALL() { make install # Extra tools, gentoo does the same - for f in convert-from-106 gpg-check-pattern gpg-zip lspgpot mail-signed-keys \ - make-dns-cert; do + for f in convert-from-106 gpg-check-pattern gpg-zip lspgpot \ + mail-signed-keys make-dns-cert; do cp -r tools/$f $binDir/ done } TEST() { + #check still fails as before on: FAIL: t-session-env make check } diff --git a/app-crypt/gnupg/licenses/CC0 v1.0 b/app-crypt/gnupg/licenses/CC0 v1.0 new file mode 100644 index 000000000..02ba3668d --- /dev/null +++ b/app-crypt/gnupg/licenses/CC0 v1.0 @@ -0,0 +1,123 @@ +[Note that only a few files are distributed under this license.] + +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/app-crypt/gnupg/patches/gnupg-1.4.21.patchset b/app-crypt/gnupg/patches/gnupg-1.4.22.patchset similarity index 65% rename from app-crypt/gnupg/patches/gnupg-1.4.21.patchset rename to app-crypt/gnupg/patches/gnupg-1.4.22.patchset index 88a4c3305..b078e96a0 100644 --- a/app-crypt/gnupg/patches/gnupg-1.4.21.patchset +++ b/app-crypt/gnupg/patches/gnupg-1.4.22.patchset @@ -1,11 +1,11 @@ -From 3fb03d8c66fe9e28012f87822fd84c89b06df2b4 Mon Sep 17 00:00:00 2001 +From fce1e481c1fcab3066ef605d22d1858553fb80a6 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 18 Feb 2016 22:55:30 +0000 Subject: Fix detection of libnetwork diff --git a/configure.ac b/configure.ac -index 8133537..7c90d45 100644 +index f6ed9c2..cc7861d 100644 --- a/configure.ac +++ b/configure.ac @@ -686,10 +686,12 @@ dnl for ldap, for example. If ldap libs are static (or dynamic and without @@ -37,5 +37,35 @@ index 8133537..7c90d45 100644 AC_SEARCH_LIBS(__dn_expand,resolv bind socket,,have_resolver=no)) AC_SEARCH_LIBS(dn_skipname,resolv bind socket,, -- -2.9.2 +2.15.1 + + +From ca1a66a94465160bd40f337f3cc5032f304df501 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Tue, 2 Jan 2018 10:35:34 +0100 +Subject: gcc2, parse error fix + + +diff --git a/cipher/rsa.c b/cipher/rsa.c +index 51b7640..d076b8c 100644 +--- a/cipher/rsa.c ++++ b/cipher/rsa.c +@@ -326,6 +326,7 @@ secret(MPI output, MPI input, RSA_secret_key *skey ) + # endif /* USE_BLINDING */ + + /* RSA secret operation: */ ++ { + MPI D_blind = mpi_alloc_secure (nlimbs); + MPI rr; + unsigned int rr_nbits; +@@ -386,6 +387,7 @@ secret(MPI output, MPI input, RSA_secret_key *skey ) + mpi_free ( m1 ); + mpi_free ( m2 ); + #endif ++ } + } + + +-- +2.15.1 diff --git a/app-crypt/gnupg/patches/gnupg-2.2.2.patchset b/app-crypt/gnupg/patches/gnupg-2.2.4.patchset similarity index 100% rename from app-crypt/gnupg/patches/gnupg-2.2.2.patchset rename to app-crypt/gnupg/patches/gnupg-2.2.4.patchset