pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
mosquitto: Add/adjust comments.
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Mon Sep 3 20:40:45 2018 -0400
Changeset: 47b70b4553eafede54dd33f18af9fe424307caec
Modified Files:
mosquitto/distinfo
mosquitto/patches/patch-aa
mosquitto/patches/patch-ab
mosquitto/patches/patch-ac
mosquitto/patches/patch-ad
mosquitto/patches/patch-ae
mosquitto/patches/patch-af
mosquitto/patches/patch-ag
mosquitto/patches/patch-ah
mosquitto/patches/patch-ai
mosquitto/patches/patch-aj
mosquitto/patches/patch-ak
mosquitto/patches/patch-al
mosquitto/patches/patch-am
mosquitto/patches/patch-an
Log Message:
mosquitto: Add/adjust comments.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=47b70b4553eafede54dd33f18af9fe424307caec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mosquitto/distinfo | 28 ++++++++++++++--------------
mosquitto/patches/patch-aa | 4 +++-
mosquitto/patches/patch-ab | 8 +++++++-
mosquitto/patches/patch-ac | 4 +++-
mosquitto/patches/patch-ad | 5 ++++-
mosquitto/patches/patch-ae | 8 +++++++-
mosquitto/patches/patch-af | 4 +++-
mosquitto/patches/patch-ag | 5 ++++-
mosquitto/patches/patch-ah | 4 +++-
mosquitto/patches/patch-ai | 4 +++-
mosquitto/patches/patch-aj | 2 ++
mosquitto/patches/patch-ak | 8 +++++++-
mosquitto/patches/patch-al | 4 +++-
mosquitto/patches/patch-am | 4 +++-
mosquitto/patches/patch-an | 4 +++-
15 files changed, 69 insertions(+), 27 deletions(-)
diffs:
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 764b6d3322..fb1fe90d69 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -4,17 +4,17 @@ SHA1 (mosquitto-1.4.15.tar.gz) = e3216a608b19ec56341e0897a12cb178f0b085ca
RMD160 (mosquitto-1.4.15.tar.gz) = d2438c8c3b2005265def411826961f94c9413b52
SHA512 (mosquitto-1.4.15.tar.gz) = 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
Size (mosquitto-1.4.15.tar.gz) = 368961 bytes
-SHA1 (patch-aa) = 9bf1ff1a55a27192e5f528fbf5d376b47841b831
-SHA1 (patch-ab) = a0aac10a9b96aa098178de7ff08fa52867f87e6b
-SHA1 (patch-ac) = 9ff1dd59ed5dbf499c82a8144d86e5d6cc6cd2e9
-SHA1 (patch-ad) = 722c3b11f8ff75d2ce6dc987dc31982f9d53ba81
-SHA1 (patch-ae) = 690558efe530f335b5d0d8a17618fcd1c4394126
-SHA1 (patch-af) = 90561fcebe1bc2212e834d7cb12608d226246977
-SHA1 (patch-ag) = dd645cca8be0ca63b34737e35a1dcc3c29bd55f7
-SHA1 (patch-ah) = 87a54f8a1b75986352dc27ad720202281c017a57
-SHA1 (patch-ai) = c15ccca3b0bcdee389324f6e2090a371fb7be74d
-SHA1 (patch-aj) = d592d5442e2b3364bd6cf7cec25d8bf41bf6027d
-SHA1 (patch-ak) = 85e65fa30dac09bcb9b8150fe98d967ba0cf25e4
-SHA1 (patch-al) = 4baa9d647953eec6149c95ba871aaec562206c69
-SHA1 (patch-am) = 67b1cbf3514d37e3f9b0253c65f5ad21cfc201de
-SHA1 (patch-an) = 28f82706cc0e8cc211f62ac316d0c354b4f0bc0d
+SHA1 (patch-aa) = f75af70317c8617cfa3289532231fd4289390894
+SHA1 (patch-ab) = 3d22528fb6cd0f8dc6218c1a3d14dd99e9f27674
+SHA1 (patch-ac) = b2d5ee16e328e0de590a5b92155a50e97ce6fad2
+SHA1 (patch-ad) = ed13ec2fdcc58082c4c27f63dd5afaa3805adff6
+SHA1 (patch-ae) = 9950d48840a93006ddb9cbeaac9867215e523931
+SHA1 (patch-af) = 910122fbe47526ac149871e23f6d3bed77c9fcb9
+SHA1 (patch-ag) = 63bd84643230a7e8486e3d7708c5503bd2eb8e10
+SHA1 (patch-ah) = b49e6c203695b64052926014b00f7098c4a17e2d
+SHA1 (patch-ai) = 8dcc43abfbbc823c70201fc78af20872ca1e3a84
+SHA1 (patch-aj) = 7f1acef0911f6839effb77f6fb70d99150b781ae
+SHA1 (patch-ak) = e967013010936d93e178bc4a55e3417a9a28e51d
+SHA1 (patch-al) = c9ea3c2de532060ea35993fd031c690b1849dd77
+SHA1 (patch-am) = 3b21040ea426c4ef9d742e4e52a7bcc34a9af269
+SHA1 (patch-an) = 96584ae38417be787cfa7cc1fcc31a33a7261780
diff --git a/mosquitto/patches/patch-aa b/mosquitto/patches/patch-aa
index fe8c5baca1..a5d9201bf0 100644
--- a/mosquitto/patches/patch-aa
+++ b/mosquitto/patches/patch-aa
@@ -1,5 +1,7 @@
$NetBSD$
-Copying from OpenBSD
+
+In cmake build, adjust paths to pkgsrc norms. (From OpenBSD.)
+
--- CMakeLists.txt.orig 2016-06-02 21:20:22.000000000 +0000
+++ CMakeLists.txt 2016-08-28 15:50:53.430205374 +0000
@@ -37,18 +40,12 @@
diff --git a/mosquitto/patches/patch-ab b/mosquitto/patches/patch-ab
index 8af93fe8d4..d284886b0d 100644
--- a/mosquitto/patches/patch-ab
+++ b/mosquitto/patches/patch-ab
@@ -1,5 +1,11 @@
$NetBSD$
-Supports NetBSD detection
+
+On NetBSD, do not include librt. (Why? All other "UNIX" does, except Mac.)
+
+Do not invoke ldconfig after installation, because it's unportable
+(and systems that need it should do it separately, rather than
+expecting it to be part of builds). (From OpenBSD.)
+
--- lib/CMakeLists.txt.orig 2017-02-20 22:06:57.000000000 +0000
+++ lib/CMakeLists.txt 2017-02-25 12:06:08.924946745 +0000
@@ -48,12 +48,12 @@
diff --git a/mosquitto/patches/patch-ac b/mosquitto/patches/patch-ac
index 9855c8a1af..e5bdf4d6a5 100644
--- a/mosquitto/patches/patch-ac
+++ b/mosquitto/patches/patch-ac
@@ -1,5 +1,7 @@
$NetBSD$
-Taken from OpenBSD
+
+Omit ldconfig (from OpenBSD).
+
--- lib/cpp/CMakeLists.txt.orig 2016-06-02 21:20:22.000000000 +0000
+++ lib/cpp/CMakeLists.txt 2016-08-28 14:01:52.611842007 +0000
@@ -13,6 +13,3 @@
diff --git a/mosquitto/patches/patch-ad b/mosquitto/patches/patch-ad
index f592e959e3..4bb39f335b 100644
--- a/mosquitto/patches/patch-ad
+++ b/mosquitto/patches/patch-ad
@@ -1,5 +1,8 @@
$NetBSD$
-Better defaults for configuration, inspired by FreeBSD
+
+Better defaults for configuration, inspired by FreeBSD.
+\todo Rethink if we should be deviating from upstream.
+
--- mosquitto.conf.orig 2016-06-02 21:20:22.000000000 +0000
+++ mosquitto.conf 2016-08-28 15:28:28.495612360 +0000
@@ -32,7 +32,7 @@
diff --git a/mosquitto/patches/patch-ae b/mosquitto/patches/patch-ae
index 49a55357b6..5384be7d9f 100644
--- a/mosquitto/patches/patch-ae
+++ b/mosquitto/patches/patch-ae
@@ -1,5 +1,11 @@
$NetBSD$
-Supports configuration for NetBSD, taken from OpenBSD
+
+On NetBSD, don't use -ldl (why?).
+
+For uuid, insist on library, not just header (why?).
+
+Omit ldconfig (from OpenBSD).
+
--- src/CMakeLists.txt.orig 2017-02-20 22:06:57.000000000 +0000
+++ src/CMakeLists.txt 2017-02-25 12:18:04.360077118 +0000
@@ -95,6 +95,8 @@
diff --git a/mosquitto/patches/patch-af b/mosquitto/patches/patch-af
index 0388c6b2c5..e70fe832f6 100644
--- a/mosquitto/patches/patch-af
+++ b/mosquitto/patches/patch-af
@@ -1,5 +1,7 @@
$NetBSD$
-Missing NetBSD detection, opened upstream pull request
+
+Missing NetBSD detection, opened upstream pull request.
+
--- lib/memory_mosq.h.orig 2016-06-02 21:20:22.000000000 +0000
+++ lib/memory_mosq.h 2016-08-28 14:30:34.000000000 +0000
@@ -20,7 +20,7 @@
diff --git a/mosquitto/patches/patch-ag b/mosquitto/patches/patch-ag
index 5b5e8f0075..ae6e6b6cda 100644
--- a/mosquitto/patches/patch-ag
+++ b/mosquitto/patches/patch-ag
@@ -1,5 +1,8 @@
$NetBSD$
-Taken from OpenBSD, maybe useful for others
+
+Include sys/socket.h (from OpenBSD).
+\todo verify if needed.
+
--- lib/tls_mosq.c.orig 2016-06-02 21:20:22.000000000 +0000
+++ lib/tls_mosq.c 2016-08-28 14:31:56.000000000 +0000
@@ -20,6 +20,7 @@
diff --git a/mosquitto/patches/patch-ah b/mosquitto/patches/patch-ah
index 76870f6efc..da968564e2 100644
--- a/mosquitto/patches/patch-ah
+++ b/mosquitto/patches/patch-ah
@@ -1,5 +1,7 @@
$NetBSD$
-Support exception for NetBSD, taken from FreeBSD
+
+Include NetBSD with Free/Open in not including -ldl (from FreeBSD).
+
--- config.mk.orig 2016-06-02 21:20:22.000000000 +0000
+++ config.mk 2016-08-28 15:27:03.968104814 +0000
@@ -115,7 +115,7 @@
diff --git a/mosquitto/patches/patch-ai b/mosquitto/patches/patch-ai
index 890ee1974a..f7a5c6c0f0 100644
--- a/mosquitto/patches/patch-ai
+++ b/mosquitto/patches/patch-ai
@@ -1,5 +1,7 @@
$NetBSD$
-Missing NetBSD detection, opened upstream pull request
+
+Missing NetBSD detection, opened upstream pull request.
+
--- src/net.c.orig 2016-06-02 21:20:22.000000000 +0000
+++ src/net.c 2016-08-28 15:15:07.413097823 +0000
@@ -35,7 +35,7 @@
diff --git a/mosquitto/patches/patch-aj b/mosquitto/patches/patch-aj
index e67530c605..9e454c898a 100644
--- a/mosquitto/patches/patch-aj
+++ b/mosquitto/patches/patch-aj
@@ -1,5 +1,7 @@
$NetBSD$
+
Missing NetBSD detection, opened upstream pull request
+
--- lib/net_mosq.c.orig 2016-06-02 21:20:22.000000000 +0000
+++ lib/net_mosq.c 2016-08-28 15:15:43.540861477 +0000
@@ -34,7 +34,7 @@
diff --git a/mosquitto/patches/patch-ak b/mosquitto/patches/patch-ak
index 9de98fe8a8..e4a4c419a0 100644
--- a/mosquitto/patches/patch-ak
+++ b/mosquitto/patches/patch-ak
@@ -1,5 +1,11 @@
$NetBSD$
-BSDs don't support long options
+
+Don't use unportable --strip-program with install. This is
+unnecessary because$(INSTALL) should be the cross install which knows
+how to strip anyway.
+
+Not yet filed upstream.
+
--- lib/Makefile.orig 2016-08-29 21:51:21.897719218 +0000
+++ lib/Makefile 2016-08-29 21:51:43.349422011 +0000
@@ -25,7 +25,7 @@
diff --git a/mosquitto/patches/patch-al b/mosquitto/patches/patch-al
index 84c56b7e8d..fd2a76ee2b 100644
--- a/mosquitto/patches/patch-al
+++ b/mosquitto/patches/patch-al
@@ -1,5 +1,7 @@
$NetBSD$
-BSDs don't support long options
+
+See patch-ak.
+
--- src/Makefile.orig 2016-08-29 21:52:55.923491416 +0000
+++ src/Makefile 2016-08-29 21:53:27.614743795 +0000
@@ -103,12 +103,12 @@
diff --git a/mosquitto/patches/patch-am b/mosquitto/patches/patch-am
index 6afb29f0b8..edbdac76ec 100644
--- a/mosquitto/patches/patch-am
+++ b/mosquitto/patches/patch-am
@@ -1,5 +1,7 @@
$NetBSD$
-BSDs don't support long options
+
+See patch-ak.
+
--- lib/cpp/Makefile.orig 2016-08-29 21:50:11.282837830 +0000
+++ lib/cpp/Makefile 2016-08-29 21:50:41.337564781 +0000
@@ -10,7 +10,7 @@
diff --git a/mosquitto/patches/patch-an b/mosquitto/patches/patch-an
index 71d5ddfb6a..ee3db38eff 100644
--- a/mosquitto/patches/patch-an
+++ b/mosquitto/patches/patch-an
@@ -1,5 +1,7 @@
$NetBSD$
-BSDs don't support long options
+
+See patch-ak.
+
--- client/Makefile.orig 2016-08-29 21:52:12.870263205 +0000
+++ client/Makefile 2016-08-29 21:52:39.329840759 +0000
@@ -24,8 +24,8 @@
Home |
Main Index |
Thread Index |
Old Index