Date: Fri, 15 May 2015 19:59:30 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386476 - in head: . www/kannel www/kannel/files Message-ID: <201505151959.t4FJxUTw047532@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri May 15 19:59:30 2015 New Revision: 386476 URL: https://svnweb.freebsd.org/changeset/ports/386476 Log: - Update www/kannel to 1.4.4 (note that it's newer than development version 1.5.0) - Add license - Add kannel user/group - Split and fix rc script - Pass maintainership to submitter PR: 200061 Submitted by: dbaio@bsd.com.br Added: head/www/kannel/files/kannel_bearerbox.in (contents, props changed) head/www/kannel/files/kannel_smsbox.in (contents, props changed) head/www/kannel/files/kannel_wapbox.in (contents, props changed) head/www/kannel/files/patch-gw_smskannel.conf (contents, props changed) head/www/kannel/files/patch-gw_wapkannel.conf (contents, props changed) Deleted: head/www/kannel/files/kannel.in head/www/kannel/files/patch-debian__kannel.conf head/www/kannel/files/patch-gwlib__gwthread-pthread.c Modified: head/GIDs head/UIDs head/www/kannel/Makefile head/www/kannel/distinfo head/www/kannel/pkg-descr head/www/kannel/pkg-plist Modified: head/GIDs ============================================================================== --- head/GIDs Fri May 15 19:29:10 2015 (r386475) +++ head/GIDs Fri May 15 19:59:30 2015 (r386476) @@ -310,6 +310,7 @@ emby:*:989: oozie:*:990: sguil:*:991: hive:*:992: +kannel:*:993: ebnetd:*:999: nogroup:*:65533: nobody:*:65534: Modified: head/UIDs ============================================================================== --- head/UIDs Fri May 15 19:29:10 2015 (r386475) +++ head/UIDs Fri May 15 19:59:30 2015 (r386476) @@ -319,5 +319,6 @@ emby:*:989:989::0:0:Emby:/nonexistent:/u oozie:*:990:990::0:0:Apache Oozie user:/nonexistent:/usr/sbin/nologin sguil:*:991:991::0:0:Sguil:/nonexistent:/usr/sbin/nologin hive:*:992:992::0:0:Apache Hive user:/nonexistent:/usr/sbin/nologin +kannel:*:993:993::0:0:Kannel User:/nonexistent:/usr/sbin/nologin ebnetd:*:999:999::0:0:EBNETD:/nonexistent:/usr/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin Modified: head/www/kannel/Makefile ============================================================================== --- head/www/kannel/Makefile Fri May 15 19:29:10 2015 (r386475) +++ head/www/kannel/Makefile Fri May 15 19:59:30 2015 (r386476) @@ -2,21 +2,30 @@ # $FreeBSD$ PORTNAME= kannel -PORTVERSION= 1.5.0 -PORTREVISION= 5 +PORTVERSION= 1.4.4 +PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://www.kannel.org/download/${PORTVERSION}/ DISTNAME= gateway-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dbaio@bsd.com.br COMMENT= WAP/SMS gateway +LICENSE= The_Kannel_Software_License +LICENSE_NAME= The Kannel Software License, Version 1.0 +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -USES= tar:bzip2 gmake +USERS= kannel +GROUPS= kannel + +USES= tar:bzip2 gmake bison +USE_GCC= yes USE_GNOME= libxml2 USE_OPENSSL= yes -USE_RC_SUBR= ${PORTNAME} +USE_RC_SUBR= ${PORTNAME}_bearerbox ${PORTNAME}_smsbox ${PORTNAME}_wapbox GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cflags="${CPPFLAGS}" --with-libs="${LDFLAGS}" \ --enable-pcre=yes --enable-docs=no --with-malloc=native \ @@ -42,11 +51,13 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/gw/${filename} \ ${STAGEDIR}${PREFIX}/etc/${filename}.sample .endfor -.for filename in mtbatch seewbmp wmlsc wmlsdasm +.for filename in mtbatch seewbmp wmlsc wmlsdasm decode_emimsg @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${filename} .endfor .for filename in bearerbox run_kannel_box smsbox wapbox @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${filename} .endfor + @${MKDIR} ${STAGEDIR}/var/log/kannel + @${MKDIR} ${STAGEDIR}/var/run/kannel .include <bsd.port.mk> Modified: head/www/kannel/distinfo ============================================================================== --- head/www/kannel/distinfo Fri May 15 19:29:10 2015 (r386475) +++ head/www/kannel/distinfo Fri May 15 19:59:30 2015 (r386476) @@ -1,2 +1,2 @@ -SHA256 (gateway-1.5.0.tar.bz2) = e882cd2641985922a6629788691f12deb3e1d36a96cc1091df9416825bb1506a -SIZE (gateway-1.5.0.tar.bz2) = 2897146 +SHA256 (gateway-1.4.4.tar.bz2) = df665b600d1960708637d0c2875f11d296677b931add0a6b3cdd102024d1a717 +SIZE (gateway-1.4.4.tar.bz2) = 2949852 Added: head/www/kannel/files/kannel_bearerbox.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/kannel/files/kannel_bearerbox.in Fri May 15 19:59:30 2015 (r386476) @@ -0,0 +1,55 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: bearerbox +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add these lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# kannel_bearerbox_enable (bool): Set to NO by default. +# Set it to YES to enable kannel_bearerbox. +# kannel_bearerbox_config (path): Set to %%PREFIX%%/etc/kannel.conf +# by default. + +. /etc/rc.subr + +name=kannel_bearerbox +rcvar=${name}_enable +kannel_piddir="/var/run/kannel" + +load_rc_config $name + +: ${kannel_bearerbox_enable:="NO"} +: ${kannel_bearerbox_config="%%PREFIX%%/etc/kannel.conf"} +: ${kannel_bearerbox_user:="kannel"} +: ${kannel_bearerbox_group:="kannel"} + +command="%%PREFIX%%/sbin/run_kannel_box" +start_precmd="${name}_prestart" +extra_commands="reload" +sig_reload=SIGUSR1 + +pidfile="${kannel_piddir}/${name}.pid" + +command_args="--pidfile ${pidfile} %%PREFIX%%/sbin/bearerbox ${kannel_bearerbox_flags} ${kannel_bearerbox_config}" + +kannel_bearerbox_prestart() +{ + if [ ! -d "${kannel_piddir}" ]; then + install -d -o $kannel_bearerbox_user -g $kannel_bearerbox_group $kannel_piddir + fi + kannel_bearerbox_checkconfig +} + +kannel_bearerbox_checkconfig() { + # Config file is required + if [ ! -r ${kannel_bearerbox_config} ]; then + warn "${kannel_bearerbox_config} is not readable." + exit 1 + fi +} + +run_rc_command "$1" Added: head/www/kannel/files/kannel_smsbox.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/kannel/files/kannel_smsbox.in Fri May 15 19:59:30 2015 (r386476) @@ -0,0 +1,65 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: smsbox +# REQUIRE: LOGIN bearerbox +# KEYWORD: shutdown +# +# Add these lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# kannel_smsbox_enable (bool): Set to NO by default. +# Set it to YES to enable kannel_smsbox. +# kannel_smsbox_config (path): Set to %%PREFIX%%/etc/kannel.conf +# by default. + +. /etc/rc.subr + +name=kannel_smsbox +rcvar=${name}_enable +kannel_piddir="/var/run/kannel" + +load_rc_config $name + +: ${kannel_smsbox_enable:="NO"} +: ${kannel_smsbox_config="%%PREFIX%%/etc/kannel.conf"} +: ${kannel_smsbox_user:="kannel"} +: ${kannel_smsbox_group:="kannel"} + +command="%%PREFIX%%/sbin/run_kannel_box" +start_precmd="${name}_prestart" +extra_commands="reload" +sig_reload=SIGUSR1 + +pidfile="${kannel_piddir}/${name}.pid" +bearerbox_pidfile="${kannel_piddir}/kannel_bearerbox.pid" + +command_args="--pidfile ${pidfile} %%PREFIX%%/sbin/smsbox ${kannel_smsbox_flags} ${kannel_smsbox_config}" + +kannel_smsbox_prestart() +{ + if [ ! -d "${kannel_piddir}" ]; then + install -d -o $kannel_smsbox_user -g $kannel_smsbox_group $kannel_piddir + fi + kannel_smsbox_checkconfig + kannel_bearerbox_checkpid +} + +kannel_smsbox_checkconfig() { + # Config file is required + if [ ! -r ${kannel_smsbox_config} ]; then + warn "${kannel_smsbox_config} is not readable." + exit 1 + fi +} + +kannel_bearerbox_checkpid() { + # Check if kannel bearerbox is running + if [ ! -e "${bearerbox_pidfile}" ]; then + warn "In order to run ${name} you need to run first kannel_bearerbox." + exit 1 + fi +} + +run_rc_command "$1" Added: head/www/kannel/files/kannel_wapbox.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/kannel/files/kannel_wapbox.in Fri May 15 19:59:30 2015 (r386476) @@ -0,0 +1,65 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: wapbox +# REQUIRE: LOGIN bearerbox +# KEYWORD: shutdown +# +# Add these lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# kannel_wapbox_enable (bool): Set to NO by default. +# Set it to YES to enable kannel_wapbox. +# kannel_wapbox_config (path): Set to %%PREFIX%%/etc/kannel.conf +# by default. + +. /etc/rc.subr + +name=kannel_wapbox +rcvar=${name}_enable +kannel_piddir="/var/run/kannel" + +load_rc_config $name + +: ${kannel_wapbox_enable:="NO"} +: ${kannel_wapbox_config="%%PREFIX%%/etc/kannel.conf"} +: ${kannel_wapbox_user:="kannel"} +: ${kannel_wapbox_group:="kannel"} + +command="%%PREFIX%%/sbin/run_kannel_box" +start_precmd="${name}_prestart" +extra_commands="reload" +sig_reload=SIGUSR1 + +pidfile="${kannel_piddir}/${name}.pid" +bearerbox_pidfile="${kannel_piddir}/kannel_bearerbox.pid" + +command_args="--pidfile ${pidfile} %%PREFIX%%/sbin/wapbox ${kannel_wapbox_flags} ${kannel_wapbox_config}" + +kannel_wapbox_prestart() +{ + if [ ! -d "${kannel_piddir}" ]; then + install -d -o $kannel_wapbox_user -g $kannel_wapbox_group $kannel_piddir + fi + kannel_wapbox_checkconfig + kannel_bearerbox_checkpid +} + +kannel_wapbox_checkconfig() { + # Config file is required + if [ ! -r ${kannel_wapbox_config} ]; then + warn "${kannel_wapbox_config} is not readable." + exit 1 + fi +} + +kannel_bearerbox_checkpid() { + # Check if kannel bearerbox is running + if [ ! -e "${bearerbox_pidfile}" ]; then + warn "In order to run ${name} you need to run first kannel_bearerbox." + exit 1 + fi +} + +run_rc_command "$1" Added: head/www/kannel/files/patch-gw_smskannel.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/kannel/files/patch-gw_smskannel.conf Fri May 15 19:59:30 2015 (r386476) @@ -0,0 +1,29 @@ +--- gw/smskannel.conf.orig 2009-02-10 16:15:58 UTC ++++ gw/smskannel.conf +@@ -41,12 +41,12 @@ admin-password = bar + #status-password = foo + #admin-deny-ip = "" + #admin-allow-ip = "" +-#log-file = "/tmp/kannel.log" ++#log-file = "/var/log/kannel/kannel.log" + #log-level = 0 + box-deny-ip = "*.*.*.*" + box-allow-ip = "127.0.0.1" + #unified-prefix = "+358,00358,0;+,00" +-#access-log = "/tmp/access.log" ++#access-log = "/var/log/kannel/access.log" + #store-file = "kannel.store" + #ssl-server-cert-file = "cert.pem" + #ssl-server-key-file = "key.pem" +@@ -80,9 +80,9 @@ bearerbox-host = 127.0.0.1 + sendsms-port = 13013 + global-sender = 13013 + #sendsms-chars = "0123456789 +-" +-#log-file = "/tmp/smsbox.log" ++#log-file = "/var/log/kannel/smsbox.log" + #log-level = 0 +-#access-log = "/tmp/access.log" ++#access-log = "/var/log/kannel/access.log" + + #--------------------------------------------- + # SEND-SMS USERS Added: head/www/kannel/files/patch-gw_wapkannel.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/kannel/files/patch-gw_wapkannel.conf Fri May 15 19:59:30 2015 (r386476) @@ -0,0 +1,28 @@ +--- gw/wapkannel.conf.orig 2009-02-10 16:15:58 UTC ++++ gw/wapkannel.conf +@@ -28,20 +28,20 @@ admin-password = bar + #admin-deny-ip = "" + #admin-allow-ip = "" + wdp-interface-name = "127.0.0.1" +-#log-file = "/tmp/bearerbox.log" ++#log-file = "/var/log/kannel/bearerbox.log" + #log-level = 0 + box-deny-ip = "*.*.*.*" + box-allow-ip = "127.0.0.1" +-#access-log = "/tmp/access.log" +-#store-file = "/tmp/kannel.store" ++#access-log = "/var/log/kannel/access.log" ++#store-file = "/var/log/kannel/kannel.store" + #ssl-server-cert-file = "cert.pem" + #ssl-server-key-file = "key.pem" + #ssl-certkey-file = "mycertandprivkeyfile.pem" + + group = wapbox + bearerbox-host = 127.0.0.1 +-#log-file = "/tmp/wapbox.log" ++#log-file = "/var/log/kannel/wapbox.log" + #log-level = 0 + syslog-level = none +-#access-log = "/tmp/wapaccess.log" ++#access-log = "/var/log/kannel/wapaccess.log" + Modified: head/www/kannel/pkg-descr ============================================================================== --- head/www/kannel/pkg-descr Fri May 15 19:29:10 2015 (r386475) +++ head/www/kannel/pkg-descr Fri May 15 19:59:30 2015 (r386476) @@ -1,4 +1,5 @@ -Kannel is an open source project to make a WAP gateway; it also can work as -an SMS gateway. +Kannel is a compact and very powerful open source WAP and SMS gateway, used +widely across the globe both for serving trillions of short messages (SMS), +WAP Push service indications and mobile internet connectivity. WWW: http://www.kannel.org/ Modified: head/www/kannel/pkg-plist ============================================================================== --- head/www/kannel/pkg-plist Fri May 15 19:29:10 2015 (r386475) +++ head/www/kannel/pkg-plist Fri May 15 19:59:30 2015 (r386476) @@ -71,6 +71,7 @@ include/kannel/gwlib/fdset.h include/kannel/gwlib/gw-getopt.h include/kannel/gwlib/gw-prioqueue.h include/kannel/gwlib/gw-rwlock.h +include/kannel/gwlib/gw-timer.h include/kannel/gwlib/gw_uuid.h include/kannel/gwlib/gw_uuid_types.h include/kannel/gwlib/gwassert.h @@ -139,6 +140,7 @@ include/kannel/wap/wtp_tid.h lib/kannel/libgw.a lib/kannel/libgwlib.a lib/kannel/libwap.a +lib/kannel/libwmlscript.a man/man1/mtbatch.1.gz man/man1/seewbmp.1.gz man/man1/wmlsc.1.gz @@ -149,3 +151,9 @@ sbin/bearerbox sbin/run_kannel_box sbin/smsbox sbin/wapbox +@owner kannel +@group kannel +@dir /var/log/kannel +@dir /var/run/kannel +@group +@owner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505151959.t4FJxUTw047532>