Attachment 157395 Details for Bug 187113 – New patch against current version

[patch] New patch against current version

siproxd_v2.diff (text/plain), 7.07 KB, created by Renato Botelho on 2015-06-03 13:26:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2015-06-03 13:26:21 UTC

Size: 7.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 388427)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	siproxd
>-PORTVERSION=	0.7.2
>-PORTREVISION=	4
>+PORTVERSION=	0.8.1
> CATEGORIES=	net
> MASTER_SITES=	SF
> 
>@@ -26,25 +25,21 @@
> 		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
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 388427)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (siproxd-0.7.2.tar.gz) = c586d0f8e66841189e1e236eb18a1b0c8126d6e28aa6d0a28b591b016ccebbcb
>-SIZE (siproxd-0.7.2.tar.gz) = 821009
>+SHA256 (siproxd-0.8.1.tar.gz) = df2df04faf5bdb4980cbdfd5516a47898fc47ca1ebc2c628aa48305b20a09dad
>+SIZE (siproxd-0.8.1.tar.gz) = 833170
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 388427)
>+++ files/patch-configure	(working copy)
>@@ -1,13 +0,0 @@
>---- configure.orig	2008-03-09 14:35:57.000000000 +0100
>-+++ configure	2008-09-23 11:25:19.000000000 +0200
>-@@ -23988,7 +23988,9 @@
>- 
>- 
>- 
>--LIBS="$LIBS $FWLIBS"
>-+tmp_LIBS="${LIBS}"
>-+unset LIBS
>-+LIBS="${tmp_LIBS} $FWLIBS"
>- 
>- 
>- 
>Index: files/patch-doc_siproxd.conf.example
>===================================================================
>--- files/patch-doc_siproxd.conf.example	(revision 388427)
>+++ files/patch-doc_siproxd.conf.example	(working copy)
>@@ -1,49 +0,0 @@
>---- 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
>Index: files/patch-src__siproxd.c
>===================================================================
>--- files/patch-src__siproxd.c	(revision 388427)
>+++ files/patch-src__siproxd.c	(working copy)
>@@ -1,34 +0,0 @@
>---- 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 */
>Index: pkg-deinstall
>===================================================================
>--- pkg-deinstall	(revision 388427)
>+++ pkg-deinstall	(working copy)
>@@ -1,11 +0,0 @@
>-#!/bin/sh
>-
>-SIPROXD_HOME=${PKG_PREFIX}/siproxd
>-SIPROXD_PID=${SIPROXD_HOME}/siproxd.pid
>-
>-case $2 in
>-    DEINSTALL)
>-    [ -r ${SIPROXD_PID} ] && kill `cat ${SIPROXD_PID}`
>-    rm -f ${SIPROXD_HOME}/* && rmdir ${SIPROXD_HOME}
>-    ;;
>-esac
>Index: pkg-install
>===================================================================
>--- pkg-install	(revision 388427)
>+++ pkg-install	(working copy)
>@@ -1,17 +0,0 @@
>-#!/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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 388427)
>+++ pkg-plist	(working copy)
>@@ -8,6 +8,12 @@
> lib/siproxd/plugin_fix_bogus_via.so
> lib/siproxd/plugin_logcall.la
> lib/siproxd/plugin_logcall.so
>+lib/siproxd/plugin_prefix.la
>+lib/siproxd/plugin_prefix.so
>+lib/siproxd/plugin_regex.la
>+lib/siproxd/plugin_regex.so
> lib/siproxd/plugin_shortdial.la
> lib/siproxd/plugin_shortdial.so
>+lib/siproxd/plugin_stun.la
>+lib/siproxd/plugin_stun.so
> sbin/siproxd

Actions: View | Diff

Attachments on bug 187113: 140510 | 157395