head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.5.2.2 OPENPKG_E1_FP:1.5.2.2 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.5.2.2 OPENPKG_2_STABLE:1.5.0.2 OPENPKG_CW_FP:1.3; locks; strict; comment @# @; 1.5 date 2005.10.03.11.32.23; author rse; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2005.04.08.15.37.55; author rse; state Exp; branches; next 1.3; 1.3 date 2004.10.16.08.15.48; author rse; state Exp; branches; next 1.2; 1.2 date 2004.05.10.18.55.52; author rse; state Exp; branches; next 1.1; 1.1 date 2004.01.08.13.13.51; author rse; state Exp; branches; next ; 1.5.2.1 date 2005.10.03.11.32.23; author rse; state dead; branches; next 1.5.2.2; commitid iZxwRSmmWscPXUQr; 1.5.2.2 date 2006.10.16.14.54.02; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.5 log @increase portability @ text @Index: config.h.in --- config.h.in.orig 2005-07-11 11:37:36 +0200 +++ config.h.in 2005-10-03 13:00:37 +0200 @@@@ -183,6 +183,7 @@@@ #define TARGET_LINUX 0 #define TARGET_BSD 1 #define TARGET_CYGWIN 2 +#define TARGET_SOLARIS 3 /* Allow _ in domain names? (This option is obsolete and will be ignored.) */ #undef UNDERSCORE Index: configure --- configure.orig 2005-07-11 11:37:42 +0200 +++ configure 2005-10-03 13:04:46 +0200 @@@@ -1149,6 +1149,14 @@@@ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; + SunOS) + echo "$ac_t"""${uname_sys}"" 1>&6 + cat >> confdefs.h <<\EOF +#define TARGET TARGET_SOLARIS +EOF + + target="BSD" + ;; *) sed -n \ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" @@@@ -5829,6 +5837,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#ifdef HAVE_SYS_SOCKET_H +#include +#endif int main () { @@@@ -7232,7 +7243,7 @@@@ -for ac_func in nanosleep gettimeofday mkfifo select socket strerror uname snprintf vsnprintf +for ac_func in gettimeofday mkfifo select socket strerror uname snprintf vsnprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 Index: src/conff.h --- src/conff.h.orig 2005-06-27 21:57:22 +0200 +++ src/conff.h 2005-10-03 13:00:37 +0200 @@@@ -33,6 +33,8 @@@@ #include #include #include +#include +#include #include #include "ipvers.h" #include "list.h" Index: src/dns.h --- src/dns.h.orig 2005-07-01 14:33:35 +0200 +++ src/dns.h 2005-10-03 13:00:37 +0200 @@@@ -27,9 +27,9 @@@@ #include #include +#include #include #include -#include #include #include "rr_types.h" #include "list.h" Index: src/thread.h --- src/thread.h.orig 2005-07-08 20:16:36 +0200 +++ src/thread.h 2005-10-03 13:00:37 +0200 @@@@ -111,10 +111,16 @@@@ */ inline static int usleep_r(unsigned long useconds) { +#if TARGET==TARGET_SOLARIS + struct timeval tv = { tv_sec: (useconds / 1000000), + tv_usec: (useconds % 1000000) }; + return select(0, NULL, NULL, NULL, &tv); +#else struct timespec ts = { tv_sec: (useconds / 1000000), tv_nsec: (useconds % 1000000) * 1000ul }; return nanosleep(&ts, NULL); +#endif } /* This is a thread-safe sleep(). @@@@ -123,9 +129,14 @@@@ */ inline static int sleep_r (unsigned int seconds) { +#if TARGET==TARGET_SOLARIS + struct timeval tv = { tv_sec: seconds , tv_usec: 0 }; + return select(0, NULL, NULL, NULL, &tv); +#else struct timespec ts = { tv_sec: seconds, tv_nsec: 0 }; return nanosleep(&ts, NULL); +#endif } @ 1.5.2.1 log @file pdnsd.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:54:02 +0000 @ text @d1 109 @ 1.5.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 109 Index: config.h.in --- config.h.in.orig 2005-07-11 11:37:36 +0200 +++ config.h.in 2005-10-03 13:00:37 +0200 @@@@ -183,6 +183,7 @@@@ #define TARGET_LINUX 0 #define TARGET_BSD 1 #define TARGET_CYGWIN 2 +#define TARGET_SOLARIS 3 /* Allow _ in domain names? (This option is obsolete and will be ignored.) */ #undef UNDERSCORE Index: configure --- configure.orig 2005-07-11 11:37:42 +0200 +++ configure 2005-10-03 13:04:46 +0200 @@@@ -1149,6 +1149,14 @@@@ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; + SunOS) + echo "$ac_t"""${uname_sys}"" 1>&6 + cat >> confdefs.h <<\EOF +#define TARGET TARGET_SOLARIS +EOF + + target="BSD" + ;; *) sed -n \ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" @@@@ -5829,6 +5837,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#ifdef HAVE_SYS_SOCKET_H +#include +#endif int main () { @@@@ -7232,7 +7243,7 @@@@ -for ac_func in nanosleep gettimeofday mkfifo select socket strerror uname snprintf vsnprintf +for ac_func in gettimeofday mkfifo select socket strerror uname snprintf vsnprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 Index: src/conff.h --- src/conff.h.orig 2005-06-27 21:57:22 +0200 +++ src/conff.h 2005-10-03 13:00:37 +0200 @@@@ -33,6 +33,8 @@@@ #include #include #include +#include +#include #include #include "ipvers.h" #include "list.h" Index: src/dns.h --- src/dns.h.orig 2005-07-01 14:33:35 +0200 +++ src/dns.h 2005-10-03 13:00:37 +0200 @@@@ -27,9 +27,9 @@@@ #include #include +#include #include #include -#include #include #include "rr_types.h" #include "list.h" Index: src/thread.h --- src/thread.h.orig 2005-07-08 20:16:36 +0200 +++ src/thread.h 2005-10-03 13:00:37 +0200 @@@@ -111,10 +111,16 @@@@ */ inline static int usleep_r(unsigned long useconds) { +#if TARGET==TARGET_SOLARIS + struct timeval tv = { tv_sec: (useconds / 1000000), + tv_usec: (useconds % 1000000) }; + return select(0, NULL, NULL, NULL, &tv); +#else struct timespec ts = { tv_sec: (useconds / 1000000), tv_nsec: (useconds % 1000000) * 1000ul }; return nanosleep(&ts, NULL); +#endif } /* This is a thread-safe sleep(). @@@@ -123,9 +129,14 @@@@ */ inline static int sleep_r (unsigned int seconds) { +#if TARGET==TARGET_SOLARIS + struct timeval tv = { tv_sec: seconds , tv_usec: 0 }; + return select(0, NULL, NULL, NULL, &tv); +#else struct timespec ts = { tv_sec: seconds, tv_nsec: 0 }; return nanosleep(&ts, NULL); +#endif } @ 1.4 log @upgrading package: pdnsd 1.2 -> 1.2.2 @ text @d2 2 a3 2 --- config.h.in.orig 2005-04-03 18:05:55 +0200 +++ config.h.in 2005-04-08 17:35:08 +0200 d13 5 a17 5 --- configure.orig 2005-04-03 18:05:58 +0200 +++ configure 2005-04-08 17:34:38 +0200 @@@@ -1116,6 +1116,14 @@@@ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" d29 12 a40 2 "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" @@@@ -6034,7 +6042,7 @@@@ d50 2 a51 2 --- src/conff.h.orig 2005-02-20 23:18:53 +0100 +++ src/conff.h 2005-04-08 17:35:45 +0200 d62 2 a63 2 --- src/dns.h.orig 2005-02-20 23:34:13 +0100 +++ src/dns.h 2005-04-08 17:36:12 +0200 d76 3 a78 3 --- src/thread.h.orig 2005-03-15 17:31:28 +0100 +++ src/thread.h 2005-04-08 17:34:38 +0200 @@@@ -94,10 +94,16 @@@@ d95 1 a95 1 @@@@ -106,9 +112,14 @@@@ @ 1.3 log @upgrading package: pdnsd 1.1.11 -> 1.2 @ text @d1 38 d40 3 a42 4 --- src/conff.h.orig 2004-08-10 17:48:46 +0200 +++ src/conff.h 2004-10-16 10:06:30 +0200 @@@@ -32,6 +32,8 @@@@ #include d45 1 d52 3 a54 3 --- src/dns.h.orig 2004-10-01 16:36:02 +0200 +++ src/dns.h 2004-10-16 10:01:40 +0200 @@@@ -27,8 +27,9 @@@@ d58 4 a61 4 -#include #include +#include +#include d65 35 @ 1.2 log @upgrading package: pdnsd 1.1.10 -> 1.1.11 @ text @d1 16 a16 4 Index: src/dns_query.c --- src/dns_query.c.orig 2004-05-03 15:58:21.000000000 +0200 +++ src/dns_query.c 2004-05-10 20:54:03.000000000 +0200 @@@@ -66,6 +66,8 @@@@ d18 9 a26 17 #define SOCK_ADDR(p) ((struct sockaddr *) &(p)->a) +#undef SIN_ADDR +#undef SIN_LEN #ifdef ENABLE_IPV4 # ifdef ENABLE_IPV6 # define SIN_LEN (run_ipv4?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6)) @@@@ -851,7 +853,9 @@@@ case ECONNREFUSED: /* port unreachable */ case ENETDOWN: /* network down */ case EHOSTDOWN: /* host down */ +#ifdef ENONET case ENONET: /* machine not on the network */ +#endif /* Mark this server as down for a period of time */ sched_server_test(PDNSD_A(st),1,0); st->needs_testing=0; @ 1.1 log @new package: pdnsd 1.1.8b1par8 (Proxy DNS Daemon) @ text @d2 5 a6 5 --- src/dns_query.c.orig 2003-10-05 10:11:21.000000000 +0200 +++ src/dns_query.c 2004-01-08 13:41:43.000000000 +0100 @@@@ -56,6 +56,8 @@@@ /* The method we use for querying other servers */ int query_method=M_PRESET; d12 11 a22 1 # define SIN_ADDR(p) (run_ipv6?((struct sockaddr *) &(p)->a.sin6):((struct sockaddr *) &(p)->a.sin4)) @