View | Details | Raw Unified | Return to bug 118040
Collapse All | Expand All

(-)siproxd/Makefile (-1 / +1 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	siproxd
8
PORTNAME=	siproxd
9
PORTVERSION=	0.5.13
9
PORTVERSION=	0.6.0
10
CATEGORIES=	net
10
CATEGORIES=	net
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	siproxd
12
MASTER_SITE_SUBDIR=	siproxd
(-)siproxd/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (siproxd-0.5.13.tar.gz) = 91a572f80dd5a9af5a0f7f207fd34478
1
MD5 (siproxd-0.6.0.tar.gz) = 188026ad6da88cf68628e429f2771709
2
SHA256 (siproxd-0.5.13.tar.gz) = b419e2642cff2aea43ebd32139e2fe345003347d09e1a8dc6a289fdc08c1f7cd
2
SHA256 (siproxd-0.6.0.tar.gz) = a12b6f5b6ed8ee85d17105b97c0dcb48b0417ae7efa48c5b67f10993b595086c
3
SIZE (siproxd-0.5.13.tar.gz) = 223109
3
SIZE (siproxd-0.6.0.tar.gz) = 244459
(-)siproxd/files/patch-doc_siproxd.conf.example (-8 / +9 lines)
Lines 1-5 Link Here
1
--- doc/siproxd.conf.example.orig	Sun Jan  1 21:09:42 2006
1
--- doc/siproxd.conf.example.orig	Thu Aug 16 20:57:04 2007
2
+++ doc/siproxd.conf.example	Wed Apr 19 16:41:31 2006
2
+++ doc/siproxd.conf.example	Wed Nov 14 12:26:19 2007
3
@@ -17,8 +17,8 @@
3
@@ -17,8 +17,8 @@
4
 #    or a hostname that resolves to that address (use a dyndns address for
4
 #    or a hostname that resolves to that address (use a dyndns address for
5
 #    example).
5
 #    example).
Lines 11-17 Link Here
11
 # uncomment the following line ONLY IF YOU KNOW WHAT YOU ARE DOING!
11
 # uncomment the following line ONLY IF YOU KNOW WHAT YOU ARE DOING!
12
 # READ THE FAQ FIRST!
12
 # READ THE FAQ FIRST!
13
 #host_outbound = 1.2.3.4
13
 #host_outbound = 1.2.3.4
14
@@ -81,14 +81,14 @@
14
@@ -84,7 +84,7 @@
15
 #   user:	uid/gid to switch to after startup
15
 #   user:	uid/gid to switch to after startup
16
 #   chrootjail:	path to chroot to (chroot jail)
16
 #   chrootjail:	path to chroot to (chroot jail)
17
 user = nobody
17
 user = nobody
Lines 20-37 Link Here
20
 
20
 
21
 ######################################################################
21
 ######################################################################
22
 # Registration file:
22
 # Registration file:
23
 #   Where to store the current registrations.
23
@@ -93,7 +93,7 @@
24
 #   An empty value means we do not save registrations. Make sure that
25
 #   the specified directory path does exist!
24
 #   the specified directory path does exist!
25
 #   Note: If running in chroot jail, this path starts relative
26
 #         to the jail.
26
-registration_file = /var/lib/siproxd/siproxd_registrations
27
-registration_file = /var/lib/siproxd/siproxd_registrations
27
+registration_file = siproxd_registrations
28
+registration_file = siproxd_registrations
28
 
29
 
29
 ######################################################################
30
 ######################################################################
30
 # Automatically save current registrations every 'n' seconds
31
 # Automatically save current registrations every 'n' seconds
31
@@ -99,7 +99,7 @@
32
@@ -106,7 +106,7 @@
32
 # PID file:
33
 #   Where to create the PID file.
34
 #   This file holds the PID of the main thread of siproxd.
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.
35
-pid_file = /var/run/siproxd/siproxd.pid
36
-pid_file = /var/run/siproxd/siproxd.pid
36
+pid_file = siproxd.pid
37
+pid_file = siproxd.pid
37
 
38
 
(-)siproxd/files/patch-src__plugin_shortdial.c (-2 / +2 lines)
Lines 1-5 Link Here
1
--- src/plugin_shortdial.c.orig	Sat May 20 13:48:30 2006
1
--- src/plugin_shortdial.c.orig	Fri Jun  8 21:42:57 2007
2
+++ src/plugin_shortdial.c	Wed Jun 21 09:08:19 2006
2
+++ src/plugin_shortdial.c	Wed Nov 14 12:26:19 2007
3
@@ -22,6 +22,7 @@
3
@@ -22,6 +22,7 @@
4
 
4
 
5
 #include <stdio.h>
5
 #include <stdio.h>
(-)siproxd/files/patch-src__siproxd.c (-15 / +6 lines)
Lines 1-6 Link Here
1
--- src/siproxd.c.orig	Sun Jun 18 18:28:20 2006
1
--- src/siproxd.c.orig	Fri Jun  8 21:41:47 2007
2
+++ src/siproxd.c	Wed Jun 21 09:06:10 2006
2
+++ src/siproxd.c	Wed Nov 14 12:26:19 2007
3
@@ -177,11 +177,16 @@
3
@@ -181,10 +181,15 @@
4
 /*
4
 /*
5
  * Init stuff
5
  * Init stuff
6
  */
6
  */
Lines 8-29 Link Here
8
-
8
-
9
    /* read the config file */
9
    /* read the config file */
10
    if (read_config(configfile, config_search) == STS_FAILURE) exit(1);
10
    if (read_config(configfile, config_search) == STS_FAILURE) exit(1);
11
 
11
+
12
+   /* Don't log to stderr if daemonizing is intended. */
12
+   /* Don't log to stderr if daemonizing is intended. */
13
+   if (configuration.daemonize) {
13
+   if (configuration.daemonize) {
14
+      log_set_stderr(0);
14
+     log_set_stderr(0);
15
+   }
15
+   }
16
+
16
+
17
+   INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
17
+   INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
18
+
18
 
19
    /* if a debug level > 0 has been given on the commandline use its
19
    /* if a debug level > 0 has been given on the commandline use its
20
       value and not what is in the config file */
20
       value and not what is in the config file */
21
    if (cmdline_debuglevel != 0) {
22
@@ -212,7 +217,6 @@
23
       setsid();
24
       if (fork()!=0) exit(0);
25
 
26
-      log_set_stderr(0);
27
       INFO("daemonized, pid=%i", getpid());
28
    }
29
 
(-)siproxd/files/patch-src__utils.c (+22 lines)
Line 0 Link Here
1
--- src/utils.c.orig	Mon Sep  3 21:54:48 2007
2
+++ src/utils.c	Wed Nov 14 12:26:19 2007
3
@@ -23,7 +23,7 @@
4
 #include <stdlib.h>
5
 #include <unistd.h>
6
 #include <errno.h>
7
-#include <values.h>
8
+#include <limits.h>
9
 #include <time.h>
10
 #include <signal.h>
11
 #include <string.h>
12
@@ -208,8 +208,8 @@
13
     */
14
    j=0;
15
    k=0;
16
-   t1=MAXINT;
17
-   t2=MAXINT;
18
+   t1=INT_MAX;
19
+   t2=INT_MAX;
20
    for (i=0; i<DNS_CACHE_SIZE; i++) {
21
       if (dns_cache[i].hostname[0]=='\0') break;
22
       if ((dns_cache[i].expires_timestamp < t1) &&

Return to bug 118040