Index: head/net/siproxd/pkg-deinstall =================================================================== --- head/net/siproxd/pkg-deinstall (revision 388657) +++ head/net/siproxd/pkg-deinstall (nonexistent) @@ -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 Property changes on: head/net/siproxd/pkg-deinstall ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/siproxd/pkg-install =================================================================== --- head/net/siproxd/pkg-install (revision 388657) +++ head/net/siproxd/pkg-install (nonexistent) @@ -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 Property changes on: head/net/siproxd/pkg-install ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/siproxd/Makefile =================================================================== --- head/net/siproxd/Makefile (revision 388657) +++ head/net/siproxd/Makefile (revision 388658) @@ -1,51 +1,48 @@ # Created by: Frank W. Josellis # $FreeBSD$ PORTNAME= siproxd -PORTVERSION= 0.7.2 -PORTREVISION= 4 +PORTVERSION= 0.8.1 CATEGORIES= net MASTER_SITES= SF MAINTAINER= frank@dynamical-systems.org COMMENT= Proxy/masquerading daemon for the SIP protocol LICENSE= GPLv2 LIB_DEPENDS= libosip2.so:${PORTSDIR}/net/libosip2 # :keepla because port uses lt_dlopen USES= libtool:keepla USE_RC_SUBR= siproxd GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doc --disable-static --with-libosip-prefix=${PREFIX} INSTALL_TARGET= install-strip PORTDOCS1= AUTHORS ChangeLog README RELNOTES PORTDOCS2= FAQ KNOWN_BUGS RFC3261_compliance.txt \ 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 +BROKEN_FreeBSD_8= Problem with libosip2 during configure 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 .include Index: head/net/siproxd/distinfo =================================================================== --- head/net/siproxd/distinfo (revision 388657) +++ head/net/siproxd/distinfo (revision 388658) @@ -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: head/net/siproxd/files/patch-doc_siproxd.conf.example =================================================================== --- head/net/siproxd/files/patch-doc_siproxd.conf.example (revision 388657) +++ head/net/siproxd/files/patch-doc_siproxd.conf.example (nonexistent) @@ -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 Property changes on: head/net/siproxd/files/patch-doc_siproxd.conf.example ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/siproxd/files/patch-configure =================================================================== --- head/net/siproxd/files/patch-configure (revision 388657) +++ head/net/siproxd/files/patch-configure (nonexistent) @@ -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" - - - Property changes on: head/net/siproxd/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/siproxd/files/patch-src__siproxd.c =================================================================== --- head/net/siproxd/files/patch-src__siproxd.c (revision 388657) +++ head/net/siproxd/files/patch-src__siproxd.c (nonexistent) @@ -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 */ Property changes on: head/net/siproxd/files/patch-src__siproxd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/siproxd/pkg-plist =================================================================== --- head/net/siproxd/pkg-plist (revision 388657) +++ head/net/siproxd/pkg-plist (revision 388658) @@ -1,13 +1,19 @@ @sample etc/siproxd.conf.sample @sample etc/siproxd_passwd.cfg.sample lib/siproxd/plugin_defaulttarget.la lib/siproxd/plugin_defaulttarget.so lib/siproxd/plugin_demo.la lib/siproxd/plugin_demo.so lib/siproxd/plugin_fix_bogus_via.la 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