[Git][debian-gis-team/osmpbf][master] 12 commits: New upstream version 1.4.0
Bas Couwenberg
gitlab at salsa.debian.org
Sun Oct 25 06:20:13 GMT 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / osmpbf
Commits:
fa1bf9ab by Bas Couwenberg at 2020-10-25T05:42:10+01:00
New upstream version 1.4.0
- - - - -
36c03390 by Bas Couwenberg at 2020-10-25T05:42:11+01:00
Update upstream source from tag 'upstream/1.4.0'
Update to upstream version '1.4.0'
with Debian dir 6f6be6dbbc6de7601d33177b9d615b333819f4c1
- - - - -
b6df4a5d by Bas Couwenberg at 2020-10-25T05:42:22+01:00
New upstream release.
- - - - -
af46b416 by Bas Couwenberg at 2020-10-25T05:57:14+01:00
Update copyright file.
- - - - -
bd70590e by Bas Couwenberg at 2020-10-25T05:57:41+01:00
Update upstream metadata.
- - - - -
6990bdc5 by Bas Couwenberg at 2020-10-25T07:07:51+01:00
Add binary package for shared library.
- - - - -
3fed341f by Bas Couwenberg at 2020-10-25T07:07:51+01:00
Update lintian overrides.
- - - - -
1bb15d2b by Bas Couwenberg at 2020-10-25T07:07:51+01:00
Drop patches, applied upstream.
- - - - -
5b4ac226 by Bas Couwenberg at 2020-10-25T07:07:51+01:00
Update README filename in docs file.
- - - - -
d7f1d2af by Bas Couwenberg at 2020-10-25T07:07:51+01:00
Add patch to support hardening flags.
- - - - -
786dd551 by Bas Couwenberg at 2020-10-25T07:07:51+01:00
Add symbols file with pkgkde-symbolshelper.
- - - - -
6fc7fd05 by Bas Couwenberg at 2020-10-25T07:07:51+01:00
Set distribution to experimental.
- - - - -
30 changed files:
- + .github/workflows/c.yml
- + .github/workflows/java.yml
- .gitignore
- + COPYING
- COPYING.osmpbf → COPYING.LESSER
- README → README.md
- build.xml
- debian/changelog
- debian/control
- debian/copyright
- debian/libosmpbf-dev.docs
- debian/libosmpbf-dev.install
- + debian/libosmpbf1.install
- + debian/libosmpbf1.symbols
- − debian/patches/copy-headers.patch
- + debian/patches/hardening.patch
- − debian/patches/optimize_for-LITE_RUNTIME.patch
- − debian/patches/proto2-syntax.patch
- debian/patches/series
- debian/rules
- − debian/source/lintian-overrides
- debian/upstream/metadata
- include/osmpbf/osmpbf.h
- pom.xml
- + redhat/osmpbf.spec
- src/Makefile
- src/fileformat.proto
- src/osmformat.proto
- tools/Makefile
- tools/osmpbf-outline.cpp
Changes:
=====================================
.github/workflows/c.yml
=====================================
@@ -0,0 +1,12 @@
+name: C CI
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout at v2
+ - run: sudo apt-get install protobuf-compiler libprotobuf-dev
+ - run: make -C src
=====================================
.github/workflows/java.yml
=====================================
@@ -0,0 +1,20 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout at v2
+ - name: Set up JDK 1.8
+ uses: actions/setup-java at v1
+ with:
+ java-version: 1.8
+ - name: Install Protoc
+ uses: arduino/setup-protoc at v1
+ with:
+ version: '3.x'
+ - name: Build with Maven
+ run: mvn -B package --file pom.xml
=====================================
.gitignore
=====================================
@@ -7,5 +7,6 @@ include/osmpbf/*.pb.h
src/*.pb.h
src/*.pb.o
src/libosmpbf.a
+target
*.swp
obj-x86_64-linux-gnu
=====================================
COPYING
=====================================
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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 HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>..
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
=====================================
COPYING.osmpbf → COPYING.LESSER
=====================================
=====================================
README → README.md
=====================================
@@ -1,59 +1,94 @@
-OSMPBF
-======
+# OSMPBF
Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
PBF (Protocol buffer Binary Format) is a binary file format for OpenStreetMap
data that uses Google Protocol Buffers as low-level storage.
-For more information see http://wiki.openstreetmap.org/wiki/PBF_Format .
+For more information see https://wiki.openstreetmap.org/wiki/PBF_Format ..
-Java Version
-============
+## Java Version
-To build the osmpbf.jar file run:
- ant
+We publish the Java library to [Maven Central](https://search.maven.org/):
+
+```xml
+<dependency>
+ <groupId>org.openstreetmap.pbf</groupId>
+ <artifactId>osmpbf</artifactId>
+ <version>1.4.0</version>
+</dependency>
+```
+
+To build the Java library run:
+
+```sh
+mvn package
+```
For a Java usage example, see src.java/crosby/binary/test/ReadFileExample.java
-C Version
-=========
+## C Version
To compile:
- make -C src
+
+```sh
+make -C src
+```
To install:
- make -C src install
+
+```sh
+make -C src install
+```
There is a tool named osmpbf-outline that shows a debug output of the contents
of a PBF file. To compile it:
- make -C tools
+
+```sh
+make -C tools
+```
-Using the C Library
-===================
+## Using the C Library
To include in your program use:
+```c
#include <osmpbf/osmpbf.h>
+```
and link with:
- -pthread -lz -lprotobuf-lite -losmpbf
+```
+-pthread -lz -lprotobuf-lite -losmpbf
+```
-Debian/Ubuntu Packages
-======================
+
+## Debian/Ubuntu Packages
To build the Debian/Ubuntu packages:
- debuild -I -us -uc
+
+```sh
+debuild -I -us -uc
+```
To install the Debian/Ubuntu packages:
- sudo dpkg --install ../libosmpbf-dev_*.deb
- sudo dpkg --install ../libosmpbf-java_*.deb
- sudo dpkg --install ../osmpbf-bin_*.deb
+
+```sh
+sudo dpkg --install ../libosmpbf-dev_*.deb
+sudo dpkg --install ../libosmpbf-java_*.deb
+sudo dpkg --install ../osmpbf-bin_*.deb
+```
To clean up after:
- debclean
+```sh
+debclean
+```
+
+## License
+
+The .proto definition files and osmpbf.h are licensed under the MIT license.
+The other source code is licensed under the LGPL v3+.
=====================================
build.xml
=====================================
@@ -26,6 +26,7 @@
<src path="${src.generated.dir}"/>
<classpath>
<fileset file="/usr/share/java/protobuf.jar"/>
+ <fileset file="/usr/share/java/protobuf-java.jar"/>
</classpath>
</javac>
</target>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+osmpbf (1.4.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update copyright file.
+ * Update upstream metadata.
+ * Add binary package for shared library.
+ * Update lintian overrides.
+ * Drop patches, applied upstream.
+ * Update README filename in docs file.
+ * Add patch to support hardening flags.
+ * Add symbols file with pkgkde-symbolshelper.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 25 Oct 2020 06:46:43 +0100
+
osmpbf (1.3.3-15) unstable; urgency=medium
* Rebuild with protobuf 3.12.2.
=====================================
debian/control
=====================================
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 10~),
libprotobuf-dev (>= 3.12.3),
libprotobuf-java (>= 3.12.3),
protobuf-compiler (>= 3.12.3),
- maven-repo-helper
+ maven-repo-helper,
+ pkg-kde-tools
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/osmpbf
Vcs-Git: https://salsa.debian.org/debian-gis-team/osmpbf.git
@@ -26,10 +27,23 @@ Description: Java access library for OpenStreetMap PBF file format
.
This package provides a Java library.
+Package: libosmpbf1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: OpenStreetMap PBF file format library
+ Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
+ PBF (Protocol buffer Binary Format) is a binary file format for OpenStreetMap
+ data that uses Google Protocol Buffers as low-level storage.
+ .
+ This package provides the shared library.
+
Package: libosmpbf-dev
Architecture: any
Section: libdevel
-Depends: libprotobuf-dev,
+Depends: libosmpbf1 (= ${binary:Version}),
+ libprotobuf-dev,
${misc:Depends}
Description: C headers for OpenStreetMap PBF file format
Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
=====================================
debian/copyright
=====================================
@@ -1,12 +1,18 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: OSMPBF
-Upstream-Contact: Scott A. Crosby <scott at sacrosby.com>
+Upstream-Contact: OpenStreetMap developers <dev at openstreetmap.org>
Source: https://github.com/openstreetmap/OSM-binary
Files: *
Copyright: 2010, Scott A. Crosby <scott at sacrosby.com>
License: LGPL-3+
+Files: include/osmpbf/osmpbf.h
+ src/*.proto
+Copyright: 2010, 2012, Scott A. Crosby <scott at sacrosby.com>
+ 2011-2014, Jochen Topf <jochen at topf.org>
+License: Expat
+
Files: debian/*
Copyright: 2010-2012, Giovanni Mascellani <gio at debian.org>
2011-2013, David Paleino <dapal at debian.org>
@@ -46,3 +52,22 @@ License: GPL-3+
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in "/usr/share/common-licenses/GPL-3".
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
=====================================
debian/libosmpbf-dev.docs
=====================================
@@ -1,3 +1,3 @@
src/fileformat.proto
src/osmformat.proto
-README
+README.md
=====================================
debian/libosmpbf-dev.install
=====================================
@@ -1,2 +1,3 @@
usr/include/
-usr/lib/
+usr/lib/*/libosmpbf.a
+usr/lib/*/libosmpbf.so
=====================================
debian/libosmpbf1.install
=====================================
@@ -0,0 +1 @@
+usr/lib/*/libosmpbf.so.*
=====================================
debian/libosmpbf1.symbols
=====================================
@@ -0,0 +1,498 @@
+# SymbolsHelper-Confirmed: 1.4.0 amd64
+libosmpbf.so.1 #PACKAGE# #MINVER#
+* Build-Depends-Package: libosmpbf-dev
+ _ZN29TableStruct_osmformat_2eproto7offsetsE at Base 1.4.0
+ _ZN30TableStruct_fileformat_2eproto7offsetsE at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader5ClearEv at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF10BlobHeader9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10BlobHeaderC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF10BlobHeaderC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10BlobHeaderC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF10BlobHeaderC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10BlobHeaderD0Ev at Base 1.4.0
+ _ZN6OSMPBF10BlobHeaderD1Ev at Base 1.4.0
+ _ZN6OSMPBF10BlobHeaderD2Ev at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes5ClearEv at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10DenseNodes9_Internal9denseinfoEPKS0_ at Base 1.4.0
+ _ZN6OSMPBF10DenseNodesC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF10DenseNodesC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10DenseNodesC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF10DenseNodesC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10DenseNodesD0Ev at Base 1.4.0
+ _ZN6OSMPBF10DenseNodesD1Ev at Base 1.4.0
+ _ZN6OSMPBF10DenseNodesD2Ev at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox5ClearEv at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBox9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBoxC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBoxC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBoxC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBoxC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBoxD0Ev at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBoxD1Ev at Base 1.4.0
+ _ZN6OSMPBF10HeaderBBoxD2Ev at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock5ClearEv at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlock9_Internal4bboxEPKS0_ at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlockC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlockC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlockC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlockC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlockD0Ev at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlockD1Ev at Base 1.4.0
+ _ZN6OSMPBF11HeaderBlockD2Ev at Base 1.4.0
+ _ZN6OSMPBF11StringTable12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF11StringTable14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF11StringTable16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF11StringTable21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF11StringTable5ClearEv at Base 1.4.0
+ _ZN6OSMPBF11StringTable8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF11StringTable8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11StringTable9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF11StringTable9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF11StringTable9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11StringTableC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF11StringTableC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11StringTableC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF11StringTableC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF11StringTableD0Ev at Base 1.4.0
+ _ZN6OSMPBF11StringTableD1Ev at Base 1.4.0
+ _ZN6OSMPBF11StringTableD2Ev at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock5ClearEv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlock9_Internal11stringtableEPKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlockC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlockC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlockC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlockC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlockD0Ev at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlockD1Ev at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveBlockD2Ev at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup5ClearEv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroup9_Internal5denseEPKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroupC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroupC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroupC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroupC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroupD0Ev at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroupD1Ev at Base 1.4.0
+ _ZN6OSMPBF14PrimitiveGroupD2Ev at Base 1.4.0
+ _ZN6OSMPBF22_Way_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF23_Blob_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF23_Info_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF23_Node_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF27Relation_MemberType_IsValidEi at Base 1.4.0
+ _ZN6OSMPBF27_Relation_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF28_ChangeSet_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF28_DenseInfo_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF29_BlobHeader_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF29_DenseNodes_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF29_HeaderBBox_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF30Relation_MemberType_descriptorEv at Base 1.4.0
+ _ZN6OSMPBF30_HeaderBlock_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF30_StringTable_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF33_PrimitiveBlock_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF33_PrimitiveGroup_default_instance_E at Base 1.4.0
+ _ZN6OSMPBF3Way12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF3Way14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF3Way16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF3Way21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF3Way5ClearEv at Base 1.4.0
+ _ZN6OSMPBF3Way8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF3Way8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF3Way9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF3Way9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF3Way9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF3Way9_Internal4infoEPKS0_ at Base 1.4.0
+ _ZN6OSMPBF3WayC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF3WayC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF3WayC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF3WayC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF3WayD0Ev at Base 1.4.0
+ _ZN6OSMPBF3WayD1Ev at Base 1.4.0
+ _ZN6OSMPBF3WayD2Ev at Base 1.4.0
+ _ZN6OSMPBF4Blob12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF4Blob14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF4Blob16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF4Blob21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF4Blob5ClearEv at Base 1.4.0
+ _ZN6OSMPBF4Blob8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF4Blob8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4Blob9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF4Blob9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF4Blob9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4BlobC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF4BlobC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4BlobC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF4BlobC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4BlobD0Ev at Base 1.4.0
+ _ZN6OSMPBF4BlobD1Ev at Base 1.4.0
+ _ZN6OSMPBF4BlobD2Ev at Base 1.4.0
+ _ZN6OSMPBF4Info12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF4Info14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF4Info16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF4Info21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF4Info5ClearEv at Base 1.4.0
+ _ZN6OSMPBF4Info8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF4Info8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4Info9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF4Info9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF4Info9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4InfoC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF4InfoC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4InfoC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF4InfoC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4InfoD0Ev at Base 1.4.0
+ _ZN6OSMPBF4InfoD1Ev at Base 1.4.0
+ _ZN6OSMPBF4InfoD2Ev at Base 1.4.0
+ _ZN6OSMPBF4Node12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF4Node14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF4Node16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF4Node21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF4Node5ClearEv at Base 1.4.0
+ _ZN6OSMPBF4Node8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF4Node8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4Node9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF4Node9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF4Node9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4Node9_Internal4infoEPKS0_ at Base 1.4.0
+ _ZN6OSMPBF4NodeC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF4NodeC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4NodeC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF4NodeC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF4NodeD0Ev at Base 1.4.0
+ _ZN6OSMPBF4NodeD1Ev at Base 1.4.0
+ _ZN6OSMPBF4NodeD2Ev at Base 1.4.0
+ _ZN6OSMPBF8Relation12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF8Relation14MemberType_MAXE at Base 1.4.0
+ _ZN6OSMPBF8Relation14MemberType_MINE at Base 1.4.0
+ _ZN6OSMPBF8Relation14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF8Relation16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF8Relation20MemberType_ARRAYSIZEE at Base 1.4.0
+ _ZN6OSMPBF8Relation21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF8Relation3WAYE at Base 1.4.0
+ _ZN6OSMPBF8Relation4NODEE at Base 1.4.0
+ _ZN6OSMPBF8Relation5ClearEv at Base 1.4.0
+ _ZN6OSMPBF8Relation8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF8Relation8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF8Relation8RELATIONE at Base 1.4.0
+ _ZN6OSMPBF8Relation9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF8Relation9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF8Relation9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF8Relation9_Internal4infoEPKS0_ at Base 1.4.0
+ _ZN6OSMPBF8RelationC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF8RelationC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF8RelationC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF8RelationC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF8RelationD0Ev at Base 1.4.0
+ _ZN6OSMPBF8RelationD1Ev at Base 1.4.0
+ _ZN6OSMPBF8RelationD2Ev at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet5ClearEv at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF9ChangeSet9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9ChangeSetC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF9ChangeSetC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9ChangeSetC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF9ChangeSetC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9ChangeSetD0Ev at Base 1.4.0
+ _ZN6OSMPBF9ChangeSetD1Ev at Base 1.4.0
+ _ZN6OSMPBF9ChangeSetD2Ev at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo12InternalSwapEPS0_ at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo14_InternalParseEPKcPN6google8protobuf8internal12ParseContextE at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo16default_instanceEv at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo21InitAsDefaultInstanceEv at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo5ClearEv at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo8CopyFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo8CopyFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo9ArenaDtorEPv at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo9MergeFromERKN6google8protobuf7MessageE at Base 1.4.0
+ _ZN6OSMPBF9DenseInfo9MergeFromERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9DenseInfoC1EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF9DenseInfoC1ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9DenseInfoC2EPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZN6OSMPBF9DenseInfoC2ERKS0_ at Base 1.4.0
+ _ZN6OSMPBF9DenseInfoD0Ev at Base 1.4.0
+ _ZN6OSMPBF9DenseInfoD1Ev at Base 1.4.0
+ _ZN6OSMPBF9DenseInfoD2Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF14PrimitiveGroupEED1Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF14PrimitiveGroupEED2Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF3WayEED1Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF3WayEED2Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF4NodeEED1Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF4NodeEED2Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF8RelationEED1Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF8RelationEED2Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF9ChangeSetEED1Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf16RepeatedPtrFieldIN6OSMPBF9ChangeSetEED2Ev at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF10BlobHeaderEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF10DenseNodesEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF10HeaderBBoxEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF11HeaderBlockEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF11StringTableEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF14PrimitiveBlockEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF14PrimitiveGroupEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF3WayEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF4BlobEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF4InfoEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF4NodeEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF8RelationEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF9ChangeSetEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6OSMPBF9DenseInfoEJEEEPT_PS1_DpOT0_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal11VarintParseIjEEPKcS4_PT_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal11VarintParseImEEPKcS4_PT_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal12ParseContext12ParseMessageIN6OSMPBF4InfoEEEPKcPT_S7_ at Base 1.4.0
+ _ZN6google8protobuf8internal14ArenaStringPtr14CreateInstanceEPNS0_5ArenaEPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal16InternalMetadata11DoMergeFromINS0_15UnknownFieldSetEEEvRKT_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal16InternalMetadata27mutable_unknown_fields_slowINS0_15UnknownFieldSetEEEPT_v at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal18EpsCopyInputStream16ReadPackedVarintIZNS1_16PackedEnumParserINS0_15UnknownFieldSetEEEPKcPvS7_PNS1_12ParseContextEPFbiEPNS1_16InternalMetadataEiEUlmE_EES7_S7_T_ at Base 1.4.0
+ _ZN6google8protobuf8internal18EpsCopyInputStream9PushLimitEPKci at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6OSMPBF14PrimitiveGroupEE5MergeERKS4_PS4_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6OSMPBF3WayEE5MergeERKS4_PS4_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6OSMPBF4NodeEE5MergeERKS4_PS4_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6OSMPBF8RelationEE5MergeERKS4_PS4_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6OSMPBF9ChangeSetEE5MergeERKS4_PS4_ at Base 1.4.0
+ _ZN6google8protobuf8internal18ReadVarintZigZag64EPPKc at Base 1.4.0
+ _ZN6google8protobuf8internal20RepeatedPtrFieldBase12InternalSwapEPS2_ at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6OSMPBF14PrimitiveGroupEE11TypeHandlerEEEvPPvSA_ii at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6OSMPBF3WayEE11TypeHandlerEEEvPPvSA_ii at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6OSMPBF4NodeEE11TypeHandlerEEEvPPvSA_ii at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6OSMPBF8RelationEE11TypeHandlerEEEvPPvSA_ii at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6OSMPBF9ChangeSetEE11TypeHandlerEEEvPPvSA_ii at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase5ClearINS0_16RepeatedPtrFieldIN6OSMPBF14PrimitiveGroupEE11TypeHandlerEEEvv at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase5ClearINS0_16RepeatedPtrFieldIN6OSMPBF3WayEE11TypeHandlerEEEvv at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase5ClearINS0_16RepeatedPtrFieldIN6OSMPBF4NodeEE11TypeHandlerEEEvv at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase5ClearINS0_16RepeatedPtrFieldIN6OSMPBF8RelationEE11TypeHandlerEEEvv at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase5ClearINS0_16RepeatedPtrFieldIN6OSMPBF9ChangeSetEE11TypeHandlerEEEvv at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectINS1_16InternalMetadata9ContainerINS0_15UnknownFieldSetEEEEEvPv at Base 1.4.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvPv at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader30RequiredFieldsByteSizeFallbackEv at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF10BlobHeader3NewEv at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF10DenseNodes3NewEv at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox30RequiredFieldsByteSizeFallbackEv at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF10HeaderBBox3NewEv at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF11HeaderBlock3NewEv at Base 1.4.0
+ _ZNK6OSMPBF11StringTable11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF11StringTable12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF11StringTable13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF11StringTable13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF11StringTable13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF11StringTable18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF11StringTable3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF11StringTable3NewEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveBlock3NewEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF14PrimitiveGroup3NewEv at Base 1.4.0
+ _ZNK6OSMPBF3Way11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF3Way12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF3Way13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF3Way13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF3Way13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF3Way18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF3Way3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF3Way3NewEv at Base 1.4.0
+ _ZNK6OSMPBF4Blob11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF4Blob12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF4Blob13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF4Blob13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF4Blob13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF4Blob18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF4Blob3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF4Blob3NewEv at Base 1.4.0
+ _ZNK6OSMPBF4Info11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF4Info12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF4Info13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF4Info13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF4Info13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF4Info18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF4Info3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF4Info3NewEv at Base 1.4.0
+ _ZNK6OSMPBF4Node11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF4Node12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF4Node13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF4Node13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF4Node13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF4Node18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF4Node30RequiredFieldsByteSizeFallbackEv at Base 1.4.0
+ _ZNK6OSMPBF4Node3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF4Node3NewEv at Base 1.4.0
+ _ZNK6OSMPBF8Relation11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF8Relation12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF8Relation13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF8Relation13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF8Relation13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF8Relation18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF8Relation3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF8Relation3NewEv at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF9ChangeSet3NewEv at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo11GetMetadataEv at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo12ByteSizeLongEv at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo13GetCachedSizeEv at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo13IsInitializedEv at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo13SetCachedSizeEi at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo18_InternalSerializeEPhPN6google8protobuf2io19EpsCopyOutputStreamE at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo3NewEPN6google8protobuf5ArenaE at Base 1.4.0
+ _ZNK6OSMPBF9DenseInfo3NewEv at Base 1.4.0
+ _ZNK6google8protobuf11MessageLite16InternalGetTableEv at Base 1.4.0
+ _ZNK6google8protobuf11MessageLite8GetArenaEv at Base 1.4.0
+ _ZTIN6OSMPBF10BlobHeaderE at Base 1.4.0
+ _ZTIN6OSMPBF10DenseNodesE at Base 1.4.0
+ _ZTIN6OSMPBF10HeaderBBoxE at Base 1.4.0
+ _ZTIN6OSMPBF11HeaderBlockE at Base 1.4.0
+ _ZTIN6OSMPBF11StringTableE at Base 1.4.0
+ _ZTIN6OSMPBF14PrimitiveBlockE at Base 1.4.0
+ _ZTIN6OSMPBF14PrimitiveGroupE at Base 1.4.0
+ _ZTIN6OSMPBF3WayE at Base 1.4.0
+ _ZTIN6OSMPBF4BlobE at Base 1.4.0
+ _ZTIN6OSMPBF4InfoE at Base 1.4.0
+ _ZTIN6OSMPBF4NodeE at Base 1.4.0
+ _ZTIN6OSMPBF8RelationE at Base 1.4.0
+ _ZTIN6OSMPBF9ChangeSetE at Base 1.4.0
+ _ZTIN6OSMPBF9DenseInfoE at Base 1.4.0
+ _ZTSN6OSMPBF10BlobHeaderE at Base 1.4.0
+ _ZTSN6OSMPBF10DenseNodesE at Base 1.4.0
+ _ZTSN6OSMPBF10HeaderBBoxE at Base 1.4.0
+ _ZTSN6OSMPBF11HeaderBlockE at Base 1.4.0
+ _ZTSN6OSMPBF11StringTableE at Base 1.4.0
+ _ZTSN6OSMPBF14PrimitiveBlockE at Base 1.4.0
+ _ZTSN6OSMPBF14PrimitiveGroupE at Base 1.4.0
+ _ZTSN6OSMPBF3WayE at Base 1.4.0
+ _ZTSN6OSMPBF4BlobE at Base 1.4.0
+ _ZTSN6OSMPBF4InfoE at Base 1.4.0
+ _ZTSN6OSMPBF4NodeE at Base 1.4.0
+ _ZTSN6OSMPBF8RelationE at Base 1.4.0
+ _ZTSN6OSMPBF9ChangeSetE at Base 1.4.0
+ _ZTSN6OSMPBF9DenseInfoE at Base 1.4.0
+ _ZTVN6OSMPBF10BlobHeaderE at Base 1.4.0
+ _ZTVN6OSMPBF10DenseNodesE at Base 1.4.0
+ _ZTVN6OSMPBF10HeaderBBoxE at Base 1.4.0
+ _ZTVN6OSMPBF11HeaderBlockE at Base 1.4.0
+ _ZTVN6OSMPBF11StringTableE at Base 1.4.0
+ _ZTVN6OSMPBF14PrimitiveBlockE at Base 1.4.0
+ _ZTVN6OSMPBF14PrimitiveGroupE at Base 1.4.0
+ _ZTVN6OSMPBF3WayE at Base 1.4.0
+ _ZTVN6OSMPBF4BlobE at Base 1.4.0
+ _ZTVN6OSMPBF4InfoE at Base 1.4.0
+ _ZTVN6OSMPBF4NodeE at Base 1.4.0
+ _ZTVN6OSMPBF8RelationE at Base 1.4.0
+ _ZTVN6OSMPBF9ChangeSetE at Base 1.4.0
+ _ZTVN6OSMPBF9DenseInfoE at Base 1.4.0
+ descriptor_table_fileformat_2eproto at Base 1.4.0
+ descriptor_table_osmformat_2eproto at Base 1.4.0
+ scc_info_BlobHeader_fileformat_2eproto at Base 1.4.0
+ scc_info_Blob_fileformat_2eproto at Base 1.4.0
+ scc_info_ChangeSet_osmformat_2eproto at Base 1.4.0
+ scc_info_DenseInfo_osmformat_2eproto at Base 1.4.0
+ scc_info_DenseNodes_osmformat_2eproto at Base 1.4.0
+ scc_info_HeaderBBox_osmformat_2eproto at Base 1.4.0
+ scc_info_HeaderBlock_osmformat_2eproto at Base 1.4.0
+ scc_info_Info_osmformat_2eproto at Base 1.4.0
+ scc_info_Node_osmformat_2eproto at Base 1.4.0
+ scc_info_PrimitiveBlock_osmformat_2eproto at Base 1.4.0
+ scc_info_PrimitiveGroup_osmformat_2eproto at Base 1.4.0
+ scc_info_Relation_osmformat_2eproto at Base 1.4.0
+ scc_info_StringTable_osmformat_2eproto at Base 1.4.0
+ scc_info_Way_osmformat_2eproto at Base 1.4.0
=====================================
debian/patches/copy-headers.patch deleted
=====================================
@@ -1,25 +0,0 @@
-Description: Copy can fail during parallel builds.
- For example the failed mipsel build:
- .
- protoc --proto_path=. --cpp_out=. fileformat.proto
- protoc --proto_path=. --cpp_out=. osmformat.proto
- cp *.pb.h ../include/osmpbf/
- cp *.pb.h ../include/osmpbf/
- g++ -g -O2 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long -fPIC -c -o osmformat.pb.o osmformat.pb.cc
- cp: cannot create regular file '../include/osmpbf/fileformat.pb.h': File exists
- .
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/OSM-binary/pull/16
-Applied-Upstream: https://github.com/openstreetmap/OSM-binary/commit/b7a621927bc9d881a7f9fd412615aa1b1321e019
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -20,7 +20,7 @@ libosmpbf.a: fileformat.pb.o osmformat.p
-
- %.pb.cc ../include/osmpbf/%.pb.h: %.proto
- $(PROTOC) --proto_path=. --cpp_out=. $<
-- cp *.pb.h ../include/osmpbf/
-+ cp -v $(subst .proto,.pb.h,$<) ../include/osmpbf/
-
- install:
- install -m 755 -d $(DESTDIR)$(PREFIX)/lib
=====================================
debian/patches/hardening.patch
=====================================
@@ -0,0 +1,30 @@
+Description: Support hardening buildflags set in the environment.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/OSM-binary/pull/48
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -19,10 +19,10 @@ libosmpbf.a: fileformat.pb.o osmformat.p
+ $(AR) -cr $@ fileformat.pb.o osmformat.pb.o
+
+ libosmpbf.so: fileformat.pb.o osmformat.pb.o
+- $(CXX) -shared -Wl,-soname,$(SONAME) -o $@ fileformat.pb.o osmformat.pb.o
++ $(CXX) $(CPPFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ fileformat.pb.o osmformat.pb.o
+
+ %.pb.o: %.pb.cc
+- $(CXX) $(CXXFLAGS) -fPIC -c -o $@ $<
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c -o $@ $<
+
+ %.pb.cc ../include/osmpbf/%.pb.h: %.proto
+ $(PROTOC) --proto_path=. --cpp_out=. $<
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -12,7 +12,7 @@ LDFLAGS += -L../src -pthread -lz -lprot
+ all: osmpbf-outline
+
+ osmpbf-outline: osmpbf-outline.cpp
+- $(CXX) $(CXXFLAGS) -o $@ $< $(LDFLAGS)
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $< $(LDFLAGS)
+
+ install:
+ install -m 755 -d $(DESTDIR)$(PREFIX)/bin
=====================================
debian/patches/optimize_for-LITE_RUNTIME.patch deleted
=====================================
@@ -1,45 +0,0 @@
-Description: Disable deprecated optimize_for = LITE_RUNTIME option.
- Fixes warnings with protobuf >= 3.8.0:
- .
- The optimize_for = LITE_RUNTIME option is no longer supported by protobuf
- Java code generator and is ignored--protoc will always generate full
- runtime code for Java. To use Java Lite runtime, users should use the
- Java Lite plugin instead. See:
- https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/OSM-binary/pull/38
-Applied-Upstream: https://github.com/openstreetmap/OSM-binary/commit/982393066ec05bea522bcf28e11e133e3aef447e
-
---- a/src/fileformat.proto
-+++ b/src/fileformat.proto
-@@ -17,7 +17,7 @@
-
- syntax = "proto2";
-
--option optimize_for = LITE_RUNTIME;
-+//option optimize_for = LITE_RUNTIME;
- option java_package = "crosby.binary";
- package OSMPBF;
-
---- a/src/osmformat.proto
-+++ b/src/osmformat.proto
-@@ -17,7 +17,7 @@
-
- syntax = "proto2";
-
--option optimize_for = LITE_RUNTIME;
-+//option optimize_for = LITE_RUNTIME;
- option java_package = "crosby.binary";
- package OSMPBF;
-
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -5,7 +5,7 @@ CXX ?= g++
- CXXFLAGS ?= -g
-
- CXXFLAGS += -I../include -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
--LDFLAGS += -L../src -pthread -lz -lprotobuf-lite -losmpbf
-+LDFLAGS += -L../src -pthread -lz -lprotobuf -losmpbf
-
- .PHONY: clean install
-
=====================================
debian/patches/proto2-syntax.patch deleted
=====================================
@@ -1,27 +0,0 @@
-Description: Specify proto2 syntax to fix warnings with protobuf 3.0.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/openstreetmap/OSM-binary/pull/29
-Applied-Upstream: https://github.com/openstreetmap/OSM-binary/commit/0f48055af1f913d13e4c817c90cddbf6ef24e20b
-
---- a/src/fileformat.proto
-+++ b/src/fileformat.proto
-@@ -15,6 +15,8 @@
-
- */
-
-+syntax = "proto2";
-+
- option optimize_for = LITE_RUNTIME;
- option java_package = "crosby.binary";
- package OSMPBF;
---- a/src/osmformat.proto
-+++ b/src/osmformat.proto
-@@ -15,6 +15,8 @@
-
- */
-
-+syntax = "proto2";
-+
- option optimize_for = LITE_RUNTIME;
- option java_package = "crosby.binary";
- package OSMPBF;
=====================================
debian/patches/series
=====================================
@@ -1,3 +1 @@
-copy-headers.patch
-proto2-syntax.patch
-optimize_for-LITE_RUNTIME.patch
+hardening.patch
=====================================
debian/rules
=====================================
@@ -7,10 +7,12 @@
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-CXXFLAGS += $(CPPFLAGS)
+include /usr/share/dpkg/pkg-info.mk
+
+UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
%:
- dh $@ --buildsystem makefile
+ dh $@ --with pkgkde_symbolshelper --buildsystem makefile
override_dh_auto_clean:
dh_auto_clean --buildsystem ant
@@ -30,7 +32,7 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install --buildsystem ant
- dh_auto_install -Dsrc -- PREFIX=/usr
+ dh_auto_install -Dsrc -- PREFIX=/usr LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
dh_auto_install -Dtools -- PREFIX=/usr
override_dh_installchangelogs:
@@ -40,3 +42,6 @@ override_dh_install:
dh_install --list-missing
mh_installjar -plibosmpbf-java -l pom.xml osmpbf.jar
mh_installpom -plibosmpbf-java pom.xml
+
+override_dh_makeshlibs:
+ dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)
=====================================
debian/source/lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# Not worth the effort
-testsuite-autopkgtest-missing
-
=====================================
debian/upstream/metadata
=====================================
@@ -1,6 +1,5 @@
---
Bug-Database: https://github.com/openstreetmap/OSM-binary/issues
Bug-Submit: https://github.com/openstreetmap/OSM-binary/issues/new
-Contact: Scott A. Crosby <scott at sacrosby.com>
Repository: https://github.com/openstreetmap/OSM-binary.git
Repository-Browse: https://github.com/openstreetmap/OSM-binary
=====================================
include/osmpbf/osmpbf.h
=====================================
@@ -1,5 +1,16 @@
#ifndef OSMPBF_H
#define OSMPBF_H
+/*
+ Copyright 2011-2014 Jochen Topf <jochen at topf.org>,
+ Copyrigt 2012 Scott A. Crosby. <scott at sacrosby.com>
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ */
// this describes the low-level blob storage
#include <osmpbf/fileformat.pb.h> // IWYU pragma: export
=====================================
pom.xml
=====================================
@@ -3,13 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>crosby.binary</groupId>
+ <groupId>org.openstreetmap.pbf</groupId>
<artifactId>osmpbf</artifactId>
<packaging>jar</packaging>
- <version>1.3.3</version>
+ <version>1.4.0</version>
<name>OSM-Binary</name>
<description>Library for the OpenStreetMap PBF format</description>
- <url>https://github.com/scrosby/OSM-binary</url>
+ <url>https://github.com/openstreetmap/OSM-binary</url>
<licenses>
<license>
<name>GNU General Lesser Public License (LGPL) version 3.0</name>
@@ -18,9 +18,20 @@
</license>
</licenses>
<scm>
- <url>https://github.com/scrosby/OSM-binary</url>
- <connection>https://github.com/scrosby/OSM-binary.git</connection>
+ <url>https://github.com/openstreetmap/OSM-binary</url>
+ <connection>https://github.com/openstreetmap/OSM-binary.git</connection>
</scm>
+ <developers>
+ <developer>
+ <id>osm-dev</id>
+ <name>OpenStreetMap developers</name>
+ <email>dev at openstreetmap.org</email>
+ </developer>
+ </developers>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<sourceDirectory>${basedir}/src.java</sourceDirectory>
@@ -32,20 +43,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
- <groupId>com.google.protobuf.tools</groupId>
- <artifactId>maven-protoc-plugin</artifactId>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>0.6.1</version>
+ <configuration>
+ <protocExecutable>protoc</protocExecutable>
+ </configuration>
<executions>
<execution>
<id>generate-sources</id>
<goals>
<goal>compile</goal>
+ <goal>test-compile</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
@@ -57,6 +74,50 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -71,14 +132,26 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.4.1</version>
+ <version>3.13.0</version>
</dependency>
</dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
</project>
=====================================
redhat/osmpbf.spec
=====================================
@@ -0,0 +1,45 @@
+Name: osmpbf
+Version: 1.3.3
+Release: 2%{?dist}
+Summary: C version of the PBF library code
+License: LGPL-3+
+URL: https://github.com/scrosby/OSM-binary
+Source0: OSM-binary-%{version}.tar.bz2
+BuildRequires: protobuf-devel, protobuf-lite-devel
+BuildRequires: gcc, gcc-c++
+
+%description
+Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
+PBF (Protocol buffer Binary Format) is a binary file format for OpenStreetMap
+data that uses Google Protocol Buffers as low-level storage.
+
+For more information see http://wiki.openstreetmap.org/wiki/PBF_Format
+
+%prep
+%setup -q -n OSM-binary-%{version}
+
+%build
+%{__make} -C src %{?jobs:-j%jobs}
+%{__make} -C tools %{?jobs:-j%jobs}
+
+%install
+%{__make} -C src DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} install
+%{__make} -C tools DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+install -m 644 tools/osmpbf-outline.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+
+%files
+%defattr(-, root, root, -)
+%doc COPYING.osmpbf README ReleaseNotes.txt
+%dir %{_includedir}/osmpbf
+%{_includedir}/osmpbf/*.h
+%{_bindir}/osmpbf-outline
+%{_mandir}/man1/osmpbf-outline.1*
+%{_libdir}/libosmpbf.a
+
+%changelog
+* Wed Mar 19 2014 <kay.diam at gmail.com> - 1.3.3-2
+- Bump version
+- Updated spec file to use normal make
+
+* Mon Sep 23 2013 <kay.diam at gmail.com> - 1.3.1-1
+- Initial release
=====================================
src/Makefile
=====================================
@@ -1,30 +1,39 @@
# these default settings can be overridden by setting environment variables
PREFIX ?= /usr/local
+LIBDIR ?= $(PREFIX)/lib
CXX ?= g++
CXXFLAGS ?= -O3
AR ?= ar
PROTOC ?= protoc
+SONAME ?= libosmpbf.so.1
+VERSION ?= 1.3.3
CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
.PHONY: clean install
-all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
+all: libosmpbf.a libosmpbf.so ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
libosmpbf.a: fileformat.pb.o osmformat.pb.o
$(AR) -cr $@ fileformat.pb.o osmformat.pb.o
+libosmpbf.so: fileformat.pb.o osmformat.pb.o
+ $(CXX) -shared -Wl,-soname,$(SONAME) -o $@ fileformat.pb.o osmformat.pb.o
+
%.pb.o: %.pb.cc
$(CXX) $(CXXFLAGS) -fPIC -c -o $@ $<
%.pb.cc ../include/osmpbf/%.pb.h: %.proto
$(PROTOC) --proto_path=. --cpp_out=. $<
- cp *.pb.h ../include/osmpbf/
+ cp -v $(subst .proto,.pb.h,$<) ../include/osmpbf/
install:
- install -m 755 -d $(DESTDIR)$(PREFIX)/lib
- install -m 644 libosmpbf.a $(DESTDIR)$(PREFIX)/lib
+ install -m 755 -d $(DESTDIR)$(LIBDIR)
+ install -m 644 libosmpbf.a $(DESTDIR)$(LIBDIR)
+ install -m 755 libosmpbf.so $(DESTDIR)$(LIBDIR)/libosmpbf.so.$(VERSION)
+ ln -s libosmpbf.so.$(VERSION) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ ln -s libosmpbf.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libosmpbf.so
install -m 755 -d $(DESTDIR)$(PREFIX)/include/osmpbf
install -m 644 ../include/osmpbf/osmpbf.h $(DESTDIR)$(PREFIX)/include/osmpbf
install -m 644 ../include/osmpbf/fileformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf
=====================================
src/fileformat.proto
=====================================
@@ -1,21 +1,15 @@
/** Copyright (c) 2010 Scott A. Crosby. <scott at sacrosby.com>
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-option optimize_for = LITE_RUNTIME;
+syntax = "proto2";
+
option java_package = "crosby.binary";
package OSMPBF;
=====================================
src/osmformat.proto
=====================================
@@ -1,21 +1,15 @@
/** Copyright (c) 2010 Scott A. Crosby. <scott at sacrosby.com>
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-option optimize_for = LITE_RUNTIME;
+syntax = "proto2";
+
option java_package = "crosby.binary";
package OSMPBF;
@@ -253,7 +247,7 @@ message Relation {
optional Info info = 4;
// Parallel arrays
- repeated int32 roles_sid = 8 [packed = true];
+ repeated int32 roles_sid = 8 [packed = true]; // This should have been defined as uint32 for consistency, but it is now too late to change it
repeated sint64 memids = 9 [packed = true]; // DELTA encoded
repeated MemberType types = 10 [packed = true];
}
=====================================
tools/Makefile
=====================================
@@ -4,8 +4,8 @@ PREFIX ?= /usr/local
CXX ?= g++
CXXFLAGS ?= -g
-CXXFLAGS += -I../include -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
-LDFLAGS += -L../src -pthread -lz -lprotobuf-lite -losmpbf
+CXXFLAGS += -I../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
+LDFLAGS += -L../src -pthread -lz -lprotobuf -losmpbf
.PHONY: clean install
=====================================
tools/osmpbf-outline.cpp
=====================================
@@ -54,7 +54,7 @@ void msg(const char* format, int color, va_list args) {
}
}
-// prints a formatted message to stderr, color coded to red
+// prints a formatted message to stdout, color coded to red
void err(const char* format, ...) {
va_list args;
va_start(args, format);
@@ -63,7 +63,7 @@ void err(const char* format, ...) {
exit(1);
}
-// prints a formatted message to stderr, color coded to yellow
+// prints a formatted message to stdout, color coded to yellow
void warn(const char* format, ...) {
va_list args;
va_start(args, format);
@@ -71,7 +71,7 @@ void warn(const char* format, ...) {
va_end(args);
}
-// prints a formatted message to stderr, color coded to green
+// prints a formatted message to stdout, color coded to green
void info(const char* format, ...) {
va_list args;
va_start(args, format);
@@ -79,7 +79,7 @@ void info(const char* format, ...) {
va_end(args);
}
-// prints a formatted message to stderr, color coded to white
+// prints a formatted message to stdout, color coded to white
void debug(const char* format, ...) {
va_list args;
va_start(args, format);
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/d46bf3fce1ee91ff9f9045cdcc1ad71eb79adce9...6fc7fd052c743e2679673fb8a44255af87343520
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/d46bf3fce1ee91ff9f9045cdcc1ad71eb79adce9...6fc7fd052c743e2679673fb8a44255af87343520
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20201025/9de76d8f/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list