Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
649
Issues
649
List
Boards
Labels
Service Desk
Milestones
Merge Requests
204
Merge Requests
204
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
c7054f04
Commit
c7054f04
authored
Dec 02, 2017
by
TBK
Committed by
Leonardo Arena
Dec 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/mosquitto: rebuild against libwebsockets 2.4.1; modernize
parent
47618ea9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
11 deletions
+34
-11
main/mosquitto/APKBUILD
main/mosquitto/APKBUILD
+20
-11
main/mosquitto/test_broker_makefile.patch
main/mosquitto/test_broker_makefile.patch
+14
-0
No files found.
main/mosquitto/APKBUILD
View file @
c7054f04
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
mosquitto
pkgver
=
1.4.14
pkgrel
=
3
pkgrel
=
4
pkgdesc
=
"An Open Source MQTT v3.1 Broker"
url
=
"http://mosquitto.org/"
arch
=
"all"
license
=
"BSD"
depends
=
""
depends_dev
=
""
makedepends
=
"
$depends_dev
libressl-dev c-ares-dev util-linux-dev
libwebsockets-dev"
replaces
=
"mosquitto-utils"
install
=
"
$pkgname
.pre-install"
# "abuild -r" then test/mosq_test.py can't start subprocess "$srcdir/src/mosquitto"
# "abuild check" will run subprocess and execute the tests without any issues.
options
=
"!check"
makedepends
=
"libressl-dev c-ares-dev util-linux-dev libwebsockets-dev libxslt"
checkdepends
=
"python2"
subpackages
=
"
$pkgname
-dev
$pkgname
-doc
$pkgname
-libs++:_pp
$pkgname
-libs
$pkgname
-clients"
replaces
=
"mosquitto-utils"
source
=
"http://mosquitto.org/files/source/
$pkgname
-
$pkgver
.tar.gz
test_broker_makefile.patch
libressl.patch
config.patch
mosquitto.initd"
...
...
@@ -27,7 +29,7 @@ builddir="$srcdir/$pkgname-$pkgver"
# - CVE-2017-7650
prepare
()
{
default_prepare
||
return
1
default_prepare
# dont strip
sed
-i
-e
"s|(INSTALL) -s|(INSTALL)|g"
\
...
...
@@ -44,18 +46,24 @@ build() {
WITH_SRV
=
yes
\
WITH_TLS_PSK
=
no
\
WITH_ADNS
=
no
\
prefix
=
/usr
||
return
1
prefix
=
/usr
}
check
()
{
cd
"
$builddir
"
make
test
}
package
()
{
cd
"
$builddir
"
make
prefix
=
/usr
DESTDIR
=
"
$pkgdir
"
install
||
return
1
make
prefix
=
/usr
DESTDIR
=
"
$pkgdir
"
install
mv
"
$pkgdir
"
/etc/mosquitto/mosquitto.conf.example
\
"
$pkgdir
"
/etc/mosquitto/mosquitto.conf
||
return
1
"
$pkgdir
"
/etc/mosquitto/mosquitto.conf
sed
-i
-e
's/#log_dest stderr/log_dest syslog/'
\
"
$pkgdir
"
/etc/mosquitto/mosquitto.conf
||
return
1
"
$pkgdir
"
/etc/mosquitto/mosquitto.conf
install
-Dm755
"
$srcdir
"
/mosquitto.initd
"
$pkgdir
"
/etc/init.d/mosquitto
}
...
...
@@ -77,6 +85,7 @@ clients() {
}
sha512sums
=
"dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2 mosquitto-1.4.14.tar.gz
b4c5c4d513c58b24aa5dec11fc3c644d18cc447eed099de77ea518ce1a70f84854b03f242d756462e46067872a89f0c2c49728ff2424a31dc9cac93c5c1e332b test_broker_makefile.patch
53859b628f965b77f6e47910c0ceba2f2737b815131ed800dc64a80419e434d25b5ba0938ae645882e9aa5d475d4940c7d35cc6d56f54bc4937a66b32d7db4ad libressl.patch
d5442373ae6ae8bc83eee59b425fbd76e80f905b9fd2bd2ed2a37a7e156fe95a9cf477c9c4dac0975c5fd90e70884de6fb8a16aefcd37b239199d5deae50b7d2 config.patch
16f96d8f7f3a8b06e2b2e04d42d7e0d89a931b52277fc017e4802f7a3bc85aff4dd290b1a0c40382ea8f5568d0ceb7319c031d9be916f346d805231a002b0433 mosquitto.initd"
main/mosquitto/test_broker_makefile.patch
0 → 100644
View file @
c7054f04
#
https://github.com/eclipse/mosquitto/issues/636
--- a/test/broker/Makefile
+++ b/test/broker/Makefile
@@ -89,8 +89,10 @@
./08-ssl-connect-identity.py
./08-ssl-connect-no-identity.py
./08-ssl-bridge.py
+ifeq ($(WITH_TLS_PSK),yes)
./08-tls-psk-pub.py
./08-tls-psk-bridge.py
+endif
endif
09 :
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment