Attachment 156760 Details for Bug 200061 – svn_diff_www_kannel_1.4.4_v02

[patch] svn_diff_www_kannel_1.4.4_v02

kannel-1.4.4_20150513_1833.patch (text/plain), 16.49 KB, created by Danilo G. Baio on 2015-05-13 21:44:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2015-05-13 21:44:07 UTC

Size: 16.49 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 386269)
>+++ Makefile	(working copy)
>@@ -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 @@
> 	${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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 386269)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/kannel.in
>===================================================================
>--- files/kannel.in	(revision 386269)
>+++ files/kannel.in	(working copy)
>@@ -1,80 +0,0 @@
>-#!/bin/sh
>-
>-# $FreeBSD$
>-#
>-# PROVIDE: kannel_smsbox kannel_wapbox kannel_bearerbox
>-# REQUIRE: NETWORKING SERVERS 
>-# BEFORE: LOGIN
>-# KEYWORD: shutdown
>-
>-. /etc/rc.subr
>-
>-name=kannel
>-rcvar=kannel_enable
>-
>-command="%%PREFIX%%/sbin/run_kannel_box"
>-extra_commands="reload"
>-sig_reload=SIGUSR1
>-
>-load_rc_config $name
>-# Set defaults
>-kannel_config=${kannel_config:-"%%PREFIX%%/etc/kannel.conf"}
>-kannel_user=${kannel_user:-"kannel"}
>-# Config file is required
>-if [ ! -r ${kannel_config} ]; then
>-    warn "${kannel_config} is not readable."
>-    case $1 in
>-	force*) : ;;
>-	*) exit 1 ;;
>-    esac
>-fi
>-
>-if test -n ${kannel_enable:-""} && checkyesno kannel_enable; then
>-    kannel_bearerbox_enable=${kannel_bearerbox_enable:-"YES"}
>-    kannel_smsbox_enable=${kannel_smsbox_enable:-"YES"}
>-    kannel_wapbox_enable=${kannel_wapbox_enable:-"YES"}
>-fi
>-
>-# bearerbox
>-name=kannel_bearerbox
>-rcvar=kannel_bearerbox_enable
>-pidfile=/var/run/kannel/${name}.pid
>-# Defaults
>-kannel_bearerbox_user=${kannel_bearerbox_user:-"${kannel_user}"}
>-kannel_bearerbox_enable=${kannel_bearerbox_enable:-"NO"}
>-kannel_bearerbox_config=${kannel_bearerbox_config:-"${kannel_config}"}
>-kannel_bearerbox_flags=${kannel_bearerbox_flags:-"--pidfile ${pidfile} %%PREFIX%%/sbin/bearerbox ${kannel_bearerbox_flags} ${kannel_bearerbox_config}"}
>-#
>-load_rc_config $name
>-run_rc_command "$1"
>-#
>-_rc_restart_done=false
>-
>-# smsbox
>-name=kannel_smsbox
>-rcvar=kannel_smsbox_enable
>-pidfile=/var/run/kannel/${name}.pid
>-# Defaults
>-kannel_smsbox_user=${kannel_smsbox_user:-"${kannel_user}"}
>-kannel_smsbox_enable=${kannel_smsbox_enable:-"NO"}
>-kannel_smsbox_config=${kannel_smsbox_config:-"${kannel_config}"}
>-kannel_smsbox_flags=${kannel_smsbox_flags:-"--pidfile ${pidfile} %%PREFIX%%/sbin/smsbox ${kannel_smsbox_flags} ${kannel_smsbox_config}"}
>-#
>-load_rc_config $name
>-run_rc_command "$1"
>-#
>-_rc_restart_done=false
>-
>-# wapbox
>-name=kannel_wapbox
>-rcvar=kannel_wapbox_enable
>-pidfile=/var/run/kannel/${name}.pid
>-# Defaults
>-kannel_wapbox_user=${kannel_wapbox_user:-"${kannel_user}"}
>-kannel_wapbox_enable=${kannel_wapbox_enable:-"NO"}
>-kannel_wapbox_config=${kannel_wapbox_config:-"${kannel_config}"}
>-kannel_wapbox_flags=${kannel_wapbox_flags:-"--pidfile ${pidfile} %%PREFIX%%/sbin/wapbox ${kannel_wapbox_flags} ${kannel_wapbox_config}"}
>-#
>-load_rc_config $name
>-run_rc_command "$1"
>-
>Index: files/kannel_bearerbox.in
>===================================================================
>--- files/kannel_bearerbox.in	(revision 0)
>+++ files/kannel_bearerbox.in	(working copy)
>@@ -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"
>
>Property changes on: files/kannel_bearerbox.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/kannel_smsbox.in
>===================================================================
>--- files/kannel_smsbox.in	(revision 0)
>+++ files/kannel_smsbox.in	(working copy)
>@@ -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"
>
>Property changes on: files/kannel_smsbox.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/kannel_wapbox.in
>===================================================================
>--- files/kannel_wapbox.in	(revision 0)
>+++ files/kannel_wapbox.in	(working copy)
>@@ -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"
>
>Property changes on: files/kannel_wapbox.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-debian__kannel.conf
>===================================================================
>--- files/patch-debian__kannel.conf	(revision 386269)
>+++ files/patch-debian__kannel.conf	(working copy)
>@@ -1,15 +0,0 @@
>---- debian/kannel.conf.orig	Mon Dec 11 14:00:30 2000
>-+++ debian/kannel.conf	Wed Jan  3 20:11:13 2001
>-@@ -13,10 +13,10 @@
>- admin-allow-ip = "127.0.0.1"
>- wapbox-port = 13002
>- wdp-interface-name = "*"
>--log-file = "/var/log/kannel/bearerbox.log"
>-+log-file = "/var/log/bearerbox.log"
>- box-deny-ip = "*.*.*.*"
>- box-allow-ip = "127.0.0.1"
>- 
>- group = wapbox
>- bearerbox-host = localhost
>--log-file = "/var/log/kannel/wapbox.log"
>-+log-file = "/var/log/wapbox.log"
>Index: files/patch-gw_smskannel.conf
>===================================================================
>--- files/patch-gw_smskannel.conf	(revision 0)
>+++ files/patch-gw_smskannel.conf	(working copy)
>@@ -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
>
>Property changes on: files/patch-gw_smskannel.conf
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-gw_wapkannel.conf
>===================================================================
>--- files/patch-gw_wapkannel.conf	(revision 0)
>+++ files/patch-gw_wapkannel.conf	(working copy)
>@@ -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"
>+ 
>
>Property changes on: files/patch-gw_wapkannel.conf
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-gwlib__gwthread-pthread.c
>===================================================================
>--- files/patch-gwlib__gwthread-pthread.c	(revision 386269)
>+++ files/patch-gwlib__gwthread-pthread.c	(working copy)
>@@ -1,45 +0,0 @@
>---- gwlib/gwthread-pthread.c.orig	Thu Aug 12 19:53:30 2004
>-+++ gwlib/gwthread-pthread.c	Mon Dec 20 00:53:57 2004
>-@@ -125,6 +125,11 @@
>- static pthread_key_t tsd_key;
>- 
>- static pthread_mutex_t threadtable_lock;
>-+/*
>-+ * Thread creation parameters.
>-+ */
>-+static pthread_attr_t thread_attr;
>-+#define MIN_THREAD_STACK_SIZE (256 * 1024)
>- 
>- static void lock(void)
>- {
>-@@ -263,6 +268,7 @@
>- {
>-     int ret;
>-     int i;
>-+    size_t stack_size;
>- 
>-     pthread_mutex_init(&threadtable_lock, NULL);
>- 
>-@@ -275,6 +281,13 @@
>-         threadtable[i] = NULL;
>-     }
>-     active_threads = 0;
>-+/*
>-+ * Make sure that thread stack is large enough.
>-+ */
>-+    pthread_attr_init(&thread_attr);
>-+    pthread_attr_getstacksize(&thread_attr, &stack_size);
>-+    if (stack_size < MIN_THREAD_STACK_SIZE)
>-+            pthread_attr_setstacksize(&thread_attr, MIN_THREAD_STACK_SIZE);
>- 
>-     create_threadinfo_main();
>- }
>-@@ -443,7 +456,7 @@
>-         return -1;
>-     }
>- 
>--    ret = pthread_create(&id, NULL, &new_thread, p);
>-+    ret = pthread_create(&id, &thread_attr, &new_thread, p);
>-     if (ret != 0) {
>-         unlock();
>-         error(ret, "Could not create new thread.");
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 386269)
>+++ pkg-descr	(working copy)
>@@ -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/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 386269)
>+++ pkg-plist	(working copy)
>@@ -71,6 +71,7 @@
> 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 @@
> 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/run_kannel_box
> sbin/smsbox
> sbin/wapbox
>+@owner kannel
>+@group kannel
>+@dir /var/log/kannel
>+@dir /var/run/kannel
>+@group
>+@owner

Actions: View | Diff

Attachments on bug 200061: 156523 | 156524 | 156525 | 156526 | 156760