X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from st11p00mm-asmtp001.mac.com (st11p00mm-asmtpout001.mac.com [17.172.81.0]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id D4557DC00B1 for ; Thu, 5 Mar 2015 09:20:04 +0000 (UTC) Received: from st.ilet.to (weisshorn.alpinelinux.uk [31.193.133.175]) by st11p00mm-asmtp001.mac.com (Oracle Communications Messaging Server 7.0.5.35.0 64bit (built Dec 4 2014)) with ESMTPSA id <0NKQ00FPTF98Z820@st11p00mm-asmtp001.mac.com> for alpine-devel@lists.alpinelinux.org; Thu, 05 Mar 2015 09:20:03 +0000 (GMT) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-03-05_03:2015-03-03,2015-03-05,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=2 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1412110000 definitions=main-1503050100 Date: Thu, 05 Mar 2015 09:19:55 +0000 (GMT) From: ScrumpyJack X-X-Sender: nicholas@st.ilet.to To: Alpine Devel List Subject: [alpine-devel] [PATCH] testing/monkey: updated version and added SSL support. Message-id: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-version: 1.0 Content-type: MULTIPART/MIXED; BOUNDARY="0-1092296745-1425547202=:18012" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-1092296745-1425547202=:18012 Content-Type: TEXT/PLAIN; charset="iso-8859-2" Content-Transfer-Encoding: quoted-printable here is a sprunge if the patch fails http://sprunge.us/HIYS Monkey is a lightweight and powerful web server http://monkey-project.com/ --- testing/monkey/APKBUILD | 85 ++++++++++++++++++++++-------------------= ---- testing/monkey/monkey.confd | 5 --- testing/monkey/monkey.initd | 25 ------------- 3 files changed, 41 insertions(+), 74 deletions(-) delete mode 100644 testing/monkey/monkey.confd delete mode 100644 testing/monkey/monkey.initd diff --git a/testing/monkey/APKBUILD b/testing/monkey/APKBUILD index b3f2d75..d9be9d9 100644 --- a/testing/monkey/APKBUILD +++ b/testing/monkey/APKBUILD @@ -1,55 +1,52 @@ -# Maintainer: Bart=B3omiej Piotrowski - +# Contributor: Bart=B3omiej Piotrowski +# Maintainer: ScrumpyJack pkgname=3Dmonkey -pkgver=3D1.4.0 +pkgver=3D1.5.5 pkgrel=3D0 -pkgdesc=3D'Fast and lightweight HTTP server designed for embedded devices' -url=3D'http://monkey-project.com' -license=3D'GPL2' -arch=3D'all' -makedepends=3D'bash findutils' -subpackages=3D"$pkgname-doc $pkgname-dev" -source=3D"$url/releases/${pkgver%.*}/monkey-$pkgver.tar.gz - monkey.initd - monkey.confd" - -_builddir=3D"$srcdir"/$pkgname-$pkgver - +pkgdesc=3D"Monkey is a lightweight and powerful web server " +url=3D"http://monkey-project.com/" +arch=3D"all" +license=3D"ASL 2.0" +depends=3D"" +depends_dev=3D"" +makedepends=3D"bash polarssl-dev findutils" +install=3D"" +subpackages=3D"$pkgname-doc" +source=3D"http://monkey-project.com/releases/1.5/${pkgname}-${pkgver}.tar.= gz" + +_builddir=3D"${srcdir}/${pkgname}-${pkgver}" prepare() { - cd "$_builddir" - sed -i -e '737s/nobody/http/' -e '/create_banana_script bindir/d' \ - -e '/Creating bin\/banana/d' configure || return 1 - sed -i '1i #define NO_BACKTRACE' src/mk_utils.c || return 1 + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } =20 build() { - cd "$_builddir" - - ./configure --prefix=3D/usr \ - --bindir=3D/usr/bin \ - --sysconfdir=3D/etc/$pkgname \ - --mandir=3D/usr/share/man \ - --datadir=3D/var/www \ - --logdir=3D/var/log/$pkgname \ - --plugdir=3D/usr/lib/$pkgname \ - || return 1 - - make || return 1 + cd "$_builddir" + ./configure \ + --musl-mode \ + --no-backtrace \ + --enable-plugins=3Dpolarssl \ + --prefix=3D/usr \ + --mandir=3D/usr/share/man \ + --sysconfdir=3D/etc/$pkgname \ + --datadir=3D/var/$pkgname \ + --logdir=3D/var/log/$pkgname \ + --plugdir=3D/etc/$pkgname \ + --pidfile=3D/var/run/${pkgname}.pid || return 1 + make } =20 package() { - cd "$_builddir" - make DESTDIR=3D"$pkgdir" install || return 1 - install -Dm755 "$srcdir"/monkey.initd "$pkgdir"/etc/init.d/monkey || ret= urn 1 - install -Dm0644 "$srcdir"/monkey.confd "$pkgdir"/etc/conf.d/monkey || re= turn 1 + cd "$_builddir" + make DESTDIR=3D$pkgdir install + install -Dm 755 "$pkgdir/usr/bin/banana" "$pkgdir/etc/init.d/banana" } =20 -md5sums=3D"c17e394b985ead873fc7e7cb2a05cef7 monkey-1.4.0.tar.gz -6630131d3ea75dbbf1033a4acc8cf983 monkey.initd -71805f446a12d747c52e18b8ac4b4704 monkey.confd" -sha256sums=3D"b2e3578819abb558ee5e449b8c4aa323b69f52cd8f2c8f061a78e2f0b186= 75e7 monkey-1.4.0.tar.gz -00a880f8f8190649642a99939180e6b987706712b9b2479b7ec74311a31ca34d monkey.i= nitd -bfd675e83ea839282fa60ff7b137933b47e4beeed3f22703a79d4201580de508 monkey.c= onfd" -sha512sums=3D"ab52e158a4b4954d4e72dc0687b2a22b5ced75ad5ca93ee5533d81ab1eb2= 4101919e87917fdd89570de537167fafb2e0c448765b24f472715556a41e2c0a8390 monke= y-1.4.0.tar.gz -2ec82ae2b76dcc0a792c12b3cee57feedfdb34117975cf5f245e90775e0543ddd8c072ac93= 5de57d6e37753e92a8019e699d636d7f7aaebecb612dbcbf6f5bc0 monkey.initd -8ca7312a80440e908ef8c6297870411f4978c56fe8ad09589d1bb56e9d545d086a53f07120= d5cc14c6042a83755730ac6fc4839020a5159eb054eb34d3f264e7 monkey.confd" +md5sums=3D"bd2410f6612ec4a9076c3921145e4b75 monkey-1.5.5.tar.gz" +sha256sums=3D"5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b4= 5b05 monkey-1.5.5.tar.gz" +sha512sums=3D"faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268= a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920 monke= y-1.5.5.tar.gz" diff --git a/testing/monkey/monkey.confd b/testing/monkey/monkey.confd deleted file mode 100644 index 818957c..0000000 --- a/testing/monkey/monkey.confd +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Add any additional command line arguments here -MONKEY_ARGS=3D"" diff --git a/testing/monkey/monkey.initd b/testing/monkey/monkey.initd deleted file mode 100644 index 7ab26aa..0000000 --- a/testing/monkey/monkey.initd +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -DAEMON=3D"/usr/bin/monkey" -CONFFILE=3D"/etc/monkey/monkey.conf" - -depend() { - use net -} - -start() { - ebegin "Starting monkey" - start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}" >/d= ev/null - eend $? -} - -stop() { - ebegin "Stopping monkey" - local PORT=3D$(awk '/^ *Port/ { print $2 }' "${CONFFILE}") - local PIDFILE=3D$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}") - PIDFILE=3D"${PIDFILE}"."${PORT}" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} --=20 2.2.2 --0-1092296745-1425547202=:18012-- --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---