diff --git a/debian/README-ca_certificates b/debian/README-ca_certificates new file mode 100644 index 00000000..5c015fc9 --- /dev/null +++ b/debian/README-ca_certificates @@ -0,0 +1 @@ +Place your SSL/TLS Certificate Authority certificates in this directory. diff --git a/debian/README-certs b/debian/README-certs new file mode 100644 index 00000000..3f24ca84 --- /dev/null +++ b/debian/README-certs @@ -0,0 +1,3 @@ +Place your SSL/TLS server keys and certificates in this directory. + +This directory should only be readable by the mosquitto user. diff --git a/debian/README-conf-d b/debian/README-conf-d new file mode 100644 index 00000000..c2798f6b --- /dev/null +++ b/debian/README-conf-d @@ -0,0 +1,2 @@ +Any files placed in this directory that have a .conf ending will be loaded as +config files by the broker. Use this to make your local config. diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 00000000..80ecb467 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,7 @@ +Apparmor Profile +---------------- +If your system uses AppArmor, please note that the shipped enforcing profile +works with the default installation, and changes in your configuration may +require changes to the installed apparmor profile. Please see +https://wiki.ubuntu.com/DebuggingApparmor before filing a bug against this +software. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..3f2045ca --- /dev/null +++ b/debian/changelog @@ -0,0 +1,115 @@ +mosquitto (1.4.8-1) unstable; urgency=high + + * New upstream release. + * apparmor is now "suggests" instead of "depends". + + -- Roger A. Light Sun, 14 Feb 2016 15:06:55 +0000 + +mosquitto (1.4.7-1) unstable; urgency=low + + * New upstream release. Includes support for libwebsockets 1.6. + * Add dependency link between libmosquittopp-dev and libmosquitto-dev + (closes: #805506). + * Dropped misc:Pre-Depends line for libmosquitto1. See #783898. + * libc-ares2 Depends is handled by shlib:Depends for libmosquitto1. + + -- Roger A. Light Mon, 21 Dec 2015 10:59:31 +0000 + +mosquitto (1.4.4-1) unstable; urgency=low + + * New upstream release. + * Fix Vcs link. + * Note that libs & clients also support MQTT v3.1.1. + + -- Roger A. Light Mon, 21 Sep 2015 09:56:28 +0100 + +mosquitto (1.4.3-1) unstable; urgency=low + + * New upstream release. + * New binary package mosquitto-dev. + * python3-mosquitto and python-mosquitto packages removed because the python + module is no longer part of upstream. + * Remove unused patches (pynomake.patch and disable-bad-test.patch) + * Added dependency on libwebsockets3, uuid. Note that the source package + will build (and actually prefers) using libwebsockets4 when it becomes + available. This adds the patch enable-websockets.patch. + * Upstream license has changed from BSD-3 to EPL-1.0 or EDL-1.0. + * Fix log directory permissions. + * Port to multiarch (closes: #763385) - adds libdir.patch + * Symbols update + * Patch refresh + * Add build-timestamp.patch to create reproducable builds. + * Add support for apparmor. + + -- Roger A. Light Wed, 19 Aug 2015 10:31:10 +0100 + +mosquitto (1.3.4-2) unstable; urgency=low + + * Disable bad "fake ca" test. + + -- Roger A. Light Sat, 16 Aug 2014 10:52:12 +0100 + +mosquitto (1.3.4-1) unstable; urgency=medium + + * New upstream release: http://mosquitto.org/2014/08/version-1-3-4-released/ + (closes: #725014, #754787) + * Add dependency on libuuid, c-ares. + * Bumped standards version to 3.9.5. No changes needed. + * Example config files are now installed to + /usr/share/doc/mosquitto/examples/ + * debian/copyright year updated. + * compiling.txt is no longer distributed. + * Updated debian/copyright with new dates. + + -- Roger A. Light Wed, 06 Aug 2014 00:43:39 +0100 + +mosquitto (1.2.1-1) unstable; urgency=low + + * New upstream release: http://mosquitto.org/2013/09/version-1-2-1-released/ + * Add Replaces/Break for libmosquitto-dev and libmosquittopp-dev + (closes: #720637, #720638). + + -- Roger A. Light Wed, 18 Sep 2013 21:36:01 +0100 + +mosquitto (1.2-1) unstable; urgency=low + + * New upstream release: http://mosquitto.org/2013/08/version-1-2-released/ + (closes: #685119). + * Bumped standards release to 3.9.4. No changes needed. + * Added mosquitto-dbg package for binary debug information. + * Added python3-mosquitto binary package. + * Use dh_python2 (and dh_python3) instead of python-support. + * mosquitto now logs to /var/log/mosquitto/ using logrotate. + * mosquitto local config should now be placed in /etc/mosquitto/conf.d/ + + -- Roger A. Light Wed, 07 Aug 2013 23:26:19 +0100 + +mosquitto (0.15-1) unstable; urgency=low + + * New upstream release: http://mosquitto.org/2012/02/version-0-15-released/ + * Updated debian/copyright to latest DEP-5. + * Removed now unnecessary man-hyphen-minus.patch. + + -- Roger A. Light Sun, 05 Feb 2012 09:30:22 +0000 + +mosquitto (0.12-1) unstable; urgency=low + + * New upstream release: http://mosquitto.org/2011/07/version-0-12-released/ + + -- Roger A. Light Mon, 25 Jul 2011 22:24:52 +0100 + +mosquitto (0.11.3-1) unstable; urgency=low + + * New upstream release: http://mosquitto.org/2011/07/version-0-11-3-released/ + * Fix init script start action to create pidfile so stop works correctly. + (thanks to Mark Hindess, closes: #632589) + * Fix section for client libraries in debian/control. + * Remove disable-cmake.patch, this is handled in debian/rules now. + + -- Roger A. Light Wed, 6 July 2011 15:07:04 +0100 + +mosquitto (0.10-1) unstable; urgency=low + + * Initial release. (Closes: #605319) + + -- Roger A. Light Sun, 1 May 2011 20:12:51 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..c0e9e9ab --- /dev/null +++ b/debian/control @@ -0,0 +1,157 @@ +Source: mosquitto +Section: net +Priority: optional +Maintainer: Roger A. Light +Build-Depends: debhelper (>= 9), + libc-ares-dev, + libssl-dev (>=1.0.0), + libwebsockets-dev (>=1.2), + libwrap0-dev, + python-all (>= 2.6.6-3~), + uthash-dev, + uuid-dev +Standards-Version: 3.9.6 +Homepage: http://mosquitto.org/ +Vcs-Git: https://git.eclipse.org/r/mosquitto/org.eclipse.mosquitto +Vcs-Browser: http://git.eclipse.org/c/mosquitto/org.eclipse.mosquitto.git + +Package: mosquitto +Architecture: any +Multi-Arch: foreign +Depends: adduser (>= 3.10), + libuuid1, + lsb-base (>=4.1+Debian3), + ${misc:Depends}, + ${shlibs:Depends} +Suggests: apparmor +Description: MQTT version 3.1/3.1.1 compatible message broker + This is a message broker that supports version 3.1 and 3.1.1 of the MQTT + protocol. + . + MQTT provides a method of carrying out messaging using a publish/subscribe + model. It is lightweight, both in terms of bandwidth usage and ease of + implementation. This makes it particularly useful at the edge of the network + where a sensor or other simple device may be implemented using an arduino for + example. + +Package: mosquitto-dev +Section: devel +Architecture: all +Multi-Arch: foreign +Depends: mosquitto (<< ${source:Version}.1~), + mosquitto (>= ${source:Version}), + ${misc:Depends} +Description: Development files for Mosquitto + Mosquitto is a message broker that supports the MQTT protocol. + . + This package contains the include files used if you wish to compile a package + which requires Mosquitto's source file headers. + +Package: libmosquitto1 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: MQTT version 3.1/3.1.1 client library + This is a C library for implementing MQTT version 3.1/3.1.1 clients. + . + MQTT provides a method of carrying out messaging using a publish/subscribe + model. It is lightweight, both in terms of bandwidth usage and ease of + implementation. This makes it particularly useful at the edge of the network + where a sensor or other simple device may be implemented using an arduino for + example. + +Package: libmosquitto-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libmosquitto1 (<< ${source:Version}.1~), + libmosquitto1 (>= ${source:Version}), + ${misc:Depends} +Replaces: libmosquitto0-dev (<< 1.2-1~) +Breaks: libmosquitto0-dev (<< 1.2-1~) +Description: MQTT version 3.1/3.1.1 client library, development files + This is the header and man page for the libmosquitto1 C library, which is a + library for implementing MQTT version 3.1/3.1.1 clients. This package is needed to do + development with libmosquitto1. + +Package: libmosquittopp1 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: libmosquitto1 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: MQTT version 3.1/3.1.1 client C++ library + This is a C++ library for implementing MQTT version 3.1/3.1.1 clients. + . + MQTT provides a method of carrying out messaging using a publish/subscribe + model. It is lightweight, both in terms of bandwidth usage and ease of + implementation. This makes it particularly useful at the edge of the network + where a sensor or other simple device may be implemented using an arduino for + example. + +Package: libmosquittopp-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libmosquittopp1 (<< ${source:Version}.1~), + libmosquittopp1 (>= ${source:Version}), + libmosquitto-dev, + ${misc:Depends} +Replaces: libmosquittopp0-dev (<< 1.2-1~) +Breaks: libmosquittopp0-dev (<< 1.2-1~) +Description: MQTT version 3.1 client C++ library, development files + This is the header and man page for the libmosquittopp1 C++ library, which is + a library for implementing MQTT version 3.1 clients. This package is needed to + do development with libmosquittopp1. + +Package: mosquitto-clients +Architecture: any +Multi-Arch: foreign +Depends: libmosquitto1 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: Mosquitto command line MQTT clients + This is two MQTT version 3.1/3.1.1 command line clients. mosquitto_pub can be + used to publish messages to a broker and mosquitto_sub can be used to + subscribe to a topic to receive messages. + . + MQTT provides a method of carrying out messaging using a publish/subscribe + model. It is lightweight, both in terms of bandwidth usage and ease of + implementation. This makes it particularly useful at the edge of the network + where a sensor or other simple device may be implemented using an arduino for + example. + +Package: mosquitto-dbg +Architecture: any +Multi-Arch: foreign +Priority: extra +Section: debug +Depends: mosquitto (= ${binary:Version}) | mosquitto-clients (= ${binary:Version}), + ${misc:Depends} +Description: debugging symbols for mosquitto binaries + This package contains debugging files used to investigate problems with + the binaries provided by the packages mosquitto, mosquitto-clients, + libmosquitto1 and libmosquittopp1. + +Package: libmosquitto1-dbg +Architecture: any +Multi-Arch: same +Priority: extra +Section: debug +Depends: libmosquitto1 (= ${binary:Version}), ${misc:Depends} +Description: debugging symbols for libmosquitto binaries + This package contains debugging files used to investigate problems with + the binaries provided by the libmosquitto1 package. + +Package: libmosquittopp1-dbg +Architecture: any +Multi-Arch: same +Priority: extra +Section: debug +Depends: libmosquittopp1 (= ${binary:Version}), ${misc:Depends} +Description: debugging symbols for libmosquittopp binaries + This package contains debugging files used to investigate problems with + the binaries provided by the libmosquittopp1 package. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..5cde0e67 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,277 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mosquitto +Upstream-Contact: Roger A. Light +Source: http://mosquitto.org/files/source/ + +Files: src/uthash.h +Copyright: 2003-2013, Troy D. Hanson http://uthash.sourceforge.net +License: BSD-1-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: * +Copyright: 2009-2015 Roger A. Light +License: EPL-1.0 or EDL-1.0 + +License: EDL-1.0 + Eclipse Distribution License - v 1.0 + . + Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. + . + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + Neither the name of the Eclipse Foundation, Inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: EPL-1.0 + Eclipse Public License - v 1.0 + . + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC + LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM + CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + . + 1. DEFINITIONS + . + "Contribution" means: + . + a) in the case of the initial Contributor, the initial code and documentation + distributed under this Agreement, and + . + b) in the case of each subsequent Contributor: + . + i) changes to the Program, and + . + ii) additions to the Program; + . + where such changes and/or additions to the Program originate from and are + distributed by that particular Contributor. A Contribution 'originates' from a + Contributor if it was added to the Program by such Contributor itself or + anyone acting on such Contributor's behalf. Contributions do not include + additions to the Program which: (i) are separate modules of software + distributed in conjunction with the Program under their own license agreement, + and (ii) are not derivative works of the Program. + . + "Contributor" means any person or entity that distributes the Program. + . + "Licensed Patents " mean patent claims licensable by a Contributor which are + necessarily infringed by the use or sale of its Contribution alone or when + combined with the Program. + . + "Program" means the Contributions distributed in accordance with this Agreement. + . + "Recipient" means anyone who receives the Program under this Agreement, + including all Contributors. + . + 2. GRANT OF RIGHTS + . + a) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free copyright license to + reproduce, prepare derivative works of, publicly display, publicly perform, + distribute and sublicense the Contribution of such Contributor, if any, and + such derivative works, in source code and object code form. + . + b) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free patent license under + Licensed Patents to make, use, sell, offer to sell, import and otherwise + transfer the Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the combination of the + Contribution and the Program if, at the time the Contribution is added by the + Contributor, such addition of the Contribution causes such combination to be + covered by the Licensed Patents. The patent license shall not apply to any + other combinations which include the Contribution. No hardware per se is + licensed hereunder. + . + c) Recipient understands that although each Contributor grants the licenses to + its Contributions set forth herein, no assurances are provided by any + Contributor that the Program does not infringe the patent or other + intellectual property rights of any other entity. Each Contributor disclaims + any liability to Recipient for claims brought by any other entity based on + infringement of intellectual property rights or otherwise. As a condition to + exercising the rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual property rights + needed, if any. For example, if a third party patent license is required to + allow Recipient to distribute the Program, it is Recipient's responsibility to + acquire that license before distributing the Program. + . + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright license + set forth in this Agreement. + . + 3. REQUIREMENTS + . + A Contributor may choose to distribute the Program in object code form under + its own license agreement, provided that: + . + a) it complies with the terms and conditions of this Agreement; and + . + b) its license agreement: + . + i) effectively disclaims on behalf of all Contributors all warranties and + conditions, express and implied, including warranties or conditions of title + and non-infringement, and implied warranties or conditions of merchantability + and fitness for a particular purpose; + . + ii) effectively excludes on behalf of all Contributors all liability for + damages, including direct, indirect, special, incidental and consequential + damages, such as lost profits; + . + iii) states that any provisions which differ from this Agreement are offered + by that Contributor alone and not by any other party; and + . + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable manner on + or through a medium customarily used for software exchange. + . + When the Program is made available in source code form: + . + a) it must be made available under this Agreement; and + . + b) a copy of this Agreement must be included with each copy of the Program. + . + Contributors may not remove or alter any copyright notices contained within + the Program. + . + Each Contributor must identify itself as the originator of its Contribution, + if any, in a manner that reasonably allows subsequent Recipients to identify + the originator of the Contribution. + . + 4. COMMERCIAL DISTRIBUTION + . + Commercial distributors of software may accept certain responsibilities with + respect to end users, business partners and the like. While this license is + intended to facilitate the commercial use of the Program, the Contributor who + includes the Program in a commercial product offering should do so in a manner + which does not create potential liability for other Contributors. Therefore, + if a Contributor includes the Program in a commercial product offering, such + Contributor ("Commercial Contributor") hereby agrees to defend and indemnify + every other Contributor ("Indemnified Contributor") against any losses, + damages and costs (collectively "Losses") arising from claims, lawsuits and + other legal actions brought by a third party against the Indemnified + Contributor to the extent caused by the acts or omissions of such Commercial + Contributor in connection with its distribution of the Program in a commercial + product offering. The obligations in this section do not apply to any claims + or Losses relating to any actual or alleged intellectual property + infringement. In order to qualify, an Indemnified Contributor must: + a) promptly notify the Commercial Contributor in writing of such claim, and + b) allow the Commercial Contributor to control, and cooperate with the + Commercial Contributor in, the defense and any related settlement + negotiations. The Indemnified Contributor may participate in any such claim at + its own expense. + . + For example, a Contributor might include the Program in a commercial product + offering, Product X. That Contributor is then a Commercial Contributor. If + that Commercial Contributor then makes performance claims, or offers + warranties related to Product X, those performance claims and warranties are + such Commercial Contributor's responsibility alone. Under this section, the + Commercial Contributor would have to defend claims against the other + Contributors related to those performance claims and warranties, and if a + court requires any other Contributor to pay any damages as a result, the + Commercial Contributor must pay those damages. + . + 5. NO WARRANTY + . + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR + IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, + NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each + Recipient is solely responsible for determining the appropriateness of using + and distributing the Program and assumes all risks associated with its + exercise of rights under this Agreement , including but not limited to the + risks and costs of program errors, compliance with applicable laws, damage to + or loss of data, programs or equipment, and unavailability or interruption of + operations. + . + 6. DISCLAIMER OF LIABILITY + . + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY + CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION + LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE + EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGES. + . + 7. GENERAL + . + If any provision of this Agreement is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of the + remainder of the terms of this Agreement, and without further action by the + parties hereto, such provision shall be reformed to the minimum extent + necessary to make such provision valid and enforceable. + . + If Recipient institutes patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Program itself + (excluding combinations of the Program with other software or hardware) + infringes such Recipient's patent(s), then such Recipient's rights granted + under Section 2(b) shall terminate as of the date such litigation is filed. + . + All Recipient's rights under this Agreement shall terminate if it fails to + comply with any of the material terms or conditions of this Agreement and does + not cure such failure in a reasonable period of time after becoming aware of + such noncompliance. If all Recipient's rights under this Agreement terminate, + Recipient agrees to cease use and distribution of the Program as soon as + reasonably practicable. However, Recipient's obligations under this Agreement + and any licenses granted by Recipient relating to the Program shall continue + and survive. + . + Everyone is permitted to copy and distribute copies of this Agreement, but in + order to avoid inconsistency the Agreement is copyrighted and may only be + modified in the following manner. The Agreement Steward reserves the right to + publish new versions (including revisions) of this Agreement from time to + time. No one other than the Agreement Steward has the right to modify this + Agreement. The Eclipse Foundation is the initial Agreement Steward. The + Eclipse Foundation may assign the responsibility to serve as the Agreement + Steward to a suitable separate entity. Each new version of the Agreement will + be given a distinguishing version number. The Program (including + Contributions) may always be distributed subject to the version of the + Agreement under which it was received. In addition, after a new version of the + Agreement is published, Contributor may elect to distribute the Program + (including its Contributions) under the new version. Except as expressly + stated in Sections 2(a) and 2(b) above, Recipient receives no rights or + licenses to the intellectual property of any Contributor under this Agreement, + whether expressly, by implication, estoppel or otherwise. All rights in the + Program not expressly granted under this Agreement are reserved. + . + This Agreement is governed by the laws of the State of New York and the + intellectual property laws of the United States of America. No party to this + Agreement will bring a legal action under this Agreement more than one year + after the cause of action arose. Each party waives its rights to a jury trial + in any resulting litigation. diff --git a/debian/libmosquitto-dev.install b/debian/libmosquitto-dev.install new file mode 100644 index 00000000..c1968930 --- /dev/null +++ b/debian/libmosquitto-dev.install @@ -0,0 +1,3 @@ +usr/include/mosquitto.h +usr/lib/*/libmosquitto.so +usr/share/man/man3/libmosquitto.3 diff --git a/debian/libmosquitto-dev.lintian-overrides b/debian/libmosquitto-dev.lintian-overrides new file mode 100644 index 00000000..90dd3b1f --- /dev/null +++ b/debian/libmosquitto-dev.lintian-overrides @@ -0,0 +1,3 @@ +# xsltproc generated man pages have long lines but look ok. Patching the +# generated files to use hypenation results in very odd looking files. +libmosquitto-dev binary: manpage-has-errors-from-man diff --git a/debian/libmosquitto1.install b/debian/libmosquitto1.install new file mode 100644 index 00000000..0a9cdbb4 --- /dev/null +++ b/debian/libmosquitto1.install @@ -0,0 +1 @@ +usr/lib/*/libmosquitto.so.1 diff --git a/debian/libmosquitto1.symbols b/debian/libmosquitto1.symbols new file mode 100644 index 00000000..e87bfb55 --- /dev/null +++ b/debian/libmosquitto1.symbols @@ -0,0 +1,6 @@ +libmosquitto.so.1 libmosquitto1 #MINVER# + (symver)MOSQ_1.0 1.0 + (symver)MOSQ_1.1 1.1 + (symver)MOSQ_1.2 1.2 + (symver)MOSQ_1.3 1.3 + (symver)MOSQ_1.4 1.4 diff --git a/debian/libmosquittopp-dev.install b/debian/libmosquittopp-dev.install new file mode 100644 index 00000000..1d8cda6c --- /dev/null +++ b/debian/libmosquittopp-dev.install @@ -0,0 +1,2 @@ +usr/include/mosquittopp.h +usr/lib/*/libmosquittopp.so diff --git a/debian/libmosquittopp1.install b/debian/libmosquittopp1.install new file mode 100644 index 00000000..18f1d21f --- /dev/null +++ b/debian/libmosquittopp1.install @@ -0,0 +1 @@ +usr/lib/*/libmosquittopp.so.1 diff --git a/debian/libmosquittopp1.symbols b/debian/libmosquittopp1.symbols new file mode 100644 index 00000000..ebd95af9 --- /dev/null +++ b/debian/libmosquittopp1.symbols @@ -0,0 +1,59 @@ +libmosquittopp.so.1 libmosquittopp1 #MINVER# + (c++)"mosqpp::lib_cleanup()@Base" 1.0 + (c++)"mosqpp::lib_version(int*, int*, int*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::disconnect()@Base" 1.0 + (c++)"mosqpp::mosquittopp::loop_start()@Base" 1.0 + (c++)"mosqpp::mosquittopp::loop_write(int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::on_connect(int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::on_message(mosquitto_message const*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::on_publish(int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::socks5_set(char const*, int, char const*, char const*)@Base" 1.4 + (c++)"mosqpp::mosquittopp::want_write()@Base" 1.0 + (c++)"mosqpp::mosquittopp::will_clear()@Base" 1.0 + (c++)"mosqpp::mosquittopp::tls_psk_set(char const*, char const*, char const*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::unsubscribe(int*, char const*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::loop_forever(int, int)@Base" 1.1 + (c++)"mosqpp::mosquittopp::on_subscribe(int, int, int const*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::reinitialise(char const*, bool)@Base" 1.0 + (c++)"mosqpp::mosquittopp::threaded_set(bool)@Base" 1.4 + (c++)"mosqpp::mosquittopp::tls_opts_set(int, char const*, char const*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::connect_async(char const*, int, int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::connect_async(char const*, int, int, char const*)@Base" 1.2 + (c++)"mosqpp::mosquittopp::on_disconnect(int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::user_data_set(void*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::on_unsubscribe(int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::reconnect_async()@Base" 1.2 + (c++)"mosqpp::mosquittopp::username_pw_set(char const*, char const*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::tls_insecure_set(bool)@Base" 1.2 + (c++)"mosqpp::mosquittopp::message_retry_set(unsigned int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::reconnect_delay_set(unsigned int, unsigned int, bool)@Base" 1.2 + (c++)"mosqpp::mosquittopp::max_inflight_messages_set(unsigned int)@Base" 1.2 + (c++)"mosqpp::mosquittopp::loop(int, int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::on_log(int, char const*)@Base" 1.0 + (c++)"mosqpp::mosquittopp::socket()@Base" 1.0 + (c++)"mosqpp::mosquittopp::connect(char const*, int, int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::connect(char const*, int, int, char const*)@Base" 1.2 + (c++)"mosqpp::mosquittopp::publish(int*, char const*, int, void const*, int, bool)@Base" 1.0 + (c++)"mosqpp::mosquittopp::tls_set(char const*, char const*, char const*, char const*, int (*)(char*, int, int, void*))@Base" 1.0 + (c++)"mosqpp::mosquittopp::on_error()@Base" 1.0 + (c++)"mosqpp::mosquittopp::opts_set(mosq_opt_t, void*)@Base" 1.4 + (c++)"mosqpp::mosquittopp::will_set(char const*, int, void const*, int, bool)@Base" 1.0 + (c++)"mosqpp::mosquittopp::loop_misc()@Base" 1.0 + (c++)"mosqpp::mosquittopp::loop_read(int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::loop_stop(bool)@Base" 1.0 + (c++)"mosqpp::mosquittopp::reconnect()@Base" 1.0 + (c++)"mosqpp::mosquittopp::subscribe(int*, char const*, int)@Base" 1.0 + (c++)"mosqpp::mosquittopp::mosquittopp(char const*, bool)@Base" 1.0 + (c++)"mosqpp::mosquittopp::mosquittopp(char const*, bool)@Base" 1.0 + (c++)"mosqpp::mosquittopp::~mosquittopp()@Base" 1.0 + (c++)"mosqpp::mosquittopp::~mosquittopp()@Base" 1.0 + (c++)"mosqpp::mosquittopp::~mosquittopp()@Base" 1.0 + (c++)"mosqpp::connack_string(int)@Base" 1.0 + (c++)"mosqpp::topic_matches_sub(char const*, char const*, bool*)@Base" 1.0 + (c++)"mosqpp::sub_topic_tokenise(char const*, char***, int*)@Base" 1.0 + (c++)"mosqpp::sub_topic_tokens_free(char***, int)@Base" 1.0 + (c++)"mosqpp::lib_init()@Base" 1.0 + (c++)"mosqpp::strerror(int)@Base" 1.0 + (c++)"typeinfo for mosqpp::mosquittopp@Base" 1.0 + (c++)"typeinfo name for mosqpp::mosquittopp@Base" 1.0 + (c++)"vtable for mosqpp::mosquittopp@Base" 1.0 diff --git a/debian/mosquitto-clients.install b/debian/mosquitto-clients.install new file mode 100644 index 00000000..06beb92e --- /dev/null +++ b/debian/mosquitto-clients.install @@ -0,0 +1,4 @@ +usr/bin/mosquitto_pub +usr/bin/mosquitto_sub +usr/share/man/man1/mosquitto_pub.1 +usr/share/man/man1/mosquitto_sub.1 diff --git a/debian/mosquitto-clients.lintian-overrides b/debian/mosquitto-clients.lintian-overrides new file mode 100644 index 00000000..83123cd7 --- /dev/null +++ b/debian/mosquitto-clients.lintian-overrides @@ -0,0 +1,3 @@ +# xsltproc generated man pages have long lines but look ok. Patching the +# generated files to use hypenation results in very odd looking files. +mosquitto-clients binary: manpage-has-errors-from-man diff --git a/debian/mosquitto-dev.install b/debian/mosquitto-dev.install new file mode 100644 index 00000000..9853d024 --- /dev/null +++ b/debian/mosquitto-dev.install @@ -0,0 +1 @@ +usr/include/mosquitto_plugin.h diff --git a/debian/mosquitto.conf b/debian/mosquitto.conf new file mode 100644 index 00000000..cb4a0368 --- /dev/null +++ b/debian/mosquitto.conf @@ -0,0 +1,13 @@ +# Place your local configuration in /etc/mosquitto/conf.d/ +# +# A full description of the configuration file is at +# /usr/share/doc/mosquitto/examples/mosquitto.conf.example + +pid_file /var/run/mosquitto.pid + +persistence true +persistence_location /var/lib/mosquitto/ + +log_dest file /var/log/mosquitto/mosquitto.log + +include_dir /etc/mosquitto/conf.d diff --git a/debian/mosquitto.dirs b/debian/mosquitto.dirs new file mode 100644 index 00000000..994abd5b --- /dev/null +++ b/debian/mosquitto.dirs @@ -0,0 +1,2 @@ +var/lib/mosquitto +var/log/mosquitto diff --git a/debian/mosquitto.docs b/debian/mosquitto.docs new file mode 100644 index 00000000..cdb5f04f --- /dev/null +++ b/debian/mosquitto.docs @@ -0,0 +1 @@ +readme.md diff --git a/debian/mosquitto.examples b/debian/mosquitto.examples new file mode 100644 index 00000000..f9ed596e --- /dev/null +++ b/debian/mosquitto.examples @@ -0,0 +1,4 @@ +mosquitto.conf +aclfile.example +pwfile.example +pskfile.example diff --git a/debian/mosquitto.init b/debian/mosquitto.init new file mode 100755 index 00000000..5613d19f --- /dev/null +++ b/debian/mosquitto.init @@ -0,0 +1,138 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: mosquitto +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: mosquitto MQTT v3.1 message broker +# Description: +# This is a message broker that supports version 3.1 of the MQ Telemetry +# Transport (MQTT) protocol. +# +# MQTT provides a method of carrying out messaging using a publish/subscribe +# model. It is lightweight, both in terms of bandwidth usage and ease of +# implementation. This makes it particularly useful at the edge of the network +# where a sensor or other simple device may be implemented using an arduino for +# example. +### END INIT INFO + +set -e + +PIDFILE=/var/run/mosquitto.pid +DAEMON=/usr/sbin/mosquitto + +# /etc/init.d/mosquitto: start and stop the mosquitto MQTT message broker + +test -x ${DAEMON} || exit 0 + +umask 022 + +. /lib/lsb/init-functions + +# Are we running from init? +run_by_init() { + ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ] +} + +export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" + +case "$1" in + start) + if init_is_upstart; then + exit 1 + fi + log_daemon_msg "Starting network daemon:" "mosquitto" + if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c /etc/mosquitto/mosquitto.conf ; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + stop) + if init_is_upstart; then + exit 0 + fi + log_daemon_msg "Stopping network daemon:" "mosquitto" + if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE}; then + log_end_msg 0 + rm -f ${PIDFILE} + else + log_end_msg 1 + fi + ;; + + + reload|force-reload) + if init_is_upstart; then + exit 1 + fi + log_daemon_msg "Reloading network daemon configuration:" "mosquitto" + if start-stop-daemon --stop --signal HUP --quiet --oknodo --pidfile $PIDFILE; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + + restart) + if init_is_upstart; then + exit 1 + fi + log_daemon_msg "Restarting network daemon:" "mosquitto" + if start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile ${PIDFILE}; then + rm -f ${PIDFILE} + fi + if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c /etc/mosquitto/mosquitto.conf ; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + + try-restart) + if init_is_upstart; then + exit 1 + fi + log_daemon_msg "Restarting Mosquitto message broker" "mosquitto" + set +e + start-stop-daemon --stop --quiet --retry 30 --pidfile ${PIDFILE} + RET="$?" + set -e + case $RET in + 0) + # old daemon stopped + rm -f ${PIDFILE} + if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c /etc/mosquitto/mosquitto.conf ; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + 1) + # daemon not running + log_progress_msg "(not running)" + log_end_msg 0 + ;; + *) + # failed to stop + log_progress_msg "(failed to stop)" + log_end_msg 1 + ;; + esac + ;; + + status) + if init_is_upstart; then + exit 1 + fi + status_of_proc -p ${PIDFILE} ${DAEMON} mosquitto && exit 0 || exit $? + ;; + + *) + log_action_msg "Usage: /etc/init.d/mosquitto {start|stop|reload|force-reload|restart|try-restart|status}" + exit 1 +esac + +exit 0 diff --git a/debian/mosquitto.install b/debian/mosquitto.install new file mode 100644 index 00000000..a1eb89d3 --- /dev/null +++ b/debian/mosquitto.install @@ -0,0 +1,11 @@ +etc/mosquitto/ca_certificates/README +etc/mosquitto/certs/README +etc/mosquitto/conf.d/README +etc/mosquitto/mosquitto.conf +usr/bin/mosquitto_passwd +usr/sbin/mosquitto +usr/share/man/man1/mosquitto_passwd.1 +usr/share/man/man5/mosquitto.conf.5 +usr/share/man/man7/mosquitto-tls.7 +usr/share/man/man7/mqtt.7 +usr/share/man/man8/mosquitto.8 diff --git a/debian/mosquitto.logrotate b/debian/mosquitto.logrotate new file mode 100644 index 00000000..824e6b10 --- /dev/null +++ b/debian/mosquitto.logrotate @@ -0,0 +1,12 @@ +/var/log/mosquitto/mosquitto.log { + rotate 7 + daily + compress + size 100k + nocreate + missingok + postrotate + /usr/bin/killall -HUP mosquitto + endscript +} + diff --git a/debian/mosquitto.postinst b/debian/mosquitto.postinst new file mode 100644 index 00000000..e5c1ba40 --- /dev/null +++ b/debian/mosquitto.postinst @@ -0,0 +1,46 @@ +#!/bin/sh +# postinst script for mosquitto +# +# see: dh_installdeb(1) + +set -e + +setup_mosquitto_user() { + if ! getent group mosquitto >/dev/null; then + addgroup --quiet --system mosquitto + fi + + if ! getent passwd mosquitto >/dev/null; then + adduser --quiet --system --no-create-home --ingroup mosquitto --home /var/lib/mosquitto --shell /usr/sbin/nologin mosquitto + fi +} + +fix_permissions() { + chown mosquitto /var/lib/mosquitto + chown mosquitto /var/log/mosquitto +} + +case "$1" in + configure) + setup_mosquitto_user + fix_permissions + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# Reload AppArmor profile +APP_PROFILE="/etc/apparmor.d/usr.sbin.mosquitto" +if [ -f "$APP_PROFILE" ] && aa-status --enabled 2>/dev/null; then + apparmor_parser -r "$APP_PROFILE" || true +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/mosquitto.postrm b/debian/mosquitto.postrm new file mode 100644 index 00000000..ff59efbc --- /dev/null +++ b/debian/mosquitto.postrm @@ -0,0 +1,39 @@ +#!/bin/sh +# postrm script for mosquitto +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + purge) + rm -f /var/lib/mosquitto/mosquitto.db + if [ -d /var/lib/mosquitto ]; then + rmdir --ignore-fail-on-non-empty /var/lib/mosquitto + fi + rm -f /var/log/mosquitto/mosquitto.log* + if [ -d /var/log/mosquitto ]; then + rmdir --ignore-fail-on-non-empty /var/log/mosquitto + fi + APP_PROFILE="usr.sbin.mosquitto" + rm -f /etc/apparmor.d/disable/$APP_PROFILE >/dev/null 2>&1 || true + ;; + remove|abort-install|abort-upgrade|disappear) + if which deluser >/dev/null 2>&1; then + deluser --quiet mosquitto > /dev/null || true + fi + ;; + + upgrade|failed-upgrade) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# + +exit 0 diff --git a/debian/mosquitto.prerm b/debian/mosquitto.prerm new file mode 100644 index 00000000..6fdbd4aa --- /dev/null +++ b/debian/mosquitto.prerm @@ -0,0 +1,32 @@ +#!/bin/sh +# prerm script for mosquitto +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove|purge|deconfigure) + if [ -x /etc/init.d/mosquitto ]; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d mosquitto stop + else + /etc/init.d/mosquitto stop + fi + fi + ;; + + upgrade) + ;; + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/mosquitto.upstart b/debian/mosquitto.upstart new file mode 100644 index 00000000..5752ad5c --- /dev/null +++ b/debian/mosquitto.upstart @@ -0,0 +1,8 @@ +description "Mosquitto MQTTv3.1 broker" +author "Roger Light +Forwarded: not-needed +--- a/config.mk ++++ b/config.mk +@@ -84,7 +84,7 @@ + # Also bump lib/mosquitto.h, CMakeLists.txt, + # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi + VERSION=1.4.8 +-TIMESTAMP:=$(shell date "+%F %T%z") ++TIMESTAMP:=$(shell dpkg-parsechangelog -l../debian/changelog | grep Date | sed -e 's/Date: //') + + # Client library SO version. Bump if incompatible API/ABI changes are made. + SOVERSION=1 diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch new file mode 100644 index 00000000..8ed7dfbd --- /dev/null +++ b/debian/patches/debian-config.patch @@ -0,0 +1,26 @@ +Description: Set local configuration. +Author: Roger Light +Forwarded: not-needed +--- a/Makefile ++++ b/Makefile +@@ -35,6 +35,7 @@ + set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} install; done + $(INSTALL) -d ${DESTDIR}/etc/mosquitto + $(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf.example ++ $(INSTALL) -m 644 debian.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf + $(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example + $(INSTALL) -m 644 pwfile.example ${DESTDIR}/etc/mosquitto/pwfile.example + $(INSTALL) -m 644 pskfile.example ${DESTDIR}/etc/mosquitto/pskfile.example +--- /dev/null ++++ b/debian.conf +@@ -0,0 +1,10 @@ ++# Place your local configuration in /etc/mosquitto/conf.d/ ++ ++pid_file /var/run/mosquitto.pid ++ ++persistence true ++persistence_location /var/lib/mosquitto/ ++ ++log_dest file /var/log/mosquitto/mosquitto.log ++ ++include_dir /etc/mosquitto/conf.d diff --git a/debian/patches/disable-in-tree-uthash.patch b/debian/patches/disable-in-tree-uthash.patch new file mode 100644 index 00000000..fcba29fd --- /dev/null +++ b/debian/patches/disable-in-tree-uthash.patch @@ -0,0 +1,954 @@ +Description: Use Debian provided uthash.h +Author: Roger Light +Forwarded: not-needed +--- a/src/uthash.h ++++ /dev/null +@@ -1,948 +0,0 @@ +-/* +-Copyright (c) 2003-2013, Troy D. Hanson http://troydhanson.github.com/uthash/ +-All rights reserved. +- +-Redistribution and use in source and binary forms, with or without +-modification, are permitted provided that the following conditions are met: +- +- * Redistributions of source code must retain the above copyright +- notice, this list of conditions and the following disclaimer. +- +-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-*/ +- +-#ifndef UTHASH_H +-#define UTHASH_H +- +-#include /* memcmp,strlen */ +-#include /* ptrdiff_t */ +-#include /* exit() */ +- +-/* These macros use decltype or the earlier __typeof GNU extension. +- As decltype is only available in newer compilers (VS2010 or gcc 4.3+ +- when compiling c++ source) this code uses whatever method is needed +- or, for VS2008 where neither is available, uses casting workarounds. */ +-#ifdef _MSC_VER /* MS compiler */ +-#if _MSC_VER >= 1600 && defined(__cplusplus) /* VS2010 or newer in C++ mode */ +-#define DECLTYPE(x) (decltype(x)) +-#else /* VS2008 or older (or VS2010 in C mode) */ +-#define NO_DECLTYPE +-#define DECLTYPE(x) +-#endif +-#else /* GNU, Sun and other compilers */ +-#define DECLTYPE(x) (__typeof(x)) +-#endif +- +-#ifdef NO_DECLTYPE +-#define DECLTYPE_ASSIGN(dst,src) \ +-do { \ +- char **_da_dst = (char**)(&(dst)); \ +- *_da_dst = (char*)(src); \ +-} while(0) +-#else +-#define DECLTYPE_ASSIGN(dst,src) \ +-do { \ +- (dst) = DECLTYPE(dst)(src); \ +-} while(0) +-#endif +- +-/* a number of the hash function use uint32_t which isn't defined on win32 */ +-#ifdef _MSC_VER +-typedef unsigned int uint32_t; +-typedef unsigned char uint8_t; +-#else +-#include /* uint32_t */ +-#endif +- +-#define UTHASH_VERSION 1.9.8 +- +-#ifndef uthash_fatal +-#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */ +-#endif +-#ifndef uthash_malloc +-#define uthash_malloc(sz) malloc(sz) /* malloc fcn */ +-#endif +-#ifndef uthash_free +-#define uthash_free(ptr,sz) free(ptr) /* free fcn */ +-#endif +- +-#ifndef uthash_noexpand_fyi +-#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ +-#endif +-#ifndef uthash_expand_fyi +-#define uthash_expand_fyi(tbl) /* can be defined to log expands */ +-#endif +- +-/* initial number of buckets */ +-#define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */ +-#define HASH_INITIAL_NUM_BUCKETS_LOG2 5 /* lg2 of initial number of buckets */ +-#define HASH_BKT_CAPACITY_THRESH 10 /* expand when bucket count reaches */ +- +-/* calculate the element whose hash handle address is hhe */ +-#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho))) +- +-#define HASH_FIND(hh,head,keyptr,keylen,out) \ +-do { \ +- unsigned _hf_bkt,_hf_hashv; \ +- out=NULL; \ +- if (head) { \ +- HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt); \ +- if (HASH_BLOOM_TEST((head)->hh.tbl, _hf_hashv)) { \ +- HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], \ +- keyptr,keylen,out); \ +- } \ +- } \ +-} while (0) +- +-#ifdef HASH_BLOOM +-#define HASH_BLOOM_BITLEN (1ULL << HASH_BLOOM) +-#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8) + ((HASH_BLOOM_BITLEN%8) ? 1:0) +-#define HASH_BLOOM_MAKE(tbl) \ +-do { \ +- (tbl)->bloom_nbits = HASH_BLOOM; \ +- (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN); \ +- if (!((tbl)->bloom_bv)) { uthash_fatal( "out of memory"); } \ +- memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN); \ +- (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \ +-} while (0) +- +-#define HASH_BLOOM_FREE(tbl) \ +-do { \ +- uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ +-} while (0) +- +-#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8))) +-#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8))) +- +-#define HASH_BLOOM_ADD(tbl,hashv) \ +- HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1))) +- +-#define HASH_BLOOM_TEST(tbl,hashv) \ +- HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1))) +- +-#else +-#define HASH_BLOOM_MAKE(tbl) +-#define HASH_BLOOM_FREE(tbl) +-#define HASH_BLOOM_ADD(tbl,hashv) +-#define HASH_BLOOM_TEST(tbl,hashv) (1) +-#define HASH_BLOOM_BYTELEN 0 +-#endif +- +-#define HASH_MAKE_TABLE(hh,head) \ +-do { \ +- (head)->hh.tbl = (UT_hash_table*)uthash_malloc( \ +- sizeof(UT_hash_table)); \ +- if (!((head)->hh.tbl)) { uthash_fatal( "out of memory"); } \ +- memset((head)->hh.tbl, 0, sizeof(UT_hash_table)); \ +- (head)->hh.tbl->tail = &((head)->hh); \ +- (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \ +- (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2; \ +- (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head); \ +- (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc( \ +- HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ +- if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); } \ +- memset((head)->hh.tbl->buckets, 0, \ +- HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ +- HASH_BLOOM_MAKE((head)->hh.tbl); \ +- (head)->hh.tbl->signature = HASH_SIGNATURE; \ +-} while(0) +- +-#define HASH_ADD(hh,head,fieldname,keylen_in,add) \ +- HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add) +- +-#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced) \ +-do { \ +- replaced=NULL; \ +- HASH_FIND(hh,head,&((add)->fieldname),keylen_in,replaced); \ +- if (replaced!=NULL) { \ +- HASH_DELETE(hh,head,replaced); \ +- }; \ +- HASH_ADD(hh,head,fieldname,keylen_in,add); \ +-} while(0) +- +-#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \ +-do { \ +- unsigned _ha_bkt; \ +- (add)->hh.next = NULL; \ +- (add)->hh.key = (char*)keyptr; \ +- (add)->hh.keylen = (unsigned)keylen_in; \ +- if (!(head)) { \ +- head = (add); \ +- (head)->hh.prev = NULL; \ +- HASH_MAKE_TABLE(hh,head); \ +- } else { \ +- (head)->hh.tbl->tail->next = (add); \ +- (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail); \ +- (head)->hh.tbl->tail = &((add)->hh); \ +- } \ +- (head)->hh.tbl->num_items++; \ +- (add)->hh.tbl = (head)->hh.tbl; \ +- HASH_FCN(keyptr,keylen_in, (head)->hh.tbl->num_buckets, \ +- (add)->hh.hashv, _ha_bkt); \ +- HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt],&(add)->hh); \ +- HASH_BLOOM_ADD((head)->hh.tbl,(add)->hh.hashv); \ +- HASH_EMIT_KEY(hh,head,keyptr,keylen_in); \ +- HASH_FSCK(hh,head); \ +-} while(0) +- +-#define HASH_TO_BKT( hashv, num_bkts, bkt ) \ +-do { \ +- bkt = ((hashv) & ((num_bkts) - 1)); \ +-} while(0) +- +-/* delete "delptr" from the hash table. +- * "the usual" patch-up process for the app-order doubly-linked-list. +- * The use of _hd_hh_del below deserves special explanation. +- * These used to be expressed using (delptr) but that led to a bug +- * if someone used the same symbol for the head and deletee, like +- * HASH_DELETE(hh,users,users); +- * We want that to work, but by changing the head (users) below +- * we were forfeiting our ability to further refer to the deletee (users) +- * in the patch-up process. Solution: use scratch space to +- * copy the deletee pointer, then the latter references are via that +- * scratch pointer rather than through the repointed (users) symbol. +- */ +-#define HASH_DELETE(hh,head,delptr) \ +-do { \ +- unsigned _hd_bkt; \ +- struct UT_hash_handle *_hd_hh_del; \ +- if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) ) { \ +- uthash_free((head)->hh.tbl->buckets, \ +- (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \ +- HASH_BLOOM_FREE((head)->hh.tbl); \ +- uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ +- head = NULL; \ +- } else { \ +- _hd_hh_del = &((delptr)->hh); \ +- if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) { \ +- (head)->hh.tbl->tail = \ +- (UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) + \ +- (head)->hh.tbl->hho); \ +- } \ +- if ((delptr)->hh.prev) { \ +- ((UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) + \ +- (head)->hh.tbl->hho))->next = (delptr)->hh.next; \ +- } else { \ +- DECLTYPE_ASSIGN(head,(delptr)->hh.next); \ +- } \ +- if (_hd_hh_del->next) { \ +- ((UT_hash_handle*)((ptrdiff_t)_hd_hh_del->next + \ +- (head)->hh.tbl->hho))->prev = \ +- _hd_hh_del->prev; \ +- } \ +- HASH_TO_BKT( _hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ +- HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del); \ +- (head)->hh.tbl->num_items--; \ +- } \ +- HASH_FSCK(hh,head); \ +-} while (0) +- +- +-/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */ +-#define HASH_FIND_STR(head,findstr,out) \ +- HASH_FIND(hh,head,findstr,strlen(findstr),out) +-#define HASH_ADD_STR(head,strfield,add) \ +- HASH_ADD(hh,head,strfield,strlen(add->strfield),add) +-#define HASH_REPLACE_STR(head,strfield,add,replaced) \ +- HASH_REPLACE(hh,head,strfield,strlen(add->strfield),add,replaced) +-#define HASH_FIND_INT(head,findint,out) \ +- HASH_FIND(hh,head,findint,sizeof(int),out) +-#define HASH_ADD_INT(head,intfield,add) \ +- HASH_ADD(hh,head,intfield,sizeof(int),add) +-#define HASH_REPLACE_INT(head,intfield,add,replaced) \ +- HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced) +-#define HASH_FIND_PTR(head,findptr,out) \ +- HASH_FIND(hh,head,findptr,sizeof(void *),out) +-#define HASH_ADD_PTR(head,ptrfield,add) \ +- HASH_ADD(hh,head,ptrfield,sizeof(void *),add) +-#define HASH_REPLACE_PTR(head,ptrfield,add) \ +- HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced) +-#define HASH_DEL(head,delptr) \ +- HASH_DELETE(hh,head,delptr) +- +-/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined. +- * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined. +- */ +-#ifdef HASH_DEBUG +-#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0) +-#define HASH_FSCK(hh,head) \ +-do { \ +- unsigned _bkt_i; \ +- unsigned _count, _bkt_count; \ +- char *_prev; \ +- struct UT_hash_handle *_thh; \ +- if (head) { \ +- _count = 0; \ +- for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) { \ +- _bkt_count = 0; \ +- _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head; \ +- _prev = NULL; \ +- while (_thh) { \ +- if (_prev != (char*)(_thh->hh_prev)) { \ +- HASH_OOPS("invalid hh_prev %p, actual %p\n", \ +- _thh->hh_prev, _prev ); \ +- } \ +- _bkt_count++; \ +- _prev = (char*)(_thh); \ +- _thh = _thh->hh_next; \ +- } \ +- _count += _bkt_count; \ +- if ((head)->hh.tbl->buckets[_bkt_i].count != _bkt_count) { \ +- HASH_OOPS("invalid bucket count %d, actual %d\n", \ +- (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count); \ +- } \ +- } \ +- if (_count != (head)->hh.tbl->num_items) { \ +- HASH_OOPS("invalid hh item count %d, actual %d\n", \ +- (head)->hh.tbl->num_items, _count ); \ +- } \ +- /* traverse hh in app order; check next/prev integrity, count */ \ +- _count = 0; \ +- _prev = NULL; \ +- _thh = &(head)->hh; \ +- while (_thh) { \ +- _count++; \ +- if (_prev !=(char*)(_thh->prev)) { \ +- HASH_OOPS("invalid prev %p, actual %p\n", \ +- _thh->prev, _prev ); \ +- } \ +- _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh); \ +- _thh = ( _thh->next ? (UT_hash_handle*)((char*)(_thh->next) + \ +- (head)->hh.tbl->hho) : NULL ); \ +- } \ +- if (_count != (head)->hh.tbl->num_items) { \ +- HASH_OOPS("invalid app item count %d, actual %d\n", \ +- (head)->hh.tbl->num_items, _count ); \ +- } \ +- } \ +-} while (0) +-#else +-#define HASH_FSCK(hh,head) +-#endif +- +-/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to +- * the descriptor to which this macro is defined for tuning the hash function. +- * The app can #include to get the prototype for write(2). */ +-#ifdef HASH_EMIT_KEYS +-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \ +-do { \ +- unsigned _klen = fieldlen; \ +- write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \ +- write(HASH_EMIT_KEYS, keyptr, fieldlen); \ +-} while (0) +-#else +-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) +-#endif +- +-/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */ +-#ifdef HASH_FUNCTION +-#define HASH_FCN HASH_FUNCTION +-#else +-#define HASH_FCN HASH_JEN +-#endif +- +-/* The Bernstein hash function, used in Perl prior to v5.6 */ +-#define HASH_BER(key,keylen,num_bkts,hashv,bkt) \ +-do { \ +- unsigned _hb_keylen=keylen; \ +- char *_hb_key=(char*)(key); \ +- (hashv) = 0; \ +- while (_hb_keylen--) { (hashv) = ((hashv) * 33) + *_hb_key++; } \ +- bkt = (hashv) & (num_bkts-1); \ +-} while (0) +- +- +-/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at +- * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */ +-#define HASH_SAX(key,keylen,num_bkts,hashv,bkt) \ +-do { \ +- unsigned _sx_i; \ +- char *_hs_key=(char*)(key); \ +- hashv = 0; \ +- for(_sx_i=0; _sx_i < keylen; _sx_i++) \ +- hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i]; \ +- bkt = hashv & (num_bkts-1); \ +-} while (0) +- +-#define HASH_FNV(key,keylen,num_bkts,hashv,bkt) \ +-do { \ +- unsigned _fn_i; \ +- char *_hf_key=(char*)(key); \ +- hashv = 2166136261UL; \ +- for(_fn_i=0; _fn_i < keylen; _fn_i++) \ +- hashv = (hashv * 16777619) ^ _hf_key[_fn_i]; \ +- bkt = hashv & (num_bkts-1); \ +-} while(0) +- +-#define HASH_OAT(key,keylen,num_bkts,hashv,bkt) \ +-do { \ +- unsigned _ho_i; \ +- char *_ho_key=(char*)(key); \ +- hashv = 0; \ +- for(_ho_i=0; _ho_i < keylen; _ho_i++) { \ +- hashv += _ho_key[_ho_i]; \ +- hashv += (hashv << 10); \ +- hashv ^= (hashv >> 6); \ +- } \ +- hashv += (hashv << 3); \ +- hashv ^= (hashv >> 11); \ +- hashv += (hashv << 15); \ +- bkt = hashv & (num_bkts-1); \ +-} while(0) +- +-#define HASH_JEN_MIX(a,b,c) \ +-do { \ +- a -= b; a -= c; a ^= ( c >> 13 ); \ +- b -= c; b -= a; b ^= ( a << 8 ); \ +- c -= a; c -= b; c ^= ( b >> 13 ); \ +- a -= b; a -= c; a ^= ( c >> 12 ); \ +- b -= c; b -= a; b ^= ( a << 16 ); \ +- c -= a; c -= b; c ^= ( b >> 5 ); \ +- a -= b; a -= c; a ^= ( c >> 3 ); \ +- b -= c; b -= a; b ^= ( a << 10 ); \ +- c -= a; c -= b; c ^= ( b >> 15 ); \ +-} while (0) +- +-#define HASH_JEN(key,keylen,num_bkts,hashv,bkt) \ +-do { \ +- unsigned _hj_i,_hj_j,_hj_k; \ +- unsigned char *_hj_key=(unsigned char*)(key); \ +- hashv = 0xfeedbeef; \ +- _hj_i = _hj_j = 0x9e3779b9; \ +- _hj_k = (unsigned)keylen; \ +- while (_hj_k >= 12) { \ +- _hj_i += (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 ) \ +- + ( (unsigned)_hj_key[2] << 16 ) \ +- + ( (unsigned)_hj_key[3] << 24 ) ); \ +- _hj_j += (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 ) \ +- + ( (unsigned)_hj_key[6] << 16 ) \ +- + ( (unsigned)_hj_key[7] << 24 ) ); \ +- hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 ) \ +- + ( (unsigned)_hj_key[10] << 16 ) \ +- + ( (unsigned)_hj_key[11] << 24 ) ); \ +- \ +- HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ +- \ +- _hj_key += 12; \ +- _hj_k -= 12; \ +- } \ +- hashv += keylen; \ +- switch ( _hj_k ) { \ +- case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); \ +- case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); \ +- case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); \ +- case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); \ +- case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); \ +- case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); \ +- case 5: _hj_j += _hj_key[4]; \ +- case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); \ +- case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); \ +- case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); \ +- case 1: _hj_i += _hj_key[0]; \ +- } \ +- HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ +- bkt = hashv & (num_bkts-1); \ +-} while(0) +- +-/* The Paul Hsieh hash function */ +-#undef get16bits +-#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \ +- || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__) +-#define get16bits(d) (*((const uint16_t *) (d))) +-#endif +- +-#if !defined (get16bits) +-#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8) \ +- +(uint32_t)(((const uint8_t *)(d))[0]) ) +-#endif +-#define HASH_SFH(key,keylen,num_bkts,hashv,bkt) \ +-do { \ +- unsigned char *_sfh_key=(unsigned char*)(key); \ +- uint32_t _sfh_tmp, _sfh_len = keylen; \ +- \ +- int _sfh_rem = _sfh_len & 3; \ +- _sfh_len >>= 2; \ +- hashv = 0xcafebabe; \ +- \ +- /* Main loop */ \ +- for (;_sfh_len > 0; _sfh_len--) { \ +- hashv += get16bits (_sfh_key); \ +- _sfh_tmp = (uint32_t)(get16bits (_sfh_key+2)) << 11 ^ hashv; \ +- hashv = (hashv << 16) ^ _sfh_tmp; \ +- _sfh_key += 2*sizeof (uint16_t); \ +- hashv += hashv >> 11; \ +- } \ +- \ +- /* Handle end cases */ \ +- switch (_sfh_rem) { \ +- case 3: hashv += get16bits (_sfh_key); \ +- hashv ^= hashv << 16; \ +- hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)] << 18); \ +- hashv += hashv >> 11; \ +- break; \ +- case 2: hashv += get16bits (_sfh_key); \ +- hashv ^= hashv << 11; \ +- hashv += hashv >> 17; \ +- break; \ +- case 1: hashv += *_sfh_key; \ +- hashv ^= hashv << 10; \ +- hashv += hashv >> 1; \ +- } \ +- \ +- /* Force "avalanching" of final 127 bits */ \ +- hashv ^= hashv << 3; \ +- hashv += hashv >> 5; \ +- hashv ^= hashv << 4; \ +- hashv += hashv >> 17; \ +- hashv ^= hashv << 25; \ +- hashv += hashv >> 6; \ +- bkt = hashv & (num_bkts-1); \ +-} while(0) +- +-#ifdef HASH_USING_NO_STRICT_ALIASING +-/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads. +- * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error. +- * MurmurHash uses the faster approach only on CPU's where we know it's safe. +- * +- * Note the preprocessor built-in defines can be emitted using: +- * +- * gcc -m64 -dM -E - < /dev/null (on gcc) +- * cc -## a.c (where a.c is a simple test file) (Sun Studio) +- */ +-#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86)) +-#define MUR_GETBLOCK(p,i) p[i] +-#else /* non intel */ +-#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0) +-#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1) +-#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2) +-#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3) +-#define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL)) +-#if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__)) +-#define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24)) +-#define MUR_TWO_TWO(p) ((((*WP(p))&0x0000ffff) <<16) | (((*(WP(p)+1))&0xffff0000) >> 16)) +-#define MUR_ONE_THREE(p) ((((*WP(p))&0x000000ff) <<24) | (((*(WP(p)+1))&0xffffff00) >> 8)) +-#else /* assume little endian non-intel */ +-#define MUR_THREE_ONE(p) ((((*WP(p))&0xffffff00) >> 8) | (((*(WP(p)+1))&0x000000ff) << 24)) +-#define MUR_TWO_TWO(p) ((((*WP(p))&0xffff0000) >>16) | (((*(WP(p)+1))&0x0000ffff) << 16)) +-#define MUR_ONE_THREE(p) ((((*WP(p))&0xff000000) >>24) | (((*(WP(p)+1))&0x00ffffff) << 8)) +-#endif +-#define MUR_GETBLOCK(p,i) (MUR_PLUS0_ALIGNED(p) ? ((p)[i]) : \ +- (MUR_PLUS1_ALIGNED(p) ? MUR_THREE_ONE(p) : \ +- (MUR_PLUS2_ALIGNED(p) ? MUR_TWO_TWO(p) : \ +- MUR_ONE_THREE(p)))) +-#endif +-#define MUR_ROTL32(x,r) (((x) << (r)) | ((x) >> (32 - (r)))) +-#define MUR_FMIX(_h) \ +-do { \ +- _h ^= _h >> 16; \ +- _h *= 0x85ebca6b; \ +- _h ^= _h >> 13; \ +- _h *= 0xc2b2ae35l; \ +- _h ^= _h >> 16; \ +-} while(0) +- +-#define HASH_MUR(key,keylen,num_bkts,hashv,bkt) \ +-do { \ +- const uint8_t *_mur_data = (const uint8_t*)(key); \ +- const int _mur_nblocks = (keylen) / 4; \ +- uint32_t _mur_h1 = 0xf88D5353; \ +- uint32_t _mur_c1 = 0xcc9e2d51; \ +- uint32_t _mur_c2 = 0x1b873593; \ +- uint32_t _mur_k1 = 0; \ +- const uint8_t *_mur_tail; \ +- const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+_mur_nblocks*4); \ +- int _mur_i; \ +- for(_mur_i = -_mur_nblocks; _mur_i; _mur_i++) { \ +- _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i); \ +- _mur_k1 *= _mur_c1; \ +- _mur_k1 = MUR_ROTL32(_mur_k1,15); \ +- _mur_k1 *= _mur_c2; \ +- \ +- _mur_h1 ^= _mur_k1; \ +- _mur_h1 = MUR_ROTL32(_mur_h1,13); \ +- _mur_h1 = _mur_h1*5+0xe6546b64; \ +- } \ +- _mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4); \ +- _mur_k1=0; \ +- switch((keylen) & 3) { \ +- case 3: _mur_k1 ^= _mur_tail[2] << 16; \ +- case 2: _mur_k1 ^= _mur_tail[1] << 8; \ +- case 1: _mur_k1 ^= _mur_tail[0]; \ +- _mur_k1 *= _mur_c1; \ +- _mur_k1 = MUR_ROTL32(_mur_k1,15); \ +- _mur_k1 *= _mur_c2; \ +- _mur_h1 ^= _mur_k1; \ +- } \ +- _mur_h1 ^= (keylen); \ +- MUR_FMIX(_mur_h1); \ +- hashv = _mur_h1; \ +- bkt = hashv & (num_bkts-1); \ +-} while(0) +-#endif /* HASH_USING_NO_STRICT_ALIASING */ +- +-/* key comparison function; return 0 if keys equal */ +-#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) +- +-/* iterate over items in a known bucket to find desired item */ +-#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out) \ +-do { \ +- if (head.hh_head) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,head.hh_head)); \ +- else out=NULL; \ +- while (out) { \ +- if ((out)->hh.keylen == keylen_in) { \ +- if ((HASH_KEYCMP((out)->hh.key,keyptr,keylen_in)) == 0) break; \ +- } \ +- if ((out)->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,(out)->hh.hh_next)); \ +- else out = NULL; \ +- } \ +-} while(0) +- +-/* add an item to a bucket */ +-#define HASH_ADD_TO_BKT(head,addhh) \ +-do { \ +- head.count++; \ +- (addhh)->hh_next = head.hh_head; \ +- (addhh)->hh_prev = NULL; \ +- if (head.hh_head) { (head).hh_head->hh_prev = (addhh); } \ +- (head).hh_head=addhh; \ +- if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH) \ +- && (addhh)->tbl->noexpand != 1) { \ +- HASH_EXPAND_BUCKETS((addhh)->tbl); \ +- } \ +-} while(0) +- +-/* remove an item from a given bucket */ +-#define HASH_DEL_IN_BKT(hh,head,hh_del) \ +- (head).count--; \ +- if ((head).hh_head == hh_del) { \ +- (head).hh_head = hh_del->hh_next; \ +- } \ +- if (hh_del->hh_prev) { \ +- hh_del->hh_prev->hh_next = hh_del->hh_next; \ +- } \ +- if (hh_del->hh_next) { \ +- hh_del->hh_next->hh_prev = hh_del->hh_prev; \ +- } +- +-/* Bucket expansion has the effect of doubling the number of buckets +- * and redistributing the items into the new buckets. Ideally the +- * items will distribute more or less evenly into the new buckets +- * (the extent to which this is true is a measure of the quality of +- * the hash function as it applies to the key domain). +- * +- * With the items distributed into more buckets, the chain length +- * (item count) in each bucket is reduced. Thus by expanding buckets +- * the hash keeps a bound on the chain length. This bounded chain +- * length is the essence of how a hash provides constant time lookup. +- * +- * The calculation of tbl->ideal_chain_maxlen below deserves some +- * explanation. First, keep in mind that we're calculating the ideal +- * maximum chain length based on the *new* (doubled) bucket count. +- * In fractions this is just n/b (n=number of items,b=new num buckets). +- * Since the ideal chain length is an integer, we want to calculate +- * ceil(n/b). We don't depend on floating point arithmetic in this +- * hash, so to calculate ceil(n/b) with integers we could write +- * +- * ceil(n/b) = (n/b) + ((n%b)?1:0) +- * +- * and in fact a previous version of this hash did just that. +- * But now we have improved things a bit by recognizing that b is +- * always a power of two. We keep its base 2 log handy (call it lb), +- * so now we can write this with a bit shift and logical AND: +- * +- * ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0) +- * +- */ +-#define HASH_EXPAND_BUCKETS(tbl) \ +-do { \ +- unsigned _he_bkt; \ +- unsigned _he_bkt_i; \ +- struct UT_hash_handle *_he_thh, *_he_hh_nxt; \ +- UT_hash_bucket *_he_new_buckets, *_he_newbkt; \ +- _he_new_buckets = (UT_hash_bucket*)uthash_malloc( \ +- 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ +- if (!_he_new_buckets) { uthash_fatal( "out of memory"); } \ +- memset(_he_new_buckets, 0, \ +- 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ +- tbl->ideal_chain_maxlen = \ +- (tbl->num_items >> (tbl->log2_num_buckets+1)) + \ +- ((tbl->num_items & ((tbl->num_buckets*2)-1)) ? 1 : 0); \ +- tbl->nonideal_items = 0; \ +- for(_he_bkt_i = 0; _he_bkt_i < tbl->num_buckets; _he_bkt_i++) \ +- { \ +- _he_thh = tbl->buckets[ _he_bkt_i ].hh_head; \ +- while (_he_thh) { \ +- _he_hh_nxt = _he_thh->hh_next; \ +- HASH_TO_BKT( _he_thh->hashv, tbl->num_buckets*2, _he_bkt); \ +- _he_newbkt = &(_he_new_buckets[ _he_bkt ]); \ +- if (++(_he_newbkt->count) > tbl->ideal_chain_maxlen) { \ +- tbl->nonideal_items++; \ +- _he_newbkt->expand_mult = _he_newbkt->count / \ +- tbl->ideal_chain_maxlen; \ +- } \ +- _he_thh->hh_prev = NULL; \ +- _he_thh->hh_next = _he_newbkt->hh_head; \ +- if (_he_newbkt->hh_head) _he_newbkt->hh_head->hh_prev = \ +- _he_thh; \ +- _he_newbkt->hh_head = _he_thh; \ +- _he_thh = _he_hh_nxt; \ +- } \ +- } \ +- uthash_free( tbl->buckets, tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \ +- tbl->num_buckets *= 2; \ +- tbl->log2_num_buckets++; \ +- tbl->buckets = _he_new_buckets; \ +- tbl->ineff_expands = (tbl->nonideal_items > (tbl->num_items >> 1)) ? \ +- (tbl->ineff_expands+1) : 0; \ +- if (tbl->ineff_expands > 1) { \ +- tbl->noexpand=1; \ +- uthash_noexpand_fyi(tbl); \ +- } \ +- uthash_expand_fyi(tbl); \ +-} while(0) +- +- +-/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */ +-/* Note that HASH_SORT assumes the hash handle name to be hh. +- * HASH_SRT was added to allow the hash handle name to be passed in. */ +-#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn) +-#define HASH_SRT(hh,head,cmpfcn) \ +-do { \ +- unsigned _hs_i; \ +- unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize; \ +- struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail; \ +- if (head) { \ +- _hs_insize = 1; \ +- _hs_looping = 1; \ +- _hs_list = &((head)->hh); \ +- while (_hs_looping) { \ +- _hs_p = _hs_list; \ +- _hs_list = NULL; \ +- _hs_tail = NULL; \ +- _hs_nmerges = 0; \ +- while (_hs_p) { \ +- _hs_nmerges++; \ +- _hs_q = _hs_p; \ +- _hs_psize = 0; \ +- for ( _hs_i = 0; _hs_i < _hs_insize; _hs_i++ ) { \ +- _hs_psize++; \ +- _hs_q = (UT_hash_handle*)((_hs_q->next) ? \ +- ((void*)((char*)(_hs_q->next) + \ +- (head)->hh.tbl->hho)) : NULL); \ +- if (! (_hs_q) ) break; \ +- } \ +- _hs_qsize = _hs_insize; \ +- while ((_hs_psize > 0) || ((_hs_qsize > 0) && _hs_q )) { \ +- if (_hs_psize == 0) { \ +- _hs_e = _hs_q; \ +- _hs_q = (UT_hash_handle*)((_hs_q->next) ? \ +- ((void*)((char*)(_hs_q->next) + \ +- (head)->hh.tbl->hho)) : NULL); \ +- _hs_qsize--; \ +- } else if ( (_hs_qsize == 0) || !(_hs_q) ) { \ +- _hs_e = _hs_p; \ +- if (_hs_p){ \ +- _hs_p = (UT_hash_handle*)((_hs_p->next) ? \ +- ((void*)((char*)(_hs_p->next) + \ +- (head)->hh.tbl->hho)) : NULL); \ +- } \ +- _hs_psize--; \ +- } else if (( \ +- cmpfcn(DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \ +- DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q))) \ +- ) <= 0) { \ +- _hs_e = _hs_p; \ +- if (_hs_p){ \ +- _hs_p = (UT_hash_handle*)((_hs_p->next) ? \ +- ((void*)((char*)(_hs_p->next) + \ +- (head)->hh.tbl->hho)) : NULL); \ +- } \ +- _hs_psize--; \ +- } else { \ +- _hs_e = _hs_q; \ +- _hs_q = (UT_hash_handle*)((_hs_q->next) ? \ +- ((void*)((char*)(_hs_q->next) + \ +- (head)->hh.tbl->hho)) : NULL); \ +- _hs_qsize--; \ +- } \ +- if ( _hs_tail ) { \ +- _hs_tail->next = ((_hs_e) ? \ +- ELMT_FROM_HH((head)->hh.tbl,_hs_e) : NULL); \ +- } else { \ +- _hs_list = _hs_e; \ +- } \ +- if (_hs_e) { \ +- _hs_e->prev = ((_hs_tail) ? \ +- ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL); \ +- } \ +- _hs_tail = _hs_e; \ +- } \ +- _hs_p = _hs_q; \ +- } \ +- if (_hs_tail){ \ +- _hs_tail->next = NULL; \ +- } \ +- if ( _hs_nmerges <= 1 ) { \ +- _hs_looping=0; \ +- (head)->hh.tbl->tail = _hs_tail; \ +- DECLTYPE_ASSIGN(head,ELMT_FROM_HH((head)->hh.tbl, _hs_list)); \ +- } \ +- _hs_insize *= 2; \ +- } \ +- HASH_FSCK(hh,head); \ +- } \ +-} while (0) +- +-/* This function selects items from one hash into another hash. +- * The end result is that the selected items have dual presence +- * in both hashes. There is no copy of the items made; rather +- * they are added into the new hash through a secondary hash +- * hash handle that must be present in the structure. */ +-#define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \ +-do { \ +- unsigned _src_bkt, _dst_bkt; \ +- void *_last_elt=NULL, *_elt; \ +- UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL; \ +- ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst)); \ +- if (src) { \ +- for(_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) { \ +- for(_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head; \ +- _src_hh; \ +- _src_hh = _src_hh->hh_next) { \ +- _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh); \ +- if (cond(_elt)) { \ +- _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho); \ +- _dst_hh->key = _src_hh->key; \ +- _dst_hh->keylen = _src_hh->keylen; \ +- _dst_hh->hashv = _src_hh->hashv; \ +- _dst_hh->prev = _last_elt; \ +- _dst_hh->next = NULL; \ +- if (_last_elt_hh) { _last_elt_hh->next = _elt; } \ +- if (!dst) { \ +- DECLTYPE_ASSIGN(dst,_elt); \ +- HASH_MAKE_TABLE(hh_dst,dst); \ +- } else { \ +- _dst_hh->tbl = (dst)->hh_dst.tbl; \ +- } \ +- HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt); \ +- HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt],_dst_hh); \ +- (dst)->hh_dst.tbl->num_items++; \ +- _last_elt = _elt; \ +- _last_elt_hh = _dst_hh; \ +- } \ +- } \ +- } \ +- } \ +- HASH_FSCK(hh_dst,dst); \ +-} while (0) +- +-#define HASH_CLEAR(hh,head) \ +-do { \ +- if (head) { \ +- uthash_free((head)->hh.tbl->buckets, \ +- (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket)); \ +- HASH_BLOOM_FREE((head)->hh.tbl); \ +- uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ +- (head)=NULL; \ +- } \ +-} while(0) +- +-#define HASH_OVERHEAD(hh,head) \ +- (size_t)((((head)->hh.tbl->num_items * sizeof(UT_hash_handle)) + \ +- ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket)) + \ +- (sizeof(UT_hash_table)) + \ +- (HASH_BLOOM_BYTELEN))) +- +-#ifdef NO_DECLTYPE +-#define HASH_ITER(hh,head,el,tmp) \ +-for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL); \ +- el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL)) +-#else +-#define HASH_ITER(hh,head,el,tmp) \ +-for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL); \ +- el; (el)=(tmp),(tmp)=DECLTYPE(el)((tmp)?(tmp)->hh.next:NULL)) +-#endif +- +-/* obtain a count of items in the hash */ +-#define HASH_COUNT(head) HASH_CNT(hh,head) +-#define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0) +- +-typedef struct UT_hash_bucket { +- struct UT_hash_handle *hh_head; +- unsigned count; +- +- /* expand_mult is normally set to 0. In this situation, the max chain length +- * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If +- * the bucket's chain exceeds this length, bucket expansion is triggered). +- * However, setting expand_mult to a non-zero value delays bucket expansion +- * (that would be triggered by additions to this particular bucket) +- * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH. +- * (The multiplier is simply expand_mult+1). The whole idea of this +- * multiplier is to reduce bucket expansions, since they are expensive, in +- * situations where we know that a particular bucket tends to be overused. +- * It is better to let its chain length grow to a longer yet-still-bounded +- * value, than to do an O(n) bucket expansion too often. +- */ +- unsigned expand_mult; +- +-} UT_hash_bucket; +- +-/* random signature used only to find hash tables in external analysis */ +-#define HASH_SIGNATURE 0xa0111fe1 +-#define HASH_BLOOM_SIGNATURE 0xb12220f2 +- +-typedef struct UT_hash_table { +- UT_hash_bucket *buckets; +- unsigned num_buckets, log2_num_buckets; +- unsigned num_items; +- struct UT_hash_handle *tail; /* tail hh in app order, for fast append */ +- ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */ +- +- /* in an ideal situation (all buckets used equally), no bucket would have +- * more than ceil(#items/#buckets) items. that's the ideal chain length. */ +- unsigned ideal_chain_maxlen; +- +- /* nonideal_items is the number of items in the hash whose chain position +- * exceeds the ideal chain maxlen. these items pay the penalty for an uneven +- * hash distribution; reaching them in a chain traversal takes >ideal steps */ +- unsigned nonideal_items; +- +- /* ineffective expands occur when a bucket doubling was performed, but +- * afterward, more than half the items in the hash had nonideal chain +- * positions. If this happens on two consecutive expansions we inhibit any +- * further expansion, as it's not helping; this happens when the hash +- * function isn't a good fit for the key domain. When expansion is inhibited +- * the hash will still work, albeit no longer in constant time. */ +- unsigned ineff_expands, noexpand; +- +- uint32_t signature; /* used only to find hash tables in external analysis */ +-#ifdef HASH_BLOOM +- uint32_t bloom_sig; /* used only to test bloom exists in external analysis */ +- uint8_t *bloom_bv; +- char bloom_nbits; +-#endif +- +-} UT_hash_table; +- +-typedef struct UT_hash_handle { +- struct UT_hash_table *tbl; +- void *prev; /* prev element in app order */ +- void *next; /* next element in app order */ +- struct UT_hash_handle *hh_prev; /* previous hh in bucket order */ +- struct UT_hash_handle *hh_next; /* next hh in bucket order */ +- void *key; /* ptr to enclosing struct's key */ +- unsigned keylen; /* enclosing struct's key len */ +- unsigned hashv; /* result of hash-fcn(key) */ +-} UT_hash_handle; +- +-#endif /* UTHASH_H */ diff --git a/debian/patches/enable-libwrap.patch b/debian/patches/enable-libwrap.patch new file mode 100644 index 00000000..a8332809 --- /dev/null +++ b/debian/patches/enable-libwrap.patch @@ -0,0 +1,14 @@ +Description: Enable compile-time support for tcp-wrappers. +Author: Roger Light +Forwarded: not-needed +--- a/config.mk ++++ b/config.mk +@@ -15,7 +15,7 @@ + # ============================================================================= + + # Uncomment to compile the broker with tcpd/libwrap support. +-#WITH_WRAP:=yes ++WITH_WRAP:=yes + + # Comment out to disable SSL/TLS support in the broker and client. + # Disabling this will also mean that passwords must be stored in plain text. It diff --git a/debian/patches/enable-websockets.patch b/debian/patches/enable-websockets.patch new file mode 100644 index 00000000..e2c7dcbd --- /dev/null +++ b/debian/patches/enable-websockets.patch @@ -0,0 +1,14 @@ +Description: Enable websockets support. +Author: Roger Light +Forwarded: not-needed +--- a/config.mk ++++ b/config.mk +@@ -65,7 +65,7 @@ + WITH_UUID:=yes + + # Build with websockets support on the broker. +-WITH_WEBSOCKETS:=no ++WITH_WEBSOCKETS:=yes + + # Use elliptic keys in broker + WITH_EC:=yes diff --git a/debian/patches/fix-prefix.patch b/debian/patches/fix-prefix.patch new file mode 100644 index 00000000..f5cb365b --- /dev/null +++ b/debian/patches/fix-prefix.patch @@ -0,0 +1,14 @@ +Description: Install to /usr instead of /usr/local +Author: Roger Light +Forwarded: not-needed +--- a/config.mk ++++ b/config.mk +@@ -241,7 +241,7 @@ + endif + + INSTALL?=install +-prefix=/usr/local ++prefix=/usr + mandir=${prefix}/share/man + localedir=${prefix}/share/locale + STRIP?=strip diff --git a/debian/patches/libdir.patch b/debian/patches/libdir.patch new file mode 100644 index 00000000..4060ecb3 --- /dev/null +++ b/debian/patches/libdir.patch @@ -0,0 +1,58 @@ +Description: Debian specific fixes for multiarch support. +Author: Roger Light +Forwarded: not-needed +--- a/config.mk ++++ b/config.mk +@@ -245,3 +245,5 @@ + mandir=${prefix}/share/man + localedir=${prefix}/share/locale + STRIP?=strip ++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ++libdir=${DESTDIR}/usr/lib/${DEB_HOST_MULTIARCH} +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -24,16 +24,16 @@ + $(MAKE) -C cpp + + install : all +- $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ +- $(INSTALL) libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} +- ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so ++ $(INSTALL) -d ${libdir}/ ++ $(INSTALL) libmosquitto.so.${SOVERSION} ${libdir}/libmosquitto.so.${SOVERSION} ++ ln -sf libmosquitto.so.${SOVERSION} ${libdir}/libmosquitto.so + $(INSTALL) -d ${DESTDIR}${prefix}/include/ + $(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h + $(MAKE) -C cpp install + + uninstall : +- -rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} +- -rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so ++ -rm -f ${libdir}/libmosquitto.so.${SOVERSION} ++ -rm -f ${libdir}/libmosquitto.so + -rm -f ${DESTDIR}${prefix}/include/mosquitto.h + + reallyclean : clean +--- a/lib/cpp/Makefile ++++ b/lib/cpp/Makefile +@@ -9,15 +9,15 @@ + all : libmosquittopp.so.${SOVERSION} + + install : all +- $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ +- $(INSTALL) libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} +- ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so ++ $(INSTALL) -d ${libdir}/ ++ $(INSTALL) libmosquittopp.so.${SOVERSION} ${libdir}/libmosquittopp.so.${SOVERSION} ++ ln -sf libmosquittopp.so.${SOVERSION} ${libdir}/libmosquittopp.so + $(INSTALL) -d ${DESTDIR}${prefix}/include/ + $(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h + + uninstall : +- -rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} +- -rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so ++ -rm -f ${libdir}/libmosquittopp.so.${SOVERSION} ++ -rm -f ${libdir}/libmosquittopp.so + -rm -f ${DESTDIR}${prefix}/include/mosquittopp.h + + clean : diff --git a/debian/patches/nostrip.patch b/debian/patches/nostrip.patch new file mode 100644 index 00000000..cfaf5a12 --- /dev/null +++ b/debian/patches/nostrip.patch @@ -0,0 +1,53 @@ +Description: Don't strip binaries on install so it can be used for the -dbg package. +Author: Roger Light +Forwarded: not-needed +--- a/lib/cpp/Makefile ++++ b/lib/cpp/Makefile +@@ -10,7 +10,7 @@ + + install : all + $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ +- $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} ++ $(INSTALL) libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} + ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so + $(INSTALL) -d ${DESTDIR}${prefix}/include/ + $(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h +--- a/client/Makefile ++++ b/client/Makefile +@@ -24,8 +24,8 @@ + + install : all + $(INSTALL) -d ${DESTDIR}$(prefix)/bin +- $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub +- $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub ++ $(INSTALL) mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub ++ $(INSTALL) mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub + + uninstall : + -rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -25,7 +25,7 @@ + + install : all + $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ +- $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} ++ $(INSTALL) libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} + ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so + $(INSTALL) -d ${DESTDIR}${prefix}/include/ + $(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h +--- a/src/Makefile ++++ b/src/Makefile +@@ -103,10 +103,10 @@ + + install : all + $(INSTALL) -d ${DESTDIR}$(prefix)/sbin +- $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto ++ $(INSTALL) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto + $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h + ifeq ($(WITH_TLS),yes) +- $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd ++ $(INSTALL) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd + endif + + uninstall : diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..c83508ce --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +enable-libwrap.patch +fix-prefix.patch +nostrip.patch +disable-in-tree-uthash.patch +enable-websockets.patch +libdir.patch +build-timestamp.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..00ee840a --- /dev/null +++ b/debian/rules @@ -0,0 +1,29 @@ +#!/usr/bin/make -f + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +%: + dh $@ + +override_dh_installchangelogs: + dh_installchangelogs ChangeLog.txt + +override_dh_auto_configure: + # Don't process CMake rules, CMakeLists.txt is only included for Windows/Mac support. + +override_dh_auto_test: + +override_dh_strip: + dh_strip --dbg-package=mosquitto-dbg -Xlibmosquitto + dh_strip --dbg-package=libmosquitto1-dbg -Xlibmosquittopp -Xsbin/mosquitto + dh_strip --dbg-package=libmosquittopp1-dbg -Xlibmosquitto.so -Xsbin/mosquitto + +override_dh_auto_install: + dh_auto_install + install -d debian/tmp/etc/mosquitto/conf.d/ + install -m 644 debian/README-conf-d debian/tmp/etc/mosquitto/conf.d/README + install -d debian/tmp/etc/mosquitto/ca_certificates/ + install -m 644 debian/README-ca_certificates debian/tmp/etc/mosquitto/ca_certificates/README + install -d debian/tmp/etc/mosquitto/certs/ + install -m 644 debian/README-certs debian/tmp/etc/mosquitto/certs/README + install -m 644 debian/mosquitto.conf debian/tmp/etc/mosquitto/mosquitto.conf diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 00000000..4addedc4 --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,58 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBEoEgPwBEADeSeoLB59SoxrakvdK1WjGQZAbNXUgWhr9k0b08lpjwHhDFxZz +GalY/9IZ5C9WDzw8+DDvm7gD4vy1O5Q3peZ8qtQ1cD1H8MaM0Vzzz8fnXqWV2oww +sH7VH+ISKUZODCD76EG8JgUpWRO+TgfMylKWkuJC8BudSYUB5sdTyrcJ3n1PbbtJ +kZomIICIaoPR3VR5ySML4qe1as7PypxF3BnzgcmSKhByLNQcKyy35Lx86JnZvTm8 +FUcCsp+FgSMCubrvF4nhyJppUAbGoohyiULmfJAVHI01XQcqmQKim02nN88HQgKU +6FDbvgPMvCSDH9wCAHghPrccYGfAhaWC9/lkVAXo5NnJC7JdXi/l/VlXhZUwsAqc +pQFj7nJHliZLalrNe9MDdnRnBw5jGx+iRQ6n5a/uNH/ykPbgQKMzWF0O3tAGmqEl +zfLd46bFr09QNzs2HfBNygUhyKYO8VSLfl+WEsLT1pcpmWQuGNUsrrF1hT/UtAr0 +WTQw2pc2BQV1R/d7lGhAfB3VxtHjI2XIRHEPVJ2+r5bkc4GxVVw6l81AOhzUsoS9 +Bv+3SnRc5c7guR4ck/CgElXCw/xy9BcqyXN0fQtiMRmL33zo2ZE4ZNJeFsmFERUz +E+fHNfJrBHnVVboE6p/TX8dzIEKbYYGllInQVSQcoAv+Qm2/a19WidUQ8QARAQAB +tCFSb2dlciBBLiBMaWdodCA8cm9nZXJAYXRjaG9vLm9yZz6JAjoEEwEIACQCGwMC +HgECF4AFCwkIBwMFFQoJCAsFFgIDAQAFAkoEomgCGQEACgkQd5si37PnF7egPw// +REmew0Fb45wCVFBJyLHL+0qKQX/B9okac9fud3rYtLTPmeB04OL+tMb3/tOTJbyC +F2rDLvjE1IrqMwedDAY/bMKSPJ1RQ5NRa0WjXGLxkVBOqJuE8E6qGOLrL6/DSu7v +zoq8xzcKxbWDRgizSTuKQ9QHEGqPE8RDOyYnkbyGHwshtOhGbhpBeX55gxnIfOPi +To04f+iF61MbomkXxdlylMnEjEqGuF09jKb4o2U2zhC/pe73ANGIApf9ZRHmUbt8 +jduYgaffsj64FCw+qjTnf68ch+QjgDHFeCyO4BxeVOgYCDiafp7/CSk81K1DN+SF +n9Kjbcee4QGdIv2HmGTB576XBBbJ6bOgxYyuX1nw4m5a7cXKf0dpCimKQG/aUq2h +eGdD2KKs30bqPeaZRucFAZnrLxgfAvaj2eTEynJnSYoVB2ZNYs7qCe+oMtp8kkSl +za091I9rrBVFAEDGrRstJOOEtHJ8Qh4NT+yW/yKmpm7DyWYOJlR5ah+9G8njjlM8 +sFHwWNdbbWgO6zPNC/VktiLc0aCeu101M3ay1+RexT2bq1pFBKU/4DGRdE4vVERY +gHejkDVP4xml8j1JA6Azk4ik4/mQ+tDyxQsJJz0edIlTVwH8X4dwLp91wJajpFQQ +VQN/tMkyGHnrrrcfsri44URvDwdlvOtsAxPeipniavuIRgQTEQgABgUCSgTUVQAK +CRC88Em0D7n+z8RfAJ9Ie7JMWStpeYck6Ay8IbQHyJLJCwCdEzfdkmpK4a1sIk32 +fc/5ss3NtjuJAhwEEAECAAYFAkvd9U0ACgkQddvLEIxoAM4PVA/9FIyp7o/goX6G +If49jBrnUFZacWssL7Cs798PBy68hGbP10wZiKH5yc6ofuZOdEHzWVKvKuMja/Jo +6eQJtmXwmXAwV0grQ0e/LmadpswuojUA8tawch5xe/0f47FAmoGmNrL/yi8bpv2t +BV/DFKWSg1BAbHM3BoH0qLSwvdL0zOPCWWvX1pkANbWUueREjzc/xNnkwEUFsO2+ +ol19YQmZe7rKpo5pa53DhPqvWuol2z5TXc8YbDNOP4T2rqpdwZjbYpHduttNIzK4 +h8HsAp4QF3u2e2sbro3Uhx0uRp2d/7y3x6hflHK2U6t1yGA5uC5yYT1KaXkFZQTt +h2kPoEk9Bb1MImnPiqmQeW6g8r/msMq+d/DcOO0KjTkuqhsIN0Xx6W75toXhEjpl +j2pes8+6lSQnTznd9Kj5GeziWUdYhYmrpS/OJIDl0pKzJM0N6PnhBILMl8vbrpX8 +Zsbn/ipk8xIb1ck8X1hjg92RJPwPOy204yzpgK1xXXch8wKPwTSn8QleEndwrGxp +BEbTrVaquYNy+lWuXs0RENJEy6EWnebhF3ycGV2vvXLOOlAVE3upgLvNugKhT9qG +Pxqr/r+FmCfSx05LpX3bUvz0OLmS6JhU/pnZGYrEa8pWY78Mbb3BMpIcwgYzPr+S +zbLaOpOy4PyGUOAIM+oEcKrSr458/nqJAhwEEAEIAAYFAkvfG7QACgkQYum3VLFy +NpIY5xAAlNai3YFtzxU7WjdITuVFrOSH2xJlWAzdbZ+7ijSuPzeBmHI+fYFxfkv2 +76sh+A4K9QV1tdJn9cZAiH4cSuRdnCGdWFnPh+bAgsEjuLyt8U/OzvSOmbMT9g10 +iYiuR+qZNEde/NHUOTUWvgQcwATb8sREx4bxgdrtB503DVs5WeOg8MpVJwp66xHt +zxCRWj/6urvnqkmicIDeR2nMc/D9yJWP90wxBeZoJGqiqcCeCWknQeBj7Qijr0Jt +Ys/If1g9fwj4vSXBctZb49xT/Kj/hwBnSWro8dQVz0iU1vxfGhxkRTQwXWfqiA6X +FJPYKLdvN4wU/3xP3jEy7rLyyQaIOcx9K7F/UUn/C7TOOq47PEXeLGPp4DR12pPC +urmWqcZQlB+GpVKP1W6c+1WGUmhRvOKx5KJBj8IdFcOG0Y0OK4+2xaEq4aZOPg+t +djoULu38AW2yzHW6vzE9toZXMRXtoPmbs5i+MCvOGp1HJkSnkVIdFS1Wnp1boQ3Z +C+eCF2tScI8Ulbj99LlodipomHeIxvo3DJcra9zV1KGGWCwU9hkLWugrcyWJPX1m +asdx2S7Y6dIurDV+M8PcNOY7nYbST2qwnnS7dGeQbV17RzNeeppfSwYCfwY9qmLZ +thkC1keFi/AoRIpIwGiQ/7RA9/4wdKIBMaTKuqlgNUgc9+QcXvyIRgQQEQIABgUC +S96lpwAKCRBhGkhEuMJTwdVYAJoD4voyORSCjlz32RPCMiE7ru4iJACeJweng6lC +jBrgT93OSCI/59FLKyKIRgQQEQIABgUCS+dHZwAKCRC6bhqXQ3UZAxAIAJ0VvKnK +qeGmZpNdJwK/6Kdzfd0K6wCgrX0vJPcp7ZFLQpHeCB0yt+O7zr6IRgQQEQIABgUC +S/ZX+gAKCRAgmbZMvxVJCw4NAJ4z1YF3InURoqE/ZBHWCPvICqtWewCg30QxvdLz +0nYf/elPCss1nZIWOa8= +=S/ue +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..fa753aba --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="pgpsigurlmangle=s/$/.asc/" \ + http://mosquitto.org/files/source/mosquitto-(.*)\.tar\.gz