OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Apr-2005 17:37:55
Branch: HEAD Handle: 2005040816375500
Modified files:
openpkg-src/pdnsd pdnsd.patch pdnsd.spec
Log:
upgrading package: pdnsd 1.2 -> 1.2.2
Summary:
Revision Changes Path
1.4 +84 -11 openpkg-src/pdnsd/pdnsd.patch
1.14 +12 -8 openpkg-src/pdnsd/pdnsd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pdnsd/pdnsd.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 pdnsd.patch
--- openpkg-src/pdnsd/pdnsd.patch 16 Oct 2004 08:15:48 -0000 1.3
+++ openpkg-src/pdnsd/pdnsd.patch 8 Apr 2005 15:37:55 -0000 1.4
@@ -1,26 +1,99 @@
+Index: config.h.in
+--- config.h.in.orig 2005-04-03 18:05:55 +0200
++++ config.h.in 2005-04-08 17:35:08 +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-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"
+ ;;
++ 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"
+@@ -6034,7 +6042,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 2004-08-10 17:48:46 +0200
-+++ src/conff.h 2004-10-16 10:06:30 +0200
-@@ -32,6 +32,8 @@
- #include <config.h>
+--- src/conff.h.orig 2005-02-20 23:18:53 +0100
++++ src/conff.h 2005-04-08 17:35:45 +0200
+@@ -33,6 +33,8 @@
#include <stdio.h>
#include <pthread.h>
+ #include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include <net/if.h>
#include "ipvers.h"
#include "list.h"
Index: src/dns.h
---- 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 @@
+--- src/dns.h.orig 2005-02-20 23:34:13 +0100
++++ src/dns.h 2005-04-08 17:36:12 +0200
+@@ -27,9 +27,9 @@
#include <config.h>
#include <arpa/inet.h>
--#include <net/if.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <net/if.h>
+-#include <sys/types.h>
#include <inttypes.h>
#include "rr_types.h"
#include "list.h"
+Index: src/thread.h
+--- 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 @@
+ */
+ 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().
+@@ -106,9 +112,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
+ }
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pdnsd/pdnsd.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 pdnsd.spec
--- openpkg-src/pdnsd/pdnsd.spec 24 Mar 2005 11:19:53 -0000 1.13
+++ openpkg-src/pdnsd/pdnsd.spec 8 Apr 2005 15:37:55 -0000 1.14
@@ -32,11 +32,11 @@
Class: EVAL
Group: DNS
License: GPL
-Version: 1.2
-Release: 20041016
+Version: 1.2.2
+Release: 20050408
# list of sources
-Source0:
http://www.phys.uu.nl/~rombouts/pdnsd/pdnsd-%{version}-par.tar.gz
+Source0:
http://www.phys.uu.nl/~rombouts/pdnsd/releases/pdnsd-%{version}-par.tar.gz
Source1: rc.pdnsd
Source2: fsl.pdnsd
Source3: pdnsd.conf
@@ -45,7 +45,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make, flex, bison
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, flex, bison, gcc
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
@@ -68,10 +68,14 @@
%patch -p0
%build
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags}"
+ export LIBS=""
+ case "%{l_platform -t}" in
+ *-sunos* ) LIBS="$LIBS -lnsl -lsocket" ;;
+ esac
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/pdnsd \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
