Attachment #157395 for bug #187113




# $FreeBSD$

PORTNAME=	siproxd
PORTVERSION=	0.8.1
PORTREVISION=	4
CATEGORIES=	net
MASTER_SITES=	SF


		sample_cfg_budgetone.txt sample_cfg_x-lite.txt
PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}

post-patch:
	@${REINPLACE_CMD} -e 's,-lgnugetopt,,g ; 24600d ; 23998s,doc/Makefile ,,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
	${WRKSRC}/doc/siproxd.conf.example
	${REINPLACE_CMD} -e '22s,doc ,,' ${WRKSRC}/Makefile.am
	${REINPLACE_CMD} -e '212s,doc ,,' ${WRKSRC}/Makefile.in

post-extract:
.for docs in ${PORTDOCS2}
	${CP} ${WRKSRC}/doc/${docs} ${WRKSRC}
.endfor

post-patch:
	${REINPLACE_CMD} -e 's,siproxd\.conf\.example,siproxd.conf.sample,g' \
		${WRKSRC}/doc/Makefile.in
	${MV} ${WRKSRC}/doc/siproxd.conf.example ${WRKSRC}/doc/siproxd.conf.sample

post-install:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
.for docs in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
.endfor
	${INSTALL_DATA} ${WRKSRC}/doc/siproxd.conf.example \
		${STAGEDIR}${PREFIX}/etc/siproxd.conf.sample
	${INSTALL_DATA} ${WRKSRC}/doc/siproxd_passwd.cfg \
		${STAGEDIR}${PREFIX}/etc/siproxd_passwd.cfg.sample


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (siproxd-0.7.2.tar.gz) = c586d0f8e66841189e1e236eb18a1b0c8126d6e28aa6d0a28b591b016ccebbcb	1	SHA256 (siproxd-0.8.1.tar.gz) = df2df04faf5bdb4980cbdfd5516a47898fc47ca1ebc2c628aa48305b20a09dad
2	SIZE (siproxd-0.7.2.tar.gz) = 821009	2	SIZE (siproxd-0.8.1.tar.gz) = 833170

Lines 1-13 Link Here

(-)files/patch-configure (-13 lines)
1	--- configure.orig 2008-03-09 14:35:57.000000000 +0100
2	+++ configure 2008-09-23 11:25:19.000000000 +0200
3	@@ -23988,7 +23988,9 @@
4
5
6
7	-LIBS="$LIBS $FWLIBS"
8	+tmp_LIBS="${LIBS}"
9	+unset LIBS
10	+LIBS="${tmp_LIBS} $FWLIBS"
11
12
13




--- doc/siproxd.conf.example.orig	2010-01-24 17:18:04.000000000 +0100
+++ doc/siproxd.conf.example	2010-01-24 17:21:34.000000000 +0100
@@ -17,8 +17,8 @@
 #    or a hostname that resolves to that address (use a dyndns address for
 #    example).
 #
-if_inbound  = eth0
-if_outbound = ppp0
+if_inbound  = ed0
+if_outbound = tun0
 # uncomment the following line ONLY IF YOU KNOW WHAT YOU ARE DOING!
 # READ THE FAQ FIRST!
 #host_outbound = 1.2.3.4
@@ -79,7 +79,7 @@
 #   user:	uid/gid to switch to after startup
 #   chrootjail:	path to chroot to (chroot jail)
 user = nobody
-#chrootjail = /var/lib/siproxd/
+chrootjail = %%PREFIX%%/siproxd/
 
 ######################################################################
 # Registration file:
@@ -88,7 +88,7 @@
 #   the specified directory path does exist!
 #   Note: If running in chroot jail, this path starts relative
 #         to the jail.
-registration_file = /var/lib/siproxd/siproxd_registrations
+registration_file = siproxd_registrations
 
 ######################################################################
 # Automatically save current registrations every 'n' seconds
@@ -101,7 +101,7 @@
 #   This file holds the PID of the main thread of siproxd.
 #   Note: If running in chroot jail, this path starts relative
 #         to the jail.
-pid_file = /var/run/siproxd/siproxd.pid
+pid_file = siproxd.pid
 
 ######################################################################
 # global switch to control the RTP proxy behaviour
@@ -292,7 +292,7 @@
 # the processing order is given by the load order.
 #
 # plugin_dir: MUST be terminated with '/'
-plugindir=/usr/lib/siproxd/
+plugindir=%%PREFIX%%/lib/siproxd/
 #
 # List of plugins to load. MUST use the .la file extension!
 #load_plugin=plugin_demo.la




--- src/siproxd.c.orig	2008-02-04 21:38:47.000000000 +0100
+++ src/siproxd.c	2008-08-29 19:37:53.000000000 +0200
@@ -226,8 +226,6 @@
 /*
  * Init stuff
  */
-   INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
-
    /* read the config file */
    if (read_config(configfile, config_search, main_cfg_opts, "") == STS_FAILURE) {
       exit(1);
@@ -237,6 +235,13 @@
    configuration.configfile = strdup(configfile);
    configuration.config_search = config_search;
 
+   /* Don't log to stderr if daemonizing is intended. */
+   if (configuration.daemonize) {
+     log_set_stderr(0);
+   }
+
+   INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
+
    /* if a debug level > 0 has been given on the commandline use its
       value and not what is in the config file */
    if (cmdline_debuglevel != 0) {
@@ -301,7 +306,7 @@
     * the jail, too. However, it will be owned by root and not deleted
     * on process termination... */
    if (configuration.chrootjail && ((getuid()==0) || (geteuid()==0))) {
-      if (pidfilename) createpidfile(pidfilename);
+      if (pidfilename && *pidfilename == '/') createpidfile(pidfilename);
    }
 
    /* change user and group IDs */

Lines 1-11 Link Here

(-)pkg-deinstall (-11 lines)
1	#!/bin/sh
2
3	SIPROXD_HOME=${PKG_PREFIX}/siproxd
4	SIPROXD_PID=${SIPROXD_HOME}/siproxd.pid
5
6	case $2 in
7	DEINSTALL)
8	[ -r ${SIPROXD_PID} ] && kill `cat ${SIPROXD_PID}`
9	rm -f ${SIPROXD_HOME}/* && rmdir ${SIPROXD_HOME}
10	;;
11	esac




#!/bin/sh

SIPROXD_HOME=${PKG_PREFIX}/siproxd
SIPROXD_USER=nobody
SIPROXD_GROUP=nobody

case $2 in
    POST-INSTALL)
    mkdir ${SIPROXD_HOME} && \
	chown ${SIPROXD_USER}:${SIPROXD_GROUP} ${SIPROXD_HOME} && \
	chmod 750 ${SIPROXD_HOME}
    for i in siproxd.conf.example siproxd_passwd.cfg; do
	chgrp ${SIPROXD_GROUP} ${PKG_PREFIX}/etc/${i}
	chmod 640 ${PKG_PREFIX}/etc/${i}
    done
    ;;
esac

Lines 8-13 Link Here

(-)pkg-plist (+6 lines)
8	lib/siproxd/plugin_fix_bogus_via.so	8	lib/siproxd/plugin_fix_bogus_via.so
9	lib/siproxd/plugin_logcall.la	9	lib/siproxd/plugin_logcall.la
10	lib/siproxd/plugin_logcall.so	10	lib/siproxd/plugin_logcall.so
		11	lib/siproxd/plugin_prefix.la
		12	lib/siproxd/plugin_prefix.so
		13	lib/siproxd/plugin_regex.la
		14	lib/siproxd/plugin_regex.so
11	lib/siproxd/plugin_shortdial.la	15	lib/siproxd/plugin_shortdial.la
12	lib/siproxd/plugin_shortdial.so	16	lib/siproxd/plugin_shortdial.so
		17	lib/siproxd/plugin_stun.la
		18	lib/siproxd/plugin_stun.so
13	sbin/siproxd	19	sbin/siproxd

Return to bug 187113

Lines 2-9 Link Here

(-)Makefile (-11 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= siproxd	4	PORTNAME= siproxd
5	PORTVERSION= 0.7.2	5	PORTVERSION= 0.8.1
6	PORTREVISION= 4
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 26-50 Link Here
26	sample_cfg_budgetone.txt sample_cfg_x-lite.txt	25	sample_cfg_budgetone.txt sample_cfg_x-lite.txt
27	PORTDOCS= ${PORTDOCS1} ${PORTDOCS2}	26	PORTDOCS= ${PORTDOCS1} ${PORTDOCS2}
28		27
29	post-patch:
30	@${REINPLACE_CMD} -e 's,-lgnugetopt,,g ; 24600d ; 23998s,doc/Makefile ,,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
31	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
32	${WRKSRC}/doc/siproxd.conf.example
33	${REINPLACE_CMD} -e '22s,doc ,,' ${WRKSRC}/Makefile.am
34	${REINPLACE_CMD} -e '212s,doc ,,' ${WRKSRC}/Makefile.in
35
36	post-extract:	28	post-extract:
37	.for docs in ${PORTDOCS2}	29	.for docs in ${PORTDOCS2}
38	${CP} ${WRKSRC}/doc/${docs} ${WRKSRC}	30	${CP} ${WRKSRC}/doc/${docs} ${WRKSRC}
39	.endfor	31	.endfor
40		32
		33	post-patch:
		34	${REINPLACE_CMD} -e 's,siproxd\.conf\.example,siproxd.conf.sample,g' \
		35	${WRKSRC}/doc/Makefile.in
		36	${MV} ${WRKSRC}/doc/siproxd.conf.example ${WRKSRC}/doc/siproxd.conf.sample
		37
41	post-install:	38	post-install:
42	${MKDIR} ${STAGEDIR}${DOCSDIR}	39	${MKDIR} ${STAGEDIR}${DOCSDIR}
43	.for docs in ${PORTDOCS}	40	.for docs in ${PORTDOCS}
44	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}	41	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
45	.endfor	42	.endfor
46	${INSTALL_DATA} ${WRKSRC}/doc/siproxd.conf.example \
47	${STAGEDIR}${PREFIX}/etc/siproxd.conf.sample
48	${INSTALL_DATA} ${WRKSRC}/doc/siproxd_passwd.cfg \	43	${INSTALL_DATA} ${WRKSRC}/doc/siproxd_passwd.cfg \
49	${STAGEDIR}${PREFIX}/etc/siproxd_passwd.cfg.sample	44	${STAGEDIR}${PREFIX}/etc/siproxd_passwd.cfg.sample
50		45

Lines 1-49 Link Here

(-)files/patch-doc_siproxd.conf.example (-49 lines)
1	--- doc/siproxd.conf.example.orig 2010-01-24 17:18:04.000000000 +0100
2	+++ doc/siproxd.conf.example 2010-01-24 17:21:34.000000000 +0100
3	@@ -17,8 +17,8 @@
4	# or a hostname that resolves to that address (use a dyndns address for
5	# example).
6	#
7	-if_inbound = eth0
8	-if_outbound = ppp0
9	+if_inbound = ed0
10	+if_outbound = tun0
11	# uncomment the following line ONLY IF YOU KNOW WHAT YOU ARE DOING!
12	# READ THE FAQ FIRST!
13	#host_outbound = 1.2.3.4
14	@@ -79,7 +79,7 @@
15	# user: uid/gid to switch to after startup
16	# chrootjail: path to chroot to (chroot jail)
17	user = nobody
18	-#chrootjail = /var/lib/siproxd/
19	+chrootjail = %%PREFIX%%/siproxd/
20
21	######################################################################
22	# Registration file:
23	@@ -88,7 +88,7 @@
24	# the specified directory path does exist!
25	# Note: If running in chroot jail, this path starts relative
26	# to the jail.
27	-registration_file = /var/lib/siproxd/siproxd_registrations
28	+registration_file = siproxd_registrations
29
30	######################################################################
31	# Automatically save current registrations every 'n' seconds
32	@@ -101,7 +101,7 @@
33	# This file holds the PID of the main thread of siproxd.
34	# Note: If running in chroot jail, this path starts relative
35	# to the jail.
36	-pid_file = /var/run/siproxd/siproxd.pid
37	+pid_file = siproxd.pid
38
39	######################################################################
40	# global switch to control the RTP proxy behaviour
41	@@ -292,7 +292,7 @@
42	# the processing order is given by the load order.
43	#
44	# plugin_dir: MUST be terminated with '/'
45	-plugindir=/usr/lib/siproxd/
46	+plugindir=%%PREFIX%%/lib/siproxd/
47	#
48	# List of plugins to load. MUST use the .la file extension!
49	#load_plugin=plugin_demo.la

Lines 1-34 Link Here

(-)files/patch-src__siproxd.c (-34 lines)
1	--- src/siproxd.c.orig 2008-02-04 21:38:47.000000000 +0100
2	+++ src/siproxd.c 2008-08-29 19:37:53.000000000 +0200
3	@@ -226,8 +226,6 @@
4	/*
5	* Init stuff
6	*/
7	- INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
8	-
9	/* read the config file */
10	if (read_config(configfile, config_search, main_cfg_opts, "") == STS_FAILURE) {
11	exit(1);
12	@@ -237,6 +235,13 @@
13	configuration.configfile = strdup(configfile);
14	configuration.config_search = config_search;
15
16	+ /* Don't log to stderr if daemonizing is intended. */
17	+ if (configuration.daemonize) {
18	+ log_set_stderr(0);
19	+ }
20	+
21	+ INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
22	+
23	/* if a debug level > 0 has been given on the commandline use its
24	value and not what is in the config file */
25	if (cmdline_debuglevel != 0) {
26	@@ -301,7 +306,7 @@
27	* the jail, too. However, it will be owned by root and not deleted
28	* on process termination... */
29	if (configuration.chrootjail && ((getuid()==0) \|\| (geteuid()==0))) {
30	- if (pidfilename) createpidfile(pidfilename);
31	+ if (pidfilename && *pidfilename == '/') createpidfile(pidfilename);
32	}
33
34	/* change user and group IDs */

Lines 1-17 Link Here

(-)pkg-install (-17 lines)
1	#!/bin/sh
2
3	SIPROXD_HOME=${PKG_PREFIX}/siproxd
4	SIPROXD_USER=nobody
5	SIPROXD_GROUP=nobody
6
7	case $2 in
8	POST-INSTALL)
9	mkdir ${SIPROXD_HOME} && \
10	chown ${SIPROXD_USER}:${SIPROXD_GROUP} ${SIPROXD_HOME} && \
11	chmod 750 ${SIPROXD_HOME}
12	for i in siproxd.conf.example siproxd_passwd.cfg; do
13	chgrp ${SIPROXD_GROUP} ${PKG_PREFIX}/etc/${i}
14	chmod 640 ${PKG_PREFIX}/etc/${i}
15	done
16	;;
17	esac