pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mosquitto: Update TODO



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Sep 4 06:47:10 2018 -0400
Changeset:	ddeeb68a5e5b365aa903b4a322dafc27161dca66

Modified Files:
	mosquitto/Makefile
	mosquitto/TODO
	mosquitto/distinfo
Removed Files:
	mosquitto/patches/patch-ah

Log Message:
mosquitto: Update TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ddeeb68a5e5b365aa903b4a322dafc27161dca66

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mosquitto/Makefile         | 12 ++++++------
 mosquitto/TODO             |  8 ++++++--
 mosquitto/distinfo         |  1 -
 mosquitto/patches/patch-ah | 19 -------------------
 4 files changed, 12 insertions(+), 28 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 52605d7847..ea1574c563 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -17,6 +17,12 @@ USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
 USE_TOOLS+=	gmake
 
+# config.mk is in theory used by only the non-cmake build.  Remove it,
+# to force a failure if it somehow becomes used.
+post-patch:
+	${RM} ${WRKRSC}/config.mk
+
+
 CONF_FILES=	share/examples/mosquitto/pskfile.example \
 		share/examples/mosquitto/pwfile.example \
 		share/examples/mosquitto/mosquitto.conf \
@@ -31,12 +37,6 @@ SUBST_FILES.ldconfig=		lib/CMakeLists.txt \
 				src/CMakeLists.txt
 SUBST_SED.ldconfig=		-E -e '/EXEC_PROGRAM\(\/sbin\/ldconfig/d'
 
-# \todo Perhaps delete as no longer needed
-SUBST_STAGE.strip=		post-extract
-SUBST_MESSAGE.strip=		removing unportable cross strip
-SUBST_FILES.strip=		lib/Makefile src/Makefile lib/cpp/Makefile client/Makefile
-SUBST_SED.strip=		-E -e '/--strip-program=\$${CROSS_COMPILE}\$${STRIP}/d'
-
 post-install:
 	mkdir ${DESTDIR}${PREFIX}/share/examples/mosquitto
 	${INSTALL_DATA}	${WRKSRC}/pskfile.example ${WRKSRC}/pwfile.example ${WRKSRC}/mosquitto.conf ${WRKSRC}/aclfile.example ${DESTDIR}${PREFIX}/share/examples/mosquitto
diff --git a/mosquitto/TODO b/mosquitto/TODO
index a149fa4c9b..45013b56fa 100644
--- a/mosquitto/TODO
+++ b/mosquitto/TODO
@@ -20,5 +20,9 @@ a bug about this.
 
 * security
 
-This package has known vulnerabilities, please investigate and fix if possible:
- CVE-2017-7653, CVE-2017-7654
+Check if these are really fixed in 1.5.1:
+  https://nvd.nist.gov/vuln/detail/CVE-2017-7653
+  https://nvd.nist.gov/vuln/detail/CVE-2017-7654
+
+Query sent to list on 20180904.
+
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 719bee7b33..0f17da9f57 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -8,4 +8,3 @@ SHA1 (patch-aa) = c23d6f014f64603dc0120ef74694fec6ee161215
 SHA1 (patch-ab) = ce5571c0d8e86a99d9cb641adfe5f8f66537370a
 SHA1 (patch-ad) = ed13ec2fdcc58082c4c27f63dd5afaa3805adff6
 SHA1 (patch-ae) = 7e5b4cdb06515cbd6b02239eed974b673e9f8bfa
-SHA1 (patch-ah) = 84fb0a78f68ba35d079a32ce5d2c57192101fc54
diff --git a/mosquitto/patches/patch-ah b/mosquitto/patches/patch-ah
deleted file mode 100644
index 8aca5b4b12..0000000000
--- a/mosquitto/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Set prefix, etc. to pkgsrc norms.
-
---- config.mk.orig	2018-08-16 16:05:26.000000000 +0000
-+++ config.mk
-@@ -272,9 +272,9 @@ ifeq ($(WITH_WEBSOCKETS),static)
- endif
- 
- INSTALL?=install
--prefix=/usr/local
--mandir=${prefix}/share/man
--localedir=${prefix}/share/locale
-+prefix=${PREFIX}
-+mandir=${PREFIX}/man
-+localedir=${PREFIX}/share/locale
- STRIP?=strip
- 
- ifeq ($(WITH_STRIP),yes)


Home | Main Index | Thread Index | Old Index