[Git][java-team/pgpainless][master] 11 commits: New patch to fix the compatibility with Bouncy Castle 1.86
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Sun Oct 18 18:13:50 BST 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / pgpainless
Commits:
4d0372b5 by Emmanuel Bourg at 2026-10-18T18:23:25+02:00
New patch to fix the compatibility with Bouncy Castle 1.86
- - - - -
daa34311 by Emmanuel Bourg at 2026-10-18T18:23:25+02:00
Tightened the build dependency on libjunit5-system-exit-java
- - - - -
4b775d34 by Emmanuel Bourg at 2026-10-18T18:23:25+02:00
Standards-Version updated to 4.7.4
- - - - -
a22779e7 by Emmanuel Bourg at 2026-10-18T18:23:25+02:00
Removed the Priority field
- - - - -
3acf260b by Emmanuel Bourg at 2026-10-18T18:23:25+02:00
Removed the Rules-Requires-Root field
- - - - -
db64a216 by Emmanuel Bourg at 2026-10-18T18:23:25+02:00
Removed the javadoc packages
- - - - -
58ab7224 by Emmanuel Bourg at 2026-10-18T18:23:25+02:00
Replaced the patch renaming the Bouncy Castle artifacts with a Maven rule
- - - - -
ea10c773 by Emmanuel Bourg at 2026-10-18T18:51:07+02:00
Simplified debian/copyright
- - - - -
14d2ba43 by Emmanuel Bourg at 2026-10-18T19:10:09+02:00
New patch to skip a test once its key has expired (Closes: #1115001, #1127129)
- - - - -
d44e0796 by Chris Lamb at 2026-10-18T19:10:09+02:00
Always build and install the test jars to make the build reproducible (Closes: #1120530)
- - - - -
b6d01422 by Emmanuel Bourg at 2026-10-18T19:10:09+02:00
Upload to unstable
- - - - -
18 changed files:
- debian/changelog
- debian/control
- debian/copyright
- − debian/libpgpainless-cli-java-doc.doc-base
- − debian/libpgpainless-cli-java-doc.install
- − debian/libpgpainless-cli-java-doc.links
- − debian/libpgpainless-core-java-doc.doc-base
- − debian/libpgpainless-core-java-doc.install
- − debian/libpgpainless-core-java-doc.links
- − debian/libpgpainless-sop-java-doc.doc-base
- − debian/libpgpainless-sop-java-doc.install
- − debian/libpgpainless-sop-java-doc.links
- debian/maven.rules
- + debian/patches/0014-bouncycastle-compatibility.patch
- − debian/patches/0014-fix-bouncycastle-classnames.patch
- + debian/patches/0015-skip-test-with-expired-key.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,25 @@
+pgpainless (1.6.9-3) unstable; urgency=medium
+
+ * Team upload
+
+ [ Emmanuel Bourg ]
+ * New patch to fix the compatibility with Bouncy Castle 1.86
+ * Tightened the build dependency on libjunit5-system-exit-java
+ * Standards-Version updated to 4.7.4
+ * Removed the Priority field
+ * Removed the Rules-Requires-Root field
+ * Removed the javadoc packages
+ * Replaced the patch renaming the Bouncy Castle artifacts with a Maven rule
+ * Simplified debian/copyright
+ * New patch to skip a test once its key has expired
+ (Closes: #1115001, #1127129)
+
+ [ Chris Lamb ]
+ * Always build and install the test jars to make the build reproducible
+ (Closes: #1120530)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sun, 18 Oct 2026 18:52:14 +0200
+
pgpainless (1.6.9-2) unstable; urgency=medium
[ Vladimir Petko ]
=====================================
debian/control
=====================================
@@ -1,30 +1,27 @@
Source: pgpainless
Section: java
-Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders:
Jérôme Charaoui <jerome at riseup.net>,
Build-Depends:
debhelper-compat (= 13),
default-jdk,
- default-jdk-doc <!nodoc>,
gradle-debian-helper,
javahelper,
- junit5 <!nocheck>,
+ junit5,
libbcpg-java (>= 1.80),
libbcutil-java (>= 1.80),
libjsr305-java,
- libjunit5-system-exit-java (>=2.0.2) <!nocheck>,
+ libjunit5-system-exit-java (>= 2.0.3-3~),
libslf4j-java,
libsop-java-java (>= 7.0.1),
libsop-java-picocli-java (>= 7.0.1),
maven-debian-helper,
maven-repo-helper,
-Standards-Version: 4.7.2
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/java-team/pgpainless.git
Vcs-Browser: https://salsa.debian.org/java-team/pgpainless
Homepage: https://pgpainless.org/
-Rules-Requires-Root: no
Package: libpgpainless-core-java
Architecture: all
@@ -42,22 +39,6 @@ Description: Easy to use OpenPGP library
.
This package contains the core PGPainless classes.
-Package: libpgpainless-core-java-doc
-Build-Profiles: <!nodoc>
-Architecture: all
-Multi-Arch: foreign
-Section: doc
-Depends:
- libjs-jquery,
- libjs-jquery-ui,
- ${misc:Depends},
-Description: Easy to use OpenPGP library - docs
- PGPainless is a modern implementation of OpenPGP in Java. It offers an
- ergonomic interface on top of the BouncyCastle cryptographic toolkit
- that makes it straightforward to deal with OpenPGP data.
- .
- This package contains documentation for libpgpainless-core-java.
-
Package: libpgpainless-sop-java
Architecture: all
Depends:
@@ -73,20 +54,6 @@ Description: Stateless OpenPGP Protocol with PGPainless - library
.
This package contains the PGPainless-SOP implementation classes.
-Package: libpgpainless-sop-java-doc
-Build-Profiles: <!nodoc>
-Architecture: all
-Multi-Arch: foreign
-Section: doc
-Depends:
- ${misc:Depends},
-Description: Stateless OpenPGP Protocol with PGPainless - library - docs
- PGPainless is a modern implementation of OpenPGP in Java. It offers an
- ergonomic interface on top of the BouncyCastle cryptographic toolkit
- that makes it straightforward to deal with OpenPGP data.
- .
- This package contains documentation for libpgpainless-sop-java.
-
Package: libpgpainless-cli-java
Architecture: all
Depends:
@@ -102,20 +69,6 @@ Description: Stateless OpenPGP Protocol with PGPainless - runtime library
.
This package provides CLI command classes for PGPainless-SOP via picocli.
-Package: libpgpainless-cli-java-doc
-Build-Profiles: <!nodoc>
-Architecture: all
-Multi-Arch: foreign
-Section: doc
-Depends:
- ${misc:Depends},
-Description: Stateless OpenPGP Protocol with PGPainless - runtime library - docs
- PGPainless is a modern implementation of OpenPGP in Java. It offers an
- ergonomic interface on top of the BouncyCastle cryptographic toolkit
- that makes it straightforward to deal with OpenPGP data.
- .
- This package contains documentation for libpgpainless-cli-java.
-
Package: pgpainless-cli
Architecture: all
Depends:
=====================================
debian/copyright
=====================================
@@ -9,712 +9,35 @@ Files: *
Copyright: 2021 Paul Schaub <info at pgpainless.org>
License: Apache-2.0
-Files: debian/*
-Copyright: 2022-2024 Jérôme Charaoui <jerome at riseup.net>
-License: Apache-2.0
-
-# Documentation
Files: docs/*
-Copyright: 2022 Paul Schaub <info at pgpainless.org>
-License: CC-BY-3.0
-
-Files: .readthedocs.yaml
-Copyright: 2022 Paul Schaub <info at pgpainless.org>
-License: CC0-1.0
-
-# PGPainless Logo
-Files: assets/logo.png
-Copyright: 2022 Paul Schaub <info at pgpainless.org>
-License: CC-BY-3.0
-
-Files: assets/repository-open-graph.png
-Copyright: 2021 Paul Schaub <info at pgpainless.org>
-License: CC-BY-3.0
-
-Files: assets/pgpainless.svg
-Copyright: 2021 Paul Schaub <info at pgpainless.org>
+ assets/logo.png
+ assets/repository-open-graph.png
+ assets/pgpainless.svg
+Copyright: 2021-2022 Paul Schaub <info at pgpainless.org>
License: CC-BY-3.0
+ On Debian systems the full text of the CC-BY-3.0 license can be found in
+ /usr/share/common-licenses/CC-BY-3.0.
Files: assets/test_vectors/*
-Copyright: 2018 Paul Schaub <info at pgpainless.org>
-License: CC0-1.0
-
-Files: pgpainless-core/src/test/resources/*
-Copyright: 2020 Paul Schaub <info at pgpainless.org>
-License: CC0-1.0
-
-# GH Pages
-Files: CNAME
-Copyright: 2022 Paul Schaub <info at pgpainless.org>
-License: CC0-1.0
-
-Files: _config.yml
-Copyright: 2022 Paul Schaub <info at pgpainless.org>
+ pgpainless-core/src/test/resources/*
+ .readthedocs.yaml
+ CNAME
+ _config.yml
+Copyright: 2018-2022 Paul Schaub <info at pgpainless.org>
License: CC0-1.0
+ On Debian systems the full text of the CC0-1.0 license can be found in
+ /usr/share/common-licenses/CC0-1.0.
Files: _layouts/*
Copyright: 2022 Paul Schaub <info at pgpainless.org>, 2017 Steve Smith
License: CC-BY-SA-3.0
+ On Debian systems the full text of the CC-BY-SA-3.0 license can be found in
+ /usr/share/common-licenses/CC-BY-SA-3.0.
-# Man Pages
-Files: pgpainless-cli/rewriteManPages.sh
-Copyright: 2022 Paul Schaub <info at pgpainless.org>
-License: Apache-2.0
-
-Files: pgpainless-cli/packaging/man/*
-Copyright: 2022 Paul Schaub <info at pgpainless.org>
+Files: debian/*
+Copyright: 2022-2024 Jérôme Charaoui <jerome at riseup.net>
License: Apache-2.0
License: Apache-2.0
On Debian systems the full text of the Apache-2.0 license can be found in
/usr/share/common-licenses/Apache-2.0.
-
-License: CC0-1.0
- On Debian systems the full text of the CC0-1.0 license can be found in
- /usr/share/common-licenses/CC0-1.0.
-
-License: CC-BY-3.0
- Creative Commons Legal Code
- .
- Attribution 3.0 Unported
- .
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
- REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
- DAMAGES RESULTING FROM ITS USE.
- .
- License
- .
- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
- COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
- COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
- AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
- .
- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
- TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
- BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
- CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
- CONDITIONS.
- .
- 1. Definitions
- .
- a. "Adaptation" means a work based upon the Work, or upon the Work and
- other pre-existing works, such as a translation, adaptation,
- derivative work, arrangement of music or other alterations of a
- literary or artistic work, or phonogram or performance and includes
- cinematographic adaptations or any other form in which the Work may be
- recast, transformed, or adapted including in any form recognizably
- derived from the original, except that a work that constitutes a
- Collection will not be considered an Adaptation for the purpose of
- this License. For the avoidance of doubt, where the Work is a musical
- work, performance or phonogram, the synchronization of the Work in
- timed-relation with a moving image ("synching") will be considered an
- Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
- encyclopedias and anthologies, or performances, phonograms or
- broadcasts, or other works or subject matter other than works listed
- in Section 1(f) below, which, by reason of the selection and
- arrangement of their contents, constitute intellectual creations, in
- which the Work is included in its entirety in unmodified form along
- with one or more other contributions, each constituting separate and
- independent works in themselves, which together are assembled into a
- collective whole. A work that constitutes a Collection will not be
- considered an Adaptation (as defined above) for the purposes of this
- License.
- c. "Distribute" means to make available to the public the original and
- copies of the Work or Adaptation, as appropriate, through sale or
- other transfer of ownership.
- d. "Licensor" means the individual, individuals, entity or entities that
- offer(s) the Work under the terms of this License.
- e. "Original Author" means, in the case of a literary or artistic work,
- the individual, individuals, entity or entities who created the Work
- or if no individual or entity can be identified, the publisher; and in
- addition (i) in the case of a performance the actors, singers,
- musicians, dancers, and other persons who act, sing, deliver, declaim,
- play in, interpret or otherwise perform literary or artistic works or
- expressions of folklore; (ii) in the case of a phonogram the producer
- being the person or legal entity who first fixes the sounds of a
- performance or other sounds; and, (iii) in the case of broadcasts, the
- organization that transmits the broadcast.
- f. "Work" means the literary and/or artistic work offered under the terms
- of this License including without limitation any production in the
- literary, scientific and artistic domain, whatever may be the mode or
- form of its expression including digital form, such as a book,
- pamphlet and other writing; a lecture, address, sermon or other work
- of the same nature; a dramatic or dramatico-musical work; a
- choreographic work or entertainment in dumb show; a musical
- composition with or without words; a cinematographic work to which are
- assimilated works expressed by a process analogous to cinematography;
- a work of drawing, painting, architecture, sculpture, engraving or
- lithography; a photographic work to which are assimilated works
- expressed by a process analogous to photography; a work of applied
- art; an illustration, map, plan, sketch or three-dimensional work
- relative to geography, topography, architecture or science; a
- performance; a broadcast; a phonogram; a compilation of data to the
- extent it is protected as a copyrightable work; or a work performed by
- a variety or circus performer to the extent it is not otherwise
- considered a literary or artistic work.
- g. "You" means an individual or entity exercising rights under this
- License who has not previously violated the terms of this License with
- respect to the Work, or who has received express permission from the
- Licensor to exercise rights under this License despite a previous
- violation.
- h. "Publicly Perform" means to perform public recitations of the Work and
- to communicate to the public those public recitations, by any means or
- process, including by wire or wireless means or public digital
- performances; to make available to the public Works in such a way that
- members of the public may access these Works from a place and at a
- place individually chosen by them; to perform the Work to the public
- by any means or process and the communication to the public of the
- performances of the Work, including by public digital performance; to
- broadcast and rebroadcast the Work by any means including signs,
- sounds or images.
- i. "Reproduce" means to make copies of the Work by any means including
- without limitation by sound or visual recordings and the right of
- fixation and reproducing fixations of the Work, including storage of a
- protected performance or phonogram in digital form or other electronic
- medium.
- .
- 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
- limit, or restrict any uses free from copyright or rights arising from
- limitations or exceptions that are provided for in connection with the
- copyright protection under copyright law or other applicable laws.
- .
- 3. License Grant. Subject to the terms and conditions of this License,
- Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
- perpetual (for the duration of the applicable copyright) license to
- exercise the rights in the Work as stated below:
- .
- a. to Reproduce the Work, to incorporate the Work into one or more
- Collections, and to Reproduce the Work as incorporated in the
- Collections;
- b. to create and Reproduce Adaptations provided that any such Adaptation,
- including any translation in any medium, takes reasonable steps to
- clearly label, demarcate or otherwise identify that changes were made
- to the original Work. For example, a translation could be marked "The
- original work was translated from English to Spanish," or a
- modification could indicate "The original work has been modified.";
- c. to Distribute and Publicly Perform the Work including as incorporated
- in Collections; and,
- d. to Distribute and Publicly Perform Adaptations.
- e. For the avoidance of doubt:
- .
- i. Non-waivable Compulsory License Schemes. In those jurisdictions in
- which the right to collect royalties through any statutory or
- compulsory licensing scheme cannot be waived, the Licensor
- reserves the exclusive right to collect such royalties for any
- exercise by You of the rights granted under this License;
- ii. Waivable Compulsory License Schemes. In those jurisdictions in
- which the right to collect royalties through any statutory or
- compulsory licensing scheme can be waived, the Licensor waives the
- exclusive right to collect such royalties for any exercise by You
- of the rights granted under this License; and,
- iii. Voluntary License Schemes. The Licensor waives the right to
- collect royalties, whether individually or, in the event that the
- Licensor is a member of a collecting society that administers
- voluntary licensing schemes, via that society, from any exercise
- by You of the rights granted under this License.
- .
- The above rights may be exercised in all media and formats whether now
- known or hereafter devised. The above rights include the right to make
- such modifications as are technically necessary to exercise the rights in
- other media and formats. Subject to Section 8(f), all rights not expressly
- granted by Licensor are hereby reserved.
- .
- 4. Restrictions. The license granted in Section 3 above is expressly made
- subject to and limited by the following restrictions:
- .
- a. You may Distribute or Publicly Perform the Work only under the terms
- of this License. You must include a copy of, or the Uniform Resource
- Identifier (URI) for, this License with every copy of the Work You
- Distribute or Publicly Perform. You may not offer or impose any terms
- on the Work that restrict the terms of this License or the ability of
- the recipient of the Work to exercise the rights granted to that
- recipient under the terms of the License. You may not sublicense the
- Work. You must keep intact all notices that refer to this License and
- to the disclaimer of warranties with every copy of the Work You
- Distribute or Publicly Perform. When You Distribute or Publicly
- Perform the Work, You may not impose any effective technological
- measures on the Work that restrict the ability of a recipient of the
- Work from You to exercise the rights granted to that recipient under
- the terms of the License. This Section 4(a) applies to the Work as
- incorporated in a Collection, but this does not require the Collection
- apart from the Work itself to be made subject to the terms of this
- License. If You create a Collection, upon notice from any Licensor You
- must, to the extent practicable, remove from the Collection any credit
- as required by Section 4(b), as requested. If You create an
- Adaptation, upon notice from any Licensor You must, to the extent
- practicable, remove from the Adaptation any credit as required by
- Section 4(b), as requested.
- b. If You Distribute, or Publicly Perform the Work or any Adaptations or
- Collections, You must, unless a request has been made pursuant to
- Section 4(a), keep intact all copyright notices for the Work and
- provide, reasonable to the medium or means You are utilizing: (i) the
- name of the Original Author (or pseudonym, if applicable) if supplied,
- and/or if the Original Author and/or Licensor designate another party
- or parties (e.g., a sponsor institute, publishing entity, journal) for
- attribution ("Attribution Parties") in Licensor's copyright notice,
- terms of service or by other reasonable means, the name of such party
- or parties; (ii) the title of the Work if supplied; (iii) to the
- extent reasonably practicable, the URI, if any, that Licensor
- specifies to be associated with the Work, unless such URI does not
- refer to the copyright notice or licensing information for the Work;
- and (iv) , consistent with Section 3(b), in the case of an Adaptation,
- a credit identifying the use of the Work in the Adaptation (e.g.,
- "French translation of the Work by Original Author," or "Screenplay
- based on original Work by Original Author"). The credit required by
- this Section 4 (b) may be implemented in any reasonable manner;
- provided, however, that in the case of a Adaptation or Collection, at
- a minimum such credit will appear, if a credit for all contributing
- authors of the Adaptation or Collection appears, then as part of these
- credits and in a manner at least as prominent as the credits for the
- other contributing authors. For the avoidance of doubt, You may only
- use the credit required by this Section for the purpose of attribution
- in the manner set out above and, by exercising Your rights under this
- License, You may not implicitly or explicitly assert or imply any
- connection with, sponsorship or endorsement by the Original Author,
- Licensor and/or Attribution Parties, as appropriate, of You or Your
- use of the Work, without the separate, express prior written
- permission of the Original Author, Licensor and/or Attribution
- Parties.
- c. Except as otherwise agreed in writing by the Licensor or as may be
- otherwise permitted by applicable law, if You Reproduce, Distribute or
- Publicly Perform the Work either by itself or as part of any
- Adaptations or Collections, You must not distort, mutilate, modify or
- take other derogatory action in relation to the Work which would be
- prejudicial to the Original Author's honor or reputation. Licensor
- agrees that in those jurisdictions (e.g. Japan), in which any exercise
- of the right granted in Section 3(b) of this License (the right to
- make Adaptations) would be deemed to be a distortion, mutilation,
- modification or other derogatory action prejudicial to the Original
- Author's honor and reputation, the Licensor will waive or not assert,
- as appropriate, this Section, to the fullest extent permitted by the
- applicable national law, to enable You to reasonably exercise Your
- right under Section 3(b) of this License (right to make Adaptations)
- but not otherwise.
- .
- 5. Representations, Warranties and Disclaimer
- .
- UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
- 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, MERCHANTIBILITY,
- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
- LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
- WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
- OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
- .
- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
- LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
- ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
- ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
- BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- .
- 7. Termination
- .
- a. This License and the rights granted hereunder will terminate
- automatically upon any breach by You of the terms of this License.
- Individuals or entities who have received Adaptations or Collections
- from You under this License, however, will not have their licenses
- terminated provided such individuals or entities remain in full
- compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
- survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
- perpetual (for the duration of the applicable copyright in the Work).
- Notwithstanding the above, Licensor reserves the right to release the
- Work under different license terms or to stop distributing the Work at
- any time; provided, however that any such election will not serve to
- withdraw this License (or any other license that has been, or is
- required to be, granted under the terms of this License), and this
- License will continue in full force and effect unless terminated as
- stated above.
- .
- 8. Miscellaneous
- .
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
- the Licensor offers to the recipient a license to the Work on the same
- terms and conditions as the license granted to You under this License.
- b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
- offers to the recipient a license to the original Work on the same
- terms and conditions as the license granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability of
- the remainder of the terms of this License, and without further action
- by the parties to this agreement, such provision shall be reformed to
- the minimum extent necessary to make such provision valid and
- enforceable.
- d. No term or provision of this License shall be deemed waived and no
- breach consented to unless such waiver or consent shall be in writing
- and signed by the party to be charged with such waiver or consent.
- e. This License constitutes the entire agreement between the parties with
- respect to the Work licensed here. There are no understandings,
- agreements or representations with respect to the Work not specified
- here. Licensor shall not be bound by any additional provisions that
- may appear in any communication from You. This License may not be
- modified without the mutual written agreement of the Licensor and You.
- f. The rights granted under, and the subject matter referenced, in this
- License were drafted utilizing the terminology of the Berne Convention
- for the Protection of Literary and Artistic Works (as amended on
- September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
- Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
- and the Universal Copyright Convention (as revised on July 24, 1971).
- These rights and subject matter take effect in the relevant
- jurisdiction in which the License terms are sought to be enforced
- according to the corresponding provisions of the implementation of
- those treaty provisions in the applicable national law. If the
- standard suite of rights granted under applicable copyright law
- includes additional rights not granted under this License, such
- additional rights are deemed to be included in the License; this
- License is not intended to restrict the license of any rights under
- applicable law.
- .
- Creative Commons Notice
- .
- Creative Commons is not a party to this License, and makes no warranty
- whatsoever in connection with the Work. Creative Commons will not be
- liable to You or any party on any legal theory for any damages
- whatsoever, including without limitation any general, special,
- incidental or consequential damages arising in connection to this
- license. Notwithstanding the foregoing two (2) sentences, if Creative
- Commons has expressly identified itself as the Licensor hereunder, it
- shall have all rights and obligations of Licensor.
- .
- Except for the limited purpose of indicating to the public that the
- Work is licensed under the CCPL, Creative Commons does not authorize
- the use by either party of the trademark "Creative Commons" or any
- related trademark or logo of Creative Commons without the prior
- written consent of Creative Commons. Any permitted use will be in
- compliance with Creative Commons' then-current trademark usage
- guidelines, as may be published on its website or otherwise made
- available upon request from time to time. For the avoidance of doubt,
- this trademark restriction does not form part of this License.
- .
- Creative Commons may be contacted at https://creativecommons.org/.
-
-License: CC-BY-SA-3.0
- Creative Commons Legal Code
- .
- Attribution-ShareAlike 3.0 Unported
- .
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
- SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
- RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS"
- BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION
- PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
- .
- License
- .
- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
- COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
- COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
- AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
- .
- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
- BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
- CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED
- HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
- .
- 1. Definitions
- "Adaptation" means a work based upon the Work, or upon the Work and
- other pre-existing works, such as a translation, adaptation, derivative
- work, arrangement of music or other alterations of a literary or
- artistic work, or phonogram or performance and includes cinematographic
- adaptations or any other form in which the Work may be recast,
- transformed, or adapted including in any form recognizably derived from
- the original, except that a work that constitutes a Collection will not
- be considered an Adaptation for the purpose of this License. For the
- avoidance of doubt, where the Work is a musical work, performance or
- phonogram, the synchronization of the Work in timed-relation with a
- moving image ("synching") will be considered an Adaptation for the
- purpose of this License.
- "Collection" means a collection of literary or artistic works, such as
- encyclopedias and anthologies, or performances, phonograms or
- broadcasts, or other works or subject matter other than works listed in
- Section 1(f) below, which, by reason of the selection and arrangement of
- their contents, constitute intellectual creations, in which the Work is
- included in its entirety in unmodified form along with one or more other
- contributions, each constituting separate and independent works in
- themselves, which together are assembled into a collective whole. A work
- that constitutes a Collection will not be considered an Adaptation (as
- defined below) for the purposes of this License.
- "Creative Commons Compatible License" means a license that is listed at
- http://creativecommons.org/compatiblelicenses that has been approved by
- Creative Commons as being essentially equivalent to this License,
- including, at a minimum, because that license: (i) contains terms that
- have the same purpose, meaning and effect as the License Elements of
- this License; and, (ii) explicitly permits the relicensing of
- adaptations of works made available under that license under this
- License or a Creative Commons jurisdiction license with the same License
- Elements as this License.
- "Distribute" means to make available to the public the original and
- copies of the Work or Adaptation, as appropriate, through sale or other
- transfer of ownership.
- "License Elements" means the following high-level license attributes as
- selected by Licensor and indicated in the title of this License:
- Attribution, ShareAlike.
- "Licensor" means the individual, individuals, entity or entities that
- offer(s) the Work under the terms of this License.
- "Original Author" means, in the case of a literary or artistic work, the
- individual, individuals, entity or entities who created the Work or if
- no individual or entity can be identified, the publisher; and in
- addition (i) in the case of a performance the actors, singers,
- musicians, dancers, and other persons who act, sing, deliver, declaim,
- play in, interpret or otherwise perform literary or artistic works or
- expressions of folklore; (ii) in the case of a phonogram the producer
- being the person or legal entity who first fixes the sounds of a
- performance or other sounds; and, (iii) in the case of broadcasts, the
- organization that transmits the broadcast.
- "Work" means the literary and/or artistic work offered under the terms
- of this License including without limitation any production in the
- literary, scientific and artistic domain, whatever may be the mode or
- form of its expression including digital form, such as a book, pamphlet
- and other writing; a lecture, address, sermon or other work of the same
- nature; a dramatic or dramatico-musical work; a choreographic work or
- entertainment in dumb show; a musical composition with or without words;
- a cinematographic work to which are assimilated works expressed by a
- process analogous to cinematography; a work of drawing, painting,
- architecture, sculpture, engraving or lithography; a photographic work
- to which are assimilated works expressed by a process analogous to
- photography; a work of applied art; an illustration, map, plan, sketch
- or three-dimensional work relative to geography, topography,
- architecture or science; a performance; a broadcast; a phonogram; a
- compilation of data to the extent it is protected as a copyrightable
- work; or a work performed by a variety or circus performer to the extent
- it is not otherwise considered a literary or artistic work.
- "You" means an individual or entity exercising rights under this License
- who has not previously violated the terms of this License with respect
- to the Work, or who has received express permission from the Licensor to
- exercise rights under this License despite a previous violation.
- "Publicly Perform" means to perform public recitations of the Work and
- to communicate to the public those public recitations, by any means or
- process, including by wire or wireless means or public digital
- performances; to make available to the public Works in such a way that
- members of the public may access these Works from a place and at a place
- individually chosen by them; to perform the Work to the public by any
- means or process and the communication to the public of the performances
- of the Work, including by public digital performance; to broadcast and
- rebroadcast the Work by any means including signs, sounds or images.
- "Reproduce" means to make copies of the Work by any means including
- without limitation by sound or visual recordings and the right of
- fixation and reproducing fixations of the Work, including storage of a
- protected performance or phonogram in digital form or other electronic
- medium.
- .
- 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
- limit, or restrict any uses free from copyright or rights arising from
- limitations or exceptions that are provided for in connection with the
- copyright protection under copyright law or other applicable laws.
- .
- 3. License Grant. Subject to the terms and conditions of this License,
- Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
- perpetual (for the duration of the applicable copyright) license to
- exercise the rights in the Work as stated below:
- .
- to Reproduce the Work, to incorporate the Work into one or more
- Collections, and to Reproduce the Work as incorporated in the
- Collections;
- to create and Reproduce Adaptations provided that any such Adaptation,
- including any translation in any medium, takes reasonable steps to
- clearly label, demarcate or otherwise identify that changes were made to
- the original Work. For example, a translation could be marked "The
- original work was translated from English to Spanish," or a modification
- could indicate "The original work has been modified.";
- to Distribute and Publicly Perform the Work including as incorporated in
- Collections; and,
- to Distribute and Publicly Perform Adaptations.
- .
- For the avoidance of doubt:
- Non-waivable Compulsory License Schemes. In those jurisdictions in
- which the right to collect royalties through any statutory or
- compulsory licensing scheme cannot be waived, the Licensor reserves
- the exclusive right to collect such royalties for any exercise by
- You of the rights granted under this License;
- Waivable Compulsory License Schemes. In those jurisdictions in which
- the right to collect royalties through any statutory or compulsory
- licensing scheme can be waived, the Licensor waives the exclusive
- right to collect such royalties for any exercise by You of the
- rights granted under this License; and,
- Voluntary License Schemes. The Licensor waives the right to collect
- royalties, whether individually or, in the event that the Licensor
- is a member of a collecting society that administers voluntary
- licensing schemes, via that society, from any exercise by You of the
- rights granted under this License.
- .
- The above rights may be exercised in all media and formats whether now
- known or hereafter devised. The above rights include the right to make such
- modifications as are technically necessary to exercise the rights in other
- media and formats. Subject to Section 8(f), all rights not expressly
- granted by Licensor are hereby reserved.
- .
- 4. Restrictions. The license granted in Section 3 above is expressly made
- subject to and limited by the following restrictions:
- .
- You may Distribute or Publicly Perform the Work only under the terms of
- this License. You must include a copy of, or the Uniform Resource
- Identifier (URI) for, this License with every copy of the Work You
- Distribute or Publicly Perform. You may not offer or impose any terms on
- the Work that restrict the terms of this License or the ability of the
- recipient of the Work to exercise the rights granted to that recipient
- under the terms of the License. You may not sublicense the Work. You
- must keep intact all notices that refer to this License and to the
- disclaimer of warranties with every copy of the Work You Distribute or
- Publicly Perform. When You Distribute or Publicly Perform the Work, You
- may not impose any effective technological measures on the Work that
- restrict the ability of a recipient of the Work from You to exercise the
- rights granted to that recipient under the terms of the License. This
- Section 4(a) applies to the Work as incorporated in a Collection, but
- this does not require the Collection apart from the Work itself to be
- made subject to the terms of this License. If You create a Collection,
- upon notice from any Licensor You must, to the extent practicable,
- remove from the Collection any credit as required by Section 4(c), as
- requested. If You create an Adaptation, upon notice from any Licensor
- You must, to the extent practicable, remove from the Adaptation any
- credit as required by Section 4(c), as requested.
- You may Distribute or Publicly Perform an Adaptation only under the
- terms of: (i) this License; (ii) a later version of this License with
- the same License Elements as this License; (iii) a Creative Commons
- jurisdiction license (either this or a later license version) that
- contains the same License Elements as this License (e.g.,
- Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
- License. If you license the Adaptation under one of the licenses
- mentioned in (iv), you must comply with the terms of that license. If
- you license the Adaptation under the terms of any of the licenses
- mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
- comply with the terms of the Applicable License generally and the
- following provisions: (I) You must include a copy of, or the URI for,
- the Applicable License with every copy of each Adaptation You Distribute
- or Publicly Perform; (II) You may not offer or impose any terms on the
- Adaptation that restrict the terms of the Applicable License or the
- ability of the recipient of the Adaptation to exercise the rights
- granted to that recipient under the terms of the Applicable License;
- (III) You must keep intact all notices that refer to the Applicable
- License and to the disclaimer of warranties with every copy of the Work
- as included in the Adaptation You Distribute or Publicly Perform; (IV)
- when You Distribute or Publicly Perform the Adaptation, You may not
- impose any effective technological measures on the Adaptation that
- restrict the ability of a recipient of the Adaptation from You to
- exercise the rights granted to that recipient under the terms of the
- Applicable License. This Section 4(b) applies to the Adaptation as
- incorporated in a Collection, but this does not require the Collection
- apart from the Adaptation itself to be made subject to the terms of the
- Applicable License.
- If You Distribute, or Publicly Perform the Work or any Adaptations or
- Collections, You must, unless a request has been made pursuant to
- Section 4(a), keep intact all copyright notices for the Work and
- provide, reasonable to the medium or means You are utilizing: (i) the
- name of the Original Author (or pseudonym, if applicable) if supplied,
- and/or if the Original Author and/or Licensor designate another party or
- parties (e.g., a sponsor institute, publishing entity, journal) for
- attribution ("Attribution Parties") in Licensor's copyright notice,
- terms of service or by other reasonable means, the name of such party or
- parties; (ii) the title of the Work if supplied; (iii) to the extent
- reasonably practicable, the URI, if any, that Licensor specifies to be
- associated with the Work, unless such URI does not refer to the
- copyright notice or licensing information for the Work; and (iv) ,
- consistent with Ssection 3(b), in the case of an Adaptation, a credit
- identifying the use of the Work in the Adaptation (e.g., "French
- translation of the Work by Original Author," or "Screenplay based on
- original Work by Original Author"). The credit required by this Section
- 4(c) may be implemented in any reasonable manner; provided, however,
- that in the case of a Adaptation or Collection, at a minimum such credit
- will appear, if a credit for all contributing authors of the Adaptation
- or Collection appears, then as part of these credits and in a manner at
- least as prominent as the credits for the other contributing authors.
- For the avoidance of doubt, You may only use the credit required by this
- Section for the purpose of attribution in the manner set out above and,
- by exercising Your rights under this License, You may not implicitly or
- explicitly assert or imply any connection with, sponsorship or
- endorsement by the Original Author, Licensor and/or Attribution Parties,
- as appropriate, of You or Your use of the Work, without the separate,
- express prior written permission of the Original Author, Licensor and/or
- Attribution Parties.
- Except as otherwise agreed in writing by the Licensor or as may be
- otherwise permitted by applicable law, if You Reproduce, Distribute or
- Publicly Perform the Work either by itself or as part of any Adaptations
- or Collections, You must not distort, mutilate, modify or take other
- derogatory action in relation to the Work which would be prejudicial to
- the Original Author's honor or reputation. Licensor agrees that in those
- jurisdictions (e.g. Japan), in which any exercise of the right granted
- in Section 3(b) of this License (the right to make Adaptations) would be
- deemed to be a distortion, mutilation, modification or other derogatory
- action prejudicial to the Original Author's honor and reputation, the
- Licensor will waive or not assert, as appropriate, this Section, to the
- fullest extent permitted by the applicable national law, to enable You
- to reasonably exercise Your right under Section 3(b) of this License
- (right to make Adaptations) but not otherwise.
- .
- 5. Representations, Warranties and Disclaimer
- .
- UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
- 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, MERCHANTIBILITY,
- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT
- OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER
- OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF
- IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
- .
- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
- LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
- SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING
- OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- .
- 7. Termination
- .
- This License and the rights granted hereunder will terminate
- automatically upon any breach by You of the terms of this License.
- Individuals or entities who have received Adaptations or Collections
- from You under this License, however, will not have their licenses
- terminated provided such individuals or entities remain in full
- compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
- survive any termination of this License.
- Subject to the above terms and conditions, the license granted here is
- perpetual (for the duration of the applicable copyright in the Work).
- Notwithstanding the above, Licensor reserves the right to release the
- Work under different license terms or to stop distributing the Work at
- any time; provided, however that any such election will not serve to
- withdraw this License (or any other license that has been, or is
- required to be, granted under the terms of this License), and this
- License will continue in full force and effect unless terminated as
- stated above.
- .
- 8. Miscellaneous
- .
- Each time You Distribute or Publicly Perform the Work or a Collection,
- the Licensor offers to the recipient a license to the Work on the same
- terms and conditions as the license granted to You under this License.
- Each time You Distribute or Publicly Perform an Adaptation, Licensor
- offers to the recipient a license to the original Work on the same terms
- and conditions as the license granted to You under this License.
- If any provision of this License is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability of
- the remainder of the terms of this License, and without further action
- by the parties to this agreement, such provision shall be reformed to
- the minimum extent necessary to make such provision valid and
- enforceable.
- No term or provision of this License shall be deemed waived and no
- breach consented to unless such waiver or consent shall be in writing
- and signed by the party to be charged with such waiver or consent.
- This License constitutes the entire agreement between the parties with
- respect to the Work licensed here. There are no understandings,
- agreements or representations with respect to the Work not specified
- here. Licensor shall not be bound by any additional provisions that may
- appear in any communication from You. This License may not be modified
- without the mutual written agreement of the Licensor and You.
- The rights granted under, and the subject matter referenced, in this
- License were drafted utilizing the terminology of the Berne Convention
- for the Protection of Literary and Artistic Works (as amended on
- September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
- Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and
- the Universal Copyright Convention (as revised on July 24, 1971). These
- rights and subject matter take effect in the relevant jurisdiction in
- which the License terms are sought to be enforced according to the
- corresponding provisions of the implementation of those treaty
- provisions in the applicable national law. If the standard suite of
- rights granted under applicable copyright law includes additional rights
- not granted under this License, such additional rights are deemed to be
- included in the License; this License is not intended to restrict the
- license of any rights under applicable law.
=====================================
debian/libpgpainless-cli-java-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libpgpainless-cli-java
-Title: API JavaDoc for PGPainless-CLI
-Author: Paul Schaub <vanitasvitae at fsfe.org>
-Abstract: This is the API JavaDoc for libpgpainless-cli-java
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libpgpainless-cli-java/api/index.html
-Files: /usr/share/doc/libpgpainless-cli-java/api/*.html
=====================================
debian/libpgpainless-cli-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-pgpainless-cli/build/docs/javadoc/* usr/share/doc/libpgpainless-cli-java/api
=====================================
debian/libpgpainless-cli-java-doc.links deleted
=====================================
@@ -1,3 +0,0 @@
-/usr/share/javascript/jquery/jquery.min.js usr/share/doc/libpgpainless-cli-java/api/script-dir/jquery-3.7.1.min.js
-/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/doc/libpgpainless-cli-java/api/script-dir/jquery-ui.min.js
-/usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css usr/share/doc/libpgpainless-cli-java/api/script-dir/jquery-ui.min.css
=====================================
debian/libpgpainless-core-java-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libpgpainless-core-java
-Title: API JavaDoc for PGPainless-Core
-Author: Paul Schaub <vanitasvitae at fsfe.org>
-Abstract: This is the API JavaDoc for libpgpainless-core-java
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libpgpainless-core-java/api/index.html
-Files: /usr/share/doc/libpgpainless-core-java/api/*.html
=====================================
debian/libpgpainless-core-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-pgpainless-core/build/docs/javadoc/* usr/share/doc/libpgpainless-core-java/api
=====================================
debian/libpgpainless-core-java-doc.links deleted
=====================================
@@ -1,3 +0,0 @@
-/usr/share/javascript/jquery/jquery.min.js usr/share/doc/libpgpainless-core-java/api/script-dir/jquery-3.7.1.min.js
-/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/doc/libpgpainless-core-java/api/script-dir/jquery-ui.min.js
-/usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css usr/share/doc/libpgpainless-core-java/api/script-dir/jquery-ui.min.css
=====================================
debian/libpgpainless-sop-java-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libpgpainless-sop-java
-Title: API JavaDoc for PGPainless-SOP
-Author: Paul Schaub <vanitasvitae at fsfe.org>
-Abstract: This is the API JavaDoc for libpgpainless-sop-java
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libpgpainless-sop-java/api/index.html
-Files: /usr/share/doc/libpgpainless-sop-java/api/*.html
=====================================
debian/libpgpainless-sop-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-pgpainless-sop/build/docs/javadoc/* usr/share/doc/libpgpainless-sop-java/api
=====================================
debian/libpgpainless-sop-java-doc.links deleted
=====================================
@@ -1,3 +0,0 @@
-/usr/share/javascript/jquery/jquery.min.js usr/share/doc/libpgpainless-sop-java/api/script-dir/jquery-3.7.1.min.js
-/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/doc/libpgpainless-sop-java/api/script-dir/jquery-ui.min.js
-/usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css usr/share/doc/libpgpainless-sop-java/api/script-dir/jquery-ui.min.css
=====================================
debian/maven.rules
=====================================
@@ -2,4 +2,4 @@
org.pgpainless pgpainless-core bundle s/.*/debian/ * *
org.pgpainless pgpainless-sop bundle s/.*/debian/ * *
org.pgpainless pgpainless-cli bundle s/.*/debian/ * *
-org.bouncycastle s/bc(.*)-jdk15.*/bc$1/ * s/.*/debian/ * *
+org.bouncycastle s/bc(.*)-jdk1.*/bc$1/ * s/.*/debian/ * *
=====================================
debian/patches/0014-bouncycastle-compatibility.patch
=====================================
@@ -0,0 +1,33 @@
+Description: Bouncy Castle compatibility
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/HardwareSecurity.java
++++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/HardwareSecurity.java
+@@ -7,6 +7,7 @@
+ import org.bouncycastle.bcpg.AEADEncDataPacket;
+ import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket;
+ import org.bouncycastle.openpgp.PGPException;
++import org.bouncycastle.openpgp.PGPPrivateKey;
+ import org.bouncycastle.openpgp.PGPSessionKey;
+ import org.bouncycastle.openpgp.operator.PGPDataDecryptor;
+ import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
+@@ -49,7 +50,7 @@
+ private final DecryptionCallback callback;
+ // luckily we can instantiate the BcPublicKeyDataDecryptorFactory with null as argument.
+ private final PublicKeyDataDecryptorFactory factory =
+- new BcPublicKeyDataDecryptorFactory(null);
++ new BcPublicKeyDataDecryptorFactory((PGPPrivateKey) null);
+ private final SubkeyIdentifier subkey;
+
+ /**
+--- a/pgpainless-sop/src/test/java/org/pgpainless/sop/EncryptDecryptRoundTripTest.java
++++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/EncryptDecryptRoundTripTest.java
+@@ -525,7 +525,7 @@
+ "-----END PGP MESSAGE-----").getBytes(StandardCharsets.UTF_8);
+ SessionKey wrongSessionKey = SessionKey.fromString("9:63F741E7FB60247BE59C64158573308F727236482DB7653908C95839E4166AAE");
+
+- assertThrows(SOPGPException.CannotDecrypt.class, () ->
++ assertThrows(SOPGPException.BadData.class, () ->
+ sop.decrypt().withSessionKey(wrongSessionKey).ciphertext(ciphertext));
+ }
+
=====================================
debian/patches/0014-fix-bouncycastle-classnames.patch deleted
=====================================
@@ -1,23 +0,0 @@
-Fix bouncycastle class names
-
-Remove the -jdk18on suffix not used in Debian.
-
-Forwarded: not-needed
-
-Index: pgpainless/pgpainless-core/build.gradle
-===================================================================
---- pgpainless.orig/pgpainless-core/build.gradle
-+++ pgpainless/pgpainless-core/build.gradle
-@@ -17,9 +17,9 @@ dependencies {
- testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
-
- // Bouncy Castle
-- api "org.bouncycastle:bcprov-jdk18on:$bouncyCastleVersion"
-- api "org.bouncycastle:bcutil-jdk18on:$bouncyPgVersion"
-- api "org.bouncycastle:bcpg-jdk18on:$bouncyPgVersion"
-+ api "org.bouncycastle:bcprov:$bouncyCastleVersion"
-+ api "org.bouncycastle:bcutil:$bouncyPgVersion"
-+ api "org.bouncycastle:bcpg:$bouncyPgVersion"
- // api(files("../libs/bcpg-jdk18on-1.70.jar"))
-
- // @Nullable, @Nonnull annotations
=====================================
debian/patches/0015-skip-test-with-expired-key.patch
=====================================
@@ -0,0 +1,29 @@
+Description: Skip the weak RSA key test once the test key has expired
+Origin: backport, https://github.com/pgpainless/pgpainless/commit/bc5c3f98a9d2bb4b0614f9d911889dd6033181aa
+Author: Paul Schaub <vanitasvitae at fsfe.org>
+Bug-Debian: https://bugs.debian.org/1115001
+Bug-Debian: https://bugs.debian.org/1127129
+--- a/pgpainless-core/src/test/java/org/pgpainless/policy/WeakRSAKeyTest.java
++++ b/pgpainless-core/src/test/java/org/pgpainless/policy/WeakRSAKeyTest.java
+@@ -6,11 +6,13 @@
+
+ import static org.junit.jupiter.api.Assertions.assertThrows;
+ import static org.junit.jupiter.api.Assertions.assertTrue;
++import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+ import java.io.ByteArrayInputStream;
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+ import java.nio.charset.StandardCharsets;
++import java.util.Date;
+
+ import org.bouncycastle.openpgp.PGPException;
+ import org.bouncycastle.openpgp.PGPPublicKeyRing;
+@@ -168,6 +170,7 @@
+ @Test
+ public void encryptDecryptRoundTripWithWeakRSAKey() throws IOException, PGPException {
+ PGPSecretKeyRing secretKeys = PGPainless.readKeyRing().secretKeyRing(WEAK_RSA_KEY);
++ assumeTrue(PGPainless.inspectKeyRing(secretKeys).getPrimaryKeyExpirationDate().after(new Date()));
+ PGPPublicKeyRing publicKeys = PGPainless.extractCertificate(secretKeys);
+
+ ByteArrayOutputStream encryptOut = new ByteArrayOutputStream();
=====================================
debian/patches/series
=====================================
@@ -11,5 +11,6 @@
0011-remove-mockito-based-tests.patch
0012-remove-compilejava-release.patch
0013-fix-dependency-on-sop-java-test-fixtures.patch
-0014-fix-bouncycastle-classnames.patch
fix-jar-manifest-plugin.patch
+0014-bouncycastle-compatibility.patch
+0015-skip-test-with-expired-key.patch
=====================================
debian/rules
=====================================
@@ -10,15 +10,7 @@ TEST_SOP_CLASSPATH=$(TEST_CORE_CLASSPATH):/usr/share/java/sop-java.jar:/usr/shar
TEST_CLI_CLASSPATH=$(TEST_SOP_CLASSPATH):/usr/share/java/sop-java-picocli.jar:/usr/share/java/junit5-system-exit.jar:pgpainless-cli/build/libs/pgpainless-cli.jar
JUNIT_OPTIONS=--exclude-classname="^sop\.testsuite\.\S+" --scan-classpath --fail-if-no-tests --disable-ansi-colors
-BUILD_TASKS = jar
-
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
- BUILD_TASKS += javadoc
-endif
-
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- BUILD_TASKS += testJar
-endif
+BUILD_TASKS = jar testJar
%:
dh $@ --buildsystem=gradle --with javahelper,maven_repo_helper
@@ -55,16 +47,10 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
endif
override_dh_install:
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS $(DEB_BUILD_PROFILES))))
dh_install
-else
- dh_install -Nlibpgpainless-core-java-doc -Nlibpgpainless-cli-java-doc -Nlibpgpainless-sop-java-doc
-endif
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
dh_install -p libpgpainless-core-java pgpainless-core/build/libs/pgpainless-core-*tests.jar /usr/share/java
dh_install -p libpgpainless-sop-java pgpainless-sop/build/libs/pgpainless-sop-*tests.jar /usr/share/java
dh_install -p libpgpainless-cli-java pgpainless-cli/build/libs/pgpainless-cli-*tests.jar /usr/share/java
-endif
override_dh_installman:
ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
@@ -72,8 +58,6 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
endif
execute_after_jh_manifest:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
jh_manifest -c "junit5-system-exit.jar bcutil.jar pgpainless-cli.jar" debian/libpgpainless-cli-java/usr/share/java/pgpainless-cli-tests.jar
jh_manifest -c "bcutil.jar pgpainless-core.jar" debian/libpgpainless-core-java/usr/share/java/pgpainless-core-tests.jar
jh_manifest -c "pgpainless-sop.jar" debian/libpgpainless-sop-java/usr/share/java/pgpainless-sop-tests.jar
-endif
View it on GitLab: https://salsa.debian.org/java-team/pgpainless/-/compare/991f04535f78f717832c4703e3c96e3ce606bccd...b6d0142256f1fd0a99e2fdc77d296a7f8b2bf998
--
View it on GitLab: https://salsa.debian.org/java-team/pgpainless/-/compare/991f04535f78f717832c4703e3c96e3ce606bccd...b6d0142256f1fd0a99e2fdc77d296a7f8b2bf998
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20261018/451276d6/attachment.htm>
More information about the pkg-java-commits
mailing list