Date: Wed, 14 Nov 2007 13:19:18 +0100 (CET) From: "Frank W. Josellis" <frank@dynamical-systems.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/118040: Update port: net/siproxd to 0.6.0 Message-ID: <200711141219.lAECJIbD040741@pollux.senax.net> Resent-Message-ID: <200711141220.lAECK1JL046378@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118040
>Category: ports
>Synopsis: Update port: net/siproxd to 0.6.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 14 12:20:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Frank W. Josellis
>Release: FreeBSD 5.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD pollux.senax.net 5.5-STABLE FreeBSD 5.5-STABLE #17: Wed Oct 31 16:22:23 CET 2007 root@pollux.senax.net:/usr/obj/usr/src/sys/POLLUX i386
>Description:
Update to version 0.6.0.
Files added:
files/patch-src__utils.c
>How-To-Repeat:
>Fix:
--- siproxd-0.6.0.patch begins here ---
diff -Nur siproxd.BAK/Makefile siproxd/Makefile
--- siproxd.BAK/Makefile Fri Jun 23 11:18:33 2006
+++ siproxd/Makefile Wed Nov 14 12:46:00 2007
@@ -6,7 +6,7 @@
#
PORTNAME= siproxd
-PORTVERSION= 0.5.13
+PORTVERSION= 0.6.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= siproxd
diff -Nur siproxd.BAK/distinfo siproxd/distinfo
--- siproxd.BAK/distinfo Fri Jun 23 11:18:33 2006
+++ siproxd/distinfo Wed Nov 14 12:46:00 2007
@@ -1,3 +1,3 @@
-MD5 (siproxd-0.5.13.tar.gz) = 91a572f80dd5a9af5a0f7f207fd34478
-SHA256 (siproxd-0.5.13.tar.gz) = b419e2642cff2aea43ebd32139e2fe345003347d09e1a8dc6a289fdc08c1f7cd
-SIZE (siproxd-0.5.13.tar.gz) = 223109
+MD5 (siproxd-0.6.0.tar.gz) = 188026ad6da88cf68628e429f2771709
+SHA256 (siproxd-0.6.0.tar.gz) = a12b6f5b6ed8ee85d17105b97c0dcb48b0417ae7efa48c5b67f10993b595086c
+SIZE (siproxd-0.6.0.tar.gz) = 244459
diff -Nur siproxd.BAK/files/patch-doc_siproxd.conf.example siproxd/files/patch-doc_siproxd.conf.example
--- siproxd.BAK/files/patch-doc_siproxd.conf.example Thu May 18 08:15:16 2006
+++ siproxd/files/patch-doc_siproxd.conf.example Wed Nov 14 12:46:00 2007
@@ -1,5 +1,5 @@
---- doc/siproxd.conf.example.orig Sun Jan 1 21:09:42 2006
-+++ doc/siproxd.conf.example Wed Apr 19 16:41:31 2006
+--- doc/siproxd.conf.example.orig Thu Aug 16 20:57:04 2007
++++ doc/siproxd.conf.example Wed Nov 14 12:26:19 2007
@@ -17,8 +17,8 @@
# or a hostname that resolves to that address (use a dyndns address for
# example).
@@ -11,7 +11,7 @@
# uncomment the following line ONLY IF YOU KNOW WHAT YOU ARE DOING!
# READ THE FAQ FIRST!
#host_outbound = 1.2.3.4
-@@ -81,14 +81,14 @@
+@@ -84,7 +84,7 @@
# user: uid/gid to switch to after startup
# chrootjail: path to chroot to (chroot jail)
user = nobody
@@ -20,18 +20,19 @@
######################################################################
# Registration file:
- # Where to store the current registrations.
- # An empty value means we do not save registrations. Make sure that
+@@ -93,7 +93,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
-@@ -99,7 +99,7 @@
- # PID file:
- # Where to create the PID file.
+@@ -106,7 +106,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
diff -Nur siproxd.BAK/files/patch-src__plugin_shortdial.c siproxd/files/patch-src__plugin_shortdial.c
--- siproxd.BAK/files/patch-src__plugin_shortdial.c Fri Jun 23 11:18:33 2006
+++ siproxd/files/patch-src__plugin_shortdial.c Wed Nov 14 12:46:00 2007
@@ -1,5 +1,5 @@
---- src/plugin_shortdial.c.orig Sat May 20 13:48:30 2006
-+++ src/plugin_shortdial.c Wed Jun 21 09:08:19 2006
+--- src/plugin_shortdial.c.orig Fri Jun 8 21:42:57 2007
++++ src/plugin_shortdial.c Wed Nov 14 12:26:19 2007
@@ -22,6 +22,7 @@
#include <stdio.h>
diff -Nur siproxd.BAK/files/patch-src__siproxd.c siproxd/files/patch-src__siproxd.c
--- siproxd.BAK/files/patch-src__siproxd.c Fri Jun 23 11:18:33 2006
+++ siproxd/files/patch-src__siproxd.c Wed Nov 14 12:46:00 2007
@@ -1,6 +1,6 @@
---- src/siproxd.c.orig Sun Jun 18 18:28:20 2006
-+++ src/siproxd.c Wed Jun 21 09:06:10 2006
-@@ -177,11 +177,16 @@
+--- src/siproxd.c.orig Fri Jun 8 21:41:47 2007
++++ src/siproxd.c Wed Nov 14 12:26:19 2007
+@@ -181,10 +181,15 @@
/*
* Init stuff
*/
@@ -8,22 +8,13 @@
-
/* read the config file */
if (read_config(configfile, config_search) == STS_FAILURE) exit(1);
-
++
+ /* Don't log to stderr if daemonizing is intended. */
+ if (configuration.daemonize) {
-+ log_set_stderr(0);
++ 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) {
-@@ -212,7 +217,6 @@
- setsid();
- if (fork()!=0) exit(0);
-
-- log_set_stderr(0);
- INFO("daemonized, pid=%i", getpid());
- }
-
diff -Nur siproxd.BAK/files/patch-src__utils.c siproxd/files/patch-src__utils.c
--- siproxd.BAK/files/patch-src__utils.c Thu Jan 1 01:00:00 1970
+++ siproxd/files/patch-src__utils.c Wed Nov 14 12:46:00 2007
@@ -0,0 +1,22 @@
+--- src/utils.c.orig Mon Sep 3 21:54:48 2007
++++ src/utils.c Wed Nov 14 12:26:19 2007
+@@ -23,7 +23,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <values.h>
++#include <limits.h>
+ #include <time.h>
+ #include <signal.h>
+ #include <string.h>
+@@ -208,8 +208,8 @@
+ */
+ j=0;
+ k=0;
+- t1=MAXINT;
+- t2=MAXINT;
++ t1=INT_MAX;
++ t2=INT_MAX;
+ for (i=0; i<DNS_CACHE_SIZE; i++) {
+ if (dns_cache[i].hostname[0]=='\0') break;
+ if ((dns_cache[i].expires_timestamp < t1) &&
--- siproxd-0.6.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711141219.lAECJIbD040741>