Only in pos6/: autogen Only in pos6/: buildbin.sh diff -ur tmp/posadis-0.60.2/ChangeLog pos6/ChangeLog --- tmp/posadis-0.60.2/ChangeLog 2003-11-07 09:38:00.000000000 -0500 +++ pos6/ChangeLog 2003-11-20 15:43:25.000000000 -0500 @@ -38,6 +38,7 @@ * Added "togglequerylog"/"tql" command to Posadis init script * For Win32, applications can now read from the log file while the server is running. + * Added logfile per day functionality Posadis 0.60.1 * FreeBSD build fixes Only in pos6/: config.cache diff -ur tmp/posadis-0.60.2/config.guess pos6/config.guess --- tmp/posadis-0.60.2/config.guess 2003-05-26 06:54:38.000000000 -0400 +++ pos6/config.guess 2002-07-30 09:43:13.000000000 -0400 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. -timestamp='2002-10-21' +timestamp='2001-09-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,9 +24,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Written by Per Bothner . +# Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -88,40 +87,30 @@ exit 1 fi -trap 'exit 1' 1 2 15 -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje - -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c ; + for c in cc gcc c89 ; do + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; + if test $? = 0 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; + rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; -unset files' +esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -138,30 +127,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or + # Netbsd (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-unknown ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + case "${UNAME_MACHINE}" in + i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -184,45 +172,6 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -231,7 +180,6 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build cat <$dummy.s .data \$Lformat: @@ -257,9 +205,10 @@ jsr \$26,exit .end main EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - case `$dummy` in + case `./$dummy` in 0-0) UNAME_MACHINE="alpha" ;; @@ -281,12 +230,9 @@ 2-1307) UNAME_MACHINE="alphaev68" ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; esac fi - rm -f $dummy.s $dummy && rmdir $tmpdir + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) @@ -301,11 +247,29 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + arc64:OpenBSD:*:*) + echo mips64el-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hkmips:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -327,10 +291,6 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -359,7 +319,7 @@ echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -373,6 +333,12 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -399,6 +365,18 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -437,21 +415,15 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) - echo powerpc-harris-powermax - exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -524,8 +496,8 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -534,7 +506,7 @@ fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -574,8 +546,10 @@ 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + case "${HPUX_REV}" in + 11.[0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -584,13 +558,13 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -623,10 +597,10 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir - fi ;; + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; @@ -661,8 +635,8 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -690,6 +664,9 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -708,6 +685,9 @@ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; @@ -729,12 +709,18 @@ CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -745,19 +731,10 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -768,9 +745,6 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -796,30 +770,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 + case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in + big) echo mips-unknown-linux-gnu && exit 0 ;; + little) echo mipsel-unknown-linux-gnu && exit 0 ;; + esac ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -868,8 +828,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + ld_supported_targets=`cd /; ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -881,7 +840,7 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; @@ -893,29 +852,32 @@ esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif + cat >$dummy.c < +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif +#ifdef __ELF__ +# ifdef __GLIBC__ +# if __GLIBC__ >= 2 + printf ("%s-pc-linux-gnu\n", argv[1]); +# else + printf ("%s-pc-linux-gnulibc1\n", argv[1]); +# endif +# else + printf ("%s-pc-linux-gnulibc1\n", argv[1]); +# endif +#else + printf ("%s-pc-linux-gnuaout\n", argv[1]); +#endif + return 0; +} EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -953,13 +915,13 @@ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else @@ -992,12 +954,9 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1088,9 +1047,6 @@ SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1101,17 +1057,15 @@ echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 + if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo `uname -p`-${UNAME_MACHINE}-nto-qnx exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1283,8 +1237,8 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 +rm -f $dummy.c $dummy # Apollos put the system type in the environment. Only in pos6/: config.h.in Only in pos6/: config.log Only in pos6/: config.status Only in pos6/: CVS Only in pos6/: doc Only in pos6/libltdl: config.h Only in pos6/libltdl: config.log Only in pos6/libltdl: config.status Only in pos6/libltdl: config.w32 Only in pos6/libltdl: CVS Only in pos6/libltdl: libltdl.la Only in pos6/libltdl: .libs Only in pos6/libltdl: libtool Only in pos6/libltdl: ltdl.lo Only in pos6/libltdl: ltdl.o Only in pos6/libltdl: ltmain.sh Only in pos6/libltdl: Makefile Only in pos6/libltdl: Makefile.w32 Only in pos6/libltdl: stamp-h Only in pos6/: libtool Only in pos6/: Makefile Only in pos6/: Makefile.dist diff -ur tmp/posadis-0.60.2/Makefile.in pos6/Makefile.in --- tmp/posadis-0.60.2/Makefile.in 2003-11-07 09:42:00.000000000 -0500 +++ pos6/Makefile.in 2003-12-22 22:12:30.000000000 -0500 @@ -131,9 +131,9 @@ all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile + cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -412,6 +412,11 @@ -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ Only in pos6/pos6: auth_mem.o Only in pos6/pos6: cacheapply.o diff -ur tmp/posadis-0.60.2/pos6/configuration.cpp pos6/pos6/configuration.cpp --- tmp/posadis-0.60.2/pos6/configuration.cpp 2003-11-04 19:31:15.000000000 -0500 +++ pos6/pos6/configuration.cpp 2003-11-20 15:43:29.000000000 -0500 @@ -30,6 +30,7 @@ bool cmd_logfile; char i_logfile[PATH_MAX]; char *logfile = i_logfile; +bool logfile_per_day; char i_confdir[PATH_MAX]; char *confdir = i_confdir; @@ -43,8 +44,8 @@ int update_ttl; -bool do_query_logging = false; -bool omit_ns_records = false; +bool do_query_logging; +bool omit_ns_records; #ifndef _WIN32 bool cmd_username, cmd_groupname; @@ -62,11 +63,13 @@ void config_init() { cmd_logfile = false; i_logfile[0] = 0; + logfile_per_day = false; i_confdir[0] = 0; i_datadir[0] = 0; max_cache_items = 1000; resolv_patience = 15; do_query_logging = false; + omit_ns_records = false; update_ttl = 600; #ifndef _WIN32 cmd_username = false; cmd_groupname = false; @@ -163,6 +166,8 @@ if (cmd_logfile) return true; if (strlen(value) >= PATH_MAX) throw PException("Log file name too long"); strcpy(logfile, value); + } else if (strcmpi(set, "logfile_per_day") == 0) { + logfile_per_day = txt_to_bool(value); #ifndef _WIN32 } else if (strcmpi(set, "user") == 0) { if (cmd_username) return true; diff -ur tmp/posadis-0.60.2/pos6/configuration.h pos6/pos6/configuration.h --- tmp/posadis-0.60.2/pos6/configuration.h 2003-10-22 18:16:10.000000000 -0400 +++ pos6/pos6/configuration.h 2003-11-20 15:43:29.000000000 -0500 @@ -30,6 +30,7 @@ extern bool cmd_logfile; extern char *logfile; /* PATH_MAX */ +extern bool logfile_per_day; extern char *confdir; /* PATH_MAX */ extern char *datadir; /* PATH_MAX */ Only in pos6/pos6: configuration.o Only in pos6/pos6: CVS Only in pos6/pos6: .deps Only in pos6/pos6/fam: CVS Only in pos6/pos6/fam: .deps Only in pos6/pos6/fam: fam.lo Only in pos6/pos6/fam: fam.o Only in pos6/pos6/fam: .libs Only in pos6/pos6/fam: Makefile diff -ur tmp/posadis-0.60.2/pos6/fam/Makefile.in pos6/pos6/fam/Makefile.in --- tmp/posadis-0.60.2/pos6/fam/Makefile.in 2003-11-07 09:42:01.000000000 -0500 +++ pos6/pos6/fam/Makefile.in 2003-12-22 22:12:32.000000000 -0500 @@ -119,6 +119,7 @@ TAR = gtar GZIP_ENV = --best +DEP_FILES = .deps/fam.P SOURCES = $(monitor_la_SOURCES) OBJECTS = $(monitor_la_OBJECTS) @@ -126,9 +127,9 @@ .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps pos6/fam/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu pos6/fam/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -158,9 +159,6 @@ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -183,9 +181,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -245,6 +240,11 @@ subdir = pos6/fam distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pos6/fam/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -255,13 +255,57 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -fam.lo fam.o : fam.cpp ../../pos6/zones.h ../../pos6/hashvector.h \ - ../../pos6/vector.h ../../pos6/pbl.h ../../pos6/primary.h \ - ../../pos6/configuration.h ../../pos6/posadisrc.h \ - ../../pos6/auth_mem.h ../../pos6/stdquery.h \ - ../../pos6/masterfile.h ../../pos6/lib.h ../../pos6/zonefile.h \ - fam_w32.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -299,27 +343,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -331,12 +375,13 @@ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Only in pos6/pos6/fam: monitor.la Only in pos6/pos6: forward.o Only in pos6/pos6: lib.o Only in pos6/pos6: .libs Only in pos6/pos6/localhost: CVS Only in pos6/pos6/localhost: .deps Only in pos6/pos6/localhost: .libs Only in pos6/pos6/localhost: localhost.la Only in pos6/pos6/localhost: localhost.lo Only in pos6/pos6/localhost: localhost.o Only in pos6/pos6/localhost: Makefile diff -ur tmp/posadis-0.60.2/pos6/localhost/Makefile.in pos6/pos6/localhost/Makefile.in --- tmp/posadis-0.60.2/pos6/localhost/Makefile.in 2003-11-07 09:42:01.000000000 -0500 +++ pos6/pos6/localhost/Makefile.in 2003-12-22 22:12:31.000000000 -0500 @@ -116,6 +116,7 @@ TAR = gtar GZIP_ENV = --best +DEP_FILES = .deps/localhost.P SOURCES = $(localhost_la_SOURCES) OBJECTS = $(localhost_la_OBJECTS) @@ -123,9 +124,9 @@ .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps pos6/localhost/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu pos6/localhost/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -155,9 +156,6 @@ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -180,9 +178,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -242,6 +237,11 @@ subdir = pos6/localhost distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pos6/localhost/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -252,10 +252,57 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -localhost.lo localhost.o : localhost.cpp ../../pos6/zones.h \ - ../../pos6/hashvector.h ../../pos6/vector.h ../../pos6/pbl.h \ - ../../pos6/lib.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -293,27 +340,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -325,12 +372,13 @@ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -ur tmp/posadis-0.60.2/pos6/main.cpp pos6/pos6/main.cpp --- tmp/posadis-0.60.2/pos6/main.cpp 2003-11-07 09:38:00.000000000 -0500 +++ pos6/pos6/main.cpp 2003-11-21 14:59:17.000000000 -0500 @@ -19,12 +19,6 @@ #include #endif -#define POS_DEFAULTLOG -#define POS_DEFAULTLOG_FILE -#define POS_DEFAULTLOG_STDERR -#define POS_DEFAULTLOG_SYSLOG -#define POS_DEFAULTLOG_FPTR - #include #include @@ -61,7 +55,6 @@ #ifdef _WIN32 extern char *PLUGINDIR; -HANDLE fd; #endif void cleanup(int sig) { @@ -253,22 +246,7 @@ try { if (logfile[0] && !(logfile[0] == '-' && logfile[1] == '\0')) { -#ifdef _WIN32 - fd = CreateFile(logfile, - GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_ALWAYS, - 0, - NULL); - if (fd == INVALID_HANDLE_VALUE) outfile = NULL; - else (outfile = fdopen(_open_osfhandle((long)fd, _O_APPEND | _O_TEXT), "a")); -#else - outfile = try_fopen(logfile, "a"); -#endif - if (!outfile) { - pos_log(context_conf, log_warning, "Could not open log file %s for writing!\n", logfile); - } + open_new_logfile(); } if (pidfile[0]) { pidf = try_fopen(pidfile, "w"); @@ -351,7 +329,7 @@ auth_root_zone = NULL; pthread_mutex_unlock(&m_auth_zones); #ifdef _WIN32 - if (fd != INVALID_HANDLE_VALUE) CloseHandle(fd); + if (logfile_fd != INVALID_HANDLE_VALUE) CloseHandle(logfile_fd); #endif return ret; } Only in pos6/pos6: main.o Only in pos6/pos6: Makefile diff -ur tmp/posadis-0.60.2/pos6/Makefile.am pos6/pos6/Makefile.am --- tmp/posadis-0.60.2/pos6/Makefile.am 2003-10-06 14:22:52.000000000 -0400 +++ pos6/pos6/Makefile.am 2003-11-20 15:43:29.000000000 -0500 @@ -5,8 +5,8 @@ posadis_SOURCES = lib.cpp auth_mem.cpp cacheapply.cpp forward.cpp recursive.cpp resolver.cpp \ configuration.cpp stdquery.cpp query.cpp masterfile.cpp primary.cpp zones.cpp \ - main.cpp pbl.cpp zonetransfer.cpp secondary.cpp updates.cpp posadisrc.cpp \ - zonefile.cpp + pbl.cpp zonetransfer.cpp secondary.cpp updates.cpp posadisrc.cpp \ + zonefile.cpp main.cpp posadis_LDADD = $(LIBLTDL) SUBDIRS = revmap localhost fam diff -ur tmp/posadis-0.60.2/pos6/Makefile.in pos6/pos6/Makefile.in --- tmp/posadis-0.60.2/pos6/Makefile.in 2003-11-07 09:42:01.000000000 -0500 +++ pos6/pos6/Makefile.in 2003-12-22 22:12:31.000000000 -0500 @@ -91,7 +91,7 @@ bin_PROGRAMS = posadis -posadis_SOURCES = lib.cpp auth_mem.cpp cacheapply.cpp forward.cpp recursive.cpp resolver.cpp configuration.cpp stdquery.cpp query.cpp masterfile.cpp primary.cpp zones.cpp main.cpp pbl.cpp zonetransfer.cpp secondary.cpp updates.cpp posadisrc.cpp zonefile.cpp +posadis_SOURCES = lib.cpp auth_mem.cpp cacheapply.cpp forward.cpp recursive.cpp resolver.cpp configuration.cpp stdquery.cpp query.cpp masterfile.cpp primary.cpp zones.cpp pbl.cpp zonetransfer.cpp secondary.cpp updates.cpp posadisrc.cpp zonefile.cpp main.cpp posadis_LDADD = $(LIBLTDL) @@ -127,9 +127,9 @@ posadis_OBJECTS = lib.$(OBJEXT) auth_mem.$(OBJEXT) cacheapply.$(OBJEXT) \ forward.$(OBJEXT) recursive.$(OBJEXT) resolver.$(OBJEXT) \ configuration.$(OBJEXT) stdquery.$(OBJEXT) query.$(OBJEXT) \ -masterfile.$(OBJEXT) primary.$(OBJEXT) zones.$(OBJEXT) main.$(OBJEXT) \ -pbl.$(OBJEXT) zonetransfer.$(OBJEXT) secondary.$(OBJEXT) \ -updates.$(OBJEXT) posadisrc.$(OBJEXT) zonefile.$(OBJEXT) +masterfile.$(OBJEXT) primary.$(OBJEXT) zones.$(OBJEXT) pbl.$(OBJEXT) \ +zonetransfer.$(OBJEXT) secondary.$(OBJEXT) updates.$(OBJEXT) \ +posadisrc.$(OBJEXT) zonefile.$(OBJEXT) main.$(OBJEXT) posadis_DEPENDENCIES = CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -145,6 +145,11 @@ TAR = gtar GZIP_ENV = --best +DEP_FILES = .deps/auth_mem.P .deps/cacheapply.P .deps/configuration.P \ +.deps/forward.P .deps/lib.P .deps/main.P .deps/masterfile.P .deps/pbl.P \ +.deps/posadisrc.P .deps/primary.P .deps/query.P .deps/recursive.P \ +.deps/resolver.P .deps/secondary.P .deps/stdquery.P .deps/updates.P \ +.deps/zonefile.P .deps/zones.P .deps/zonetransfer.P SOURCES = $(posadis_SOURCES) OBJECTS = $(posadis_OBJECTS) @@ -152,9 +157,9 @@ .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps pos6/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu pos6/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -184,9 +189,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -209,9 +211,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -347,6 +346,11 @@ subdir = pos6 distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pos6/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -367,55 +371,57 @@ || exit 1; \ fi; \ done -auth_mem.o: auth_mem.cpp query.h stdquery.h zones.h hashvector.h \ - vector.h pbl.h resolver.h auth_mem.h configuration.h \ - posadisrc.h -cacheapply.o: cacheapply.cpp cacheapply.h recursive.h zones.h \ - hashvector.h vector.h pbl.h resolver.h stdquery.h -configuration.o: configuration.cpp configuration.h zones.h hashvector.h \ - vector.h pbl.h posadisrc.h lib.h zonefile.h primary.h \ - auth_mem.h stdquery.h -forward.o: forward.cpp zones.h hashvector.h vector.h pbl.h resolver.h \ - stdquery.h -lib.o: lib.cpp ../posadis-config.h lib.h zones.h hashvector.h vector.h \ - pbl.h ../libltdl/ltdl.h configuration.h posadisrc.h primary.h \ - auth_mem.h stdquery.h secondary.h -main.o: main.cpp ../posadis-config.h hashvector.h vector.h pbl.h zones.h \ - primary.h configuration.h posadisrc.h auth_mem.h stdquery.h \ - masterfile.h query.h lib.h resolver.h updates.h -masterfile.o: masterfile.cpp zones.h hashvector.h vector.h pbl.h \ - primary.h configuration.h posadisrc.h auth_mem.h stdquery.h \ - masterfile.h -pbl.o: pbl.cpp pbl.h -posadisrc.o: posadisrc.cpp posadisrc.h zones.h hashvector.h vector.h \ - pbl.h configuration.h lib.h -primary.o: primary.cpp primary.h zones.h hashvector.h vector.h pbl.h \ - configuration.h posadisrc.h auth_mem.h stdquery.h masterfile.h \ - updates.h secondary.h -query.o: query.cpp query.h stdquery.h zonetransfer.h secondary.h \ - auth_mem.h zones.h hashvector.h vector.h pbl.h configuration.h \ - posadisrc.h -recursive.o: recursive.cpp recursive.h zones.h hashvector.h vector.h \ - pbl.h resolver.h stdquery.h cacheapply.h -resolver.o: resolver.cpp resolver.h zones.h hashvector.h vector.h pbl.h \ - stdquery.h recursive.h forward.h configuration.h posadisrc.h \ - lib.h auth_mem.h -secondary.o: secondary.cpp secondary.h auth_mem.h zones.h hashvector.h \ - vector.h pbl.h stdquery.h resolver.h updates.h masterfile.h \ - primary.h configuration.h posadisrc.h query.h -stdquery.o: stdquery.cpp configuration.h zones.h hashvector.h vector.h \ - pbl.h posadisrc.h query.h stdquery.h resolver.h lib.h -updates.o: updates.cpp updates.h zones.h hashvector.h vector.h pbl.h \ - secondary.h auth_mem.h stdquery.h configuration.h posadisrc.h \ - zonefile.h -zonefile.o: zonefile.cpp zonefile.h zones.h hashvector.h vector.h pbl.h \ - lib.h posadisrc.h configuration.h -zones.o: zones.cpp zones.h hashvector.h vector.h pbl.h resolver.h \ - updates.h configuration.h posadisrc.h -zonetransfer.o: zonetransfer.cpp zonetransfer.h zones.h hashvector.h \ - vector.h pbl.h primary.h configuration.h posadisrc.h auth_mem.h \ - stdquery.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: @@ -454,26 +460,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-recursive clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ - distclean-tags distclean-generic clean-am + distclean-tags distclean-depend distclean-generic \ + clean-am -rm -f libtool distclean: distclean-recursive maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -490,12 +497,14 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Only in pos6/pos6: Makefile.w32 Only in pos6/pos6: masterfile.o Only in pos6/pos6: pbl.o Only in pos6/pos6: posadis Only in pos6/pos6: posadis.ico Only in pos6/pos6: posadisrc.o Only in pos6/pos6: primary.o Only in pos6/pos6: query.o Only in pos6/pos6: recursive.o Only in pos6/pos6: resolver.o Only in pos6/pos6/revmap: CVS Only in pos6/pos6/revmap: .deps Only in pos6/pos6/revmap: entry.lo Only in pos6/pos6/revmap: entry.o Only in pos6/pos6/revmap: formap.lo Only in pos6/pos6/revmap: formap.o Only in pos6/pos6/revmap: .libs Only in pos6/pos6/revmap: Makefile diff -ur tmp/posadis-0.60.2/pos6/revmap/Makefile.in pos6/pos6/revmap/Makefile.in --- tmp/posadis-0.60.2/pos6/revmap/Makefile.in 2003-11-07 09:42:01.000000000 -0500 +++ pos6/pos6/revmap/Makefile.in 2003-12-22 22:12:31.000000000 -0500 @@ -122,6 +122,7 @@ TAR = gtar GZIP_ENV = --best +DEP_FILES = .deps/entry.P .deps/formap.P .deps/revmap.P SOURCES = $(revmap_la_SOURCES) OBJECTS = $(revmap_la_OBJECTS) @@ -129,9 +130,9 @@ .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps pos6/revmap/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu pos6/revmap/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -161,9 +162,6 @@ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -186,9 +184,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -248,6 +243,11 @@ subdir = pos6/revmap distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu pos6/revmap/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -258,14 +258,57 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -entry.lo entry.o : entry.cpp ../../pos6/zones.h ../../pos6/hashvector.h \ - ../../pos6/vector.h ../../pos6/pbl.h ../../pos6/lib.h formap.h \ - revmap.h -formap.lo formap.o : formap.cpp formap.h ../../pos6/zones.h \ - ../../pos6/hashvector.h ../../pos6/vector.h ../../pos6/pbl.h -revmap.lo revmap.o : revmap.cpp revmap.h ../../pos6/zones.h \ - ../../pos6/hashvector.h ../../pos6/vector.h ../../pos6/pbl.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -303,27 +346,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -335,12 +378,13 @@ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Only in pos6/pos6/revmap: revmap.la Only in pos6/pos6/revmap: revmap.lo Only in pos6/pos6/revmap: revmap.o Only in pos6/pos6: secondary.o Only in pos6/pos6: sql Only in pos6/pos6: stdquery.o diff -ur tmp/posadis-0.60.2/pos6/updates.cpp pos6/pos6/updates.cpp --- tmp/posadis-0.60.2/pos6/updates.cpp 2003-10-29 12:08:15.000000000 -0500 +++ pos6/pos6/updates.cpp 2003-11-21 14:59:17.000000000 -0500 @@ -15,12 +15,75 @@ * * ***************************************************************************/ +#define POS_DEFAULTLOG +#define POS_DEFAULTLOG_FILE +#define POS_DEFAULTLOG_STDERR +#define POS_DEFAULTLOG_SYSLOG +#define POS_DEFAULTLOG_FPTR +#include + #include "updates.h" #include "secondary.h" #include "configuration.h" #include "zonefile.h" #include +#include + +time_t next_logfile; +#ifdef _WIN32 +HANDLE logfile_fd = INVALID_HANDLE_VALUE; +#endif + +void open_new_logfile() { + char logfile_name[PATH_MAX+8]; + struct tm tstruct; + time_t tsecs; + FILE *flogfile = NULL; + if (logfile_per_day) { + char data[9]; + char ext[5] = ""; + strcpy(logfile_name, logfile); + + if (strlen(logfile_name) > 4 && logfile_name[strlen(logfile_name)-4] == '.') { + strcpy(ext, logfile_name + strlen(logfile_name) - 4); + logfile_name[strlen(logfile_name)-4] = 0; + } + + tsecs = time(NULL); + localtime_r(&tsecs, &tstruct); + + sprintf(data, "%04d%02d%02d", tstruct.tm_year + 1900, tstruct.tm_mon + 1, tstruct.tm_mday); + strcat(logfile_name, data); + strcat(logfile_name, ext); + } else strcpy(logfile_name, logfile); +#ifdef _WIN32 + if (logfile_fd != INVALID_HANDLE_VALUE) + logfile_fd = CreateFile(logfile_name, + GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_ALWAYS, + 0, + NULL); + if (logfile_fd == INVALID_HANDLE_VALUE) outfile = NULL; + else (flogfile = fdopen(_open_osfhandle((long)logfile_fd, _O_APPEND | _O_TEXT), "a")); +#else + flogfile = try_fopen(logfile_name, "a"); +#endif + if (!flogfile) { + pos_log(context_conf, log_warning, "Could not open log file %s for writing!\n", logfile_name); + } + outfile = flogfile; + /* set next time */ + if (logfile_per_day) { + tstruct.tm_mday++; + tstruct.tm_hour = 0; + tstruct.tm_min = 0; + tstruct.tm_sec = 0; + next_logfile = mktime(&tstruct); + } +} class PendingUpdate { public: @@ -51,6 +114,11 @@ } void my_cleanup() { + /* check whether to reset log */ + if (logfile_per_day) { + time_t tsecs = time(NULL); + if (tsecs >= next_logfile) open_new_logfile(); + } /* checking enqueued updates... */ pthread_mutex_lock(&m_auth_zones); postime_t now = getcurtime(); diff -ur tmp/posadis-0.60.2/pos6/updates.h pos6/pos6/updates.h --- tmp/posadis-0.60.2/pos6/updates.h 2003-10-22 18:16:12.000000000 -0400 +++ pos6/pos6/updates.h 2003-11-21 14:59:17.000000000 -0500 @@ -20,6 +20,13 @@ #include #include "zones.h" + +#ifdef _WIN32 +#include +extern HANDLE logfile_fd; +#endif + +void open_new_logfile(); typedef void(*update_function)(domainname dom, void *data); Only in pos6/pos6: updates.o Only in pos6/pos6: win32 Only in pos6/pos6: zonefile.o Only in pos6/pos6: zones.o Only in pos6/pos6: zonetransfer.o Only in pos6/: pos6-devel.spec Only in pos6/: pos6-fam.spec Only in pos6/: pos6.spec Only in pos6/: posadis-0.60.2 Only in pos6/: posadis-0.60.2.tar.gz Only in pos6/: posadis-all.spec Only in pos6/: posadis-config Only in pos6/: posadis-config.h Only in pos6/: posadis-config.w32 diff -ur tmp/posadis-0.60.2/posadisrc.5 pos6/posadisrc.5 --- tmp/posadis-0.60.2/posadisrc.5 2003-11-04 19:34:56.000000000 -0500 +++ pos6/posadisrc.5 2003-11-20 15:43:26.000000000 -0500 @@ -82,13 +82,18 @@ \fIdatadir\fR \- Directory to store temporary files in (nessecary both for serving and retrieving zone transfers). +\fIuser\fR (Unix only) \- User name to switch to after opening configuration files and binding to sockets. Note that master files should be readable by this user as well as root. + +\fIgroup\fR (Unix only) \- Group name to switch to after opening configuration files and binding to sockets. + +\fBLogging:\fR + \fIlogfile\fR \- File to log messages in. By default, nothing is logged. Posadis for Unix will also log to syslog. -\fIdo_query_logging\fR \- If set to true, Posadis will log each query (normal queries, zone transfers and NOTIFY messages) it receives. Useful for debugging purposes; defaults to false. +\fIlogfile_per_day\fR \- If set to true, Posadis will create a new logfile each day at midnight (named according to the value of 'logfile', but with the data appended). Defaults to false though. -\fIuser\fR (Unix only) \- User name to switch to after opening configuration files and binding to sockets. Note that master files should be readable by this user as well as root. +\fIdo_query_logging\fR \- If set to true, Posadis will log each query (normal queries, zone transfers and NOTIFY messages) it receives. Useful for debugging purposes; defaults to false. -\fIgroup\fR (Unix only) \- Group name to switch to after opening configuration files and binding to sockets. \fBResolving:\fR Only in pos6/: stamp-h diff -ur tmp/posadis-0.60.2/TODO pos6/TODO --- tmp/posadis-0.60.2/TODO 2003-11-04 19:31:15.000000000 -0500 +++ pos6/TODO 2003-12-22 11:22:27.000000000 -0500 @@ -1,5 +1,6 @@ * add example zone files *.example to CVS * standard libdir /should/ be appended as fallback default! + * query reports * win32: strip exes! * posask snippet use: explicitly say format=true Only in pos6/tools: CVS Only in pos6/tools: .deps Only in pos6/tools: getroots.o Only in pos6/tools: getzone Only in pos6/tools: getzone.o Only in pos6/tools: .libs Only in pos6/tools: Makefile diff -ur tmp/posadis-0.60.2/tools/Makefile.am pos6/tools/Makefile.am --- tmp/posadis-0.60.2/tools/Makefile.am 2003-10-22 18:16:52.000000000 -0400 +++ pos6/tools/Makefile.am 2003-12-22 21:39:19.000000000 -0500 @@ -1,4 +1,4 @@ -INCLUDES= $(poslib_cxxflags) -I$(top_srcdir) +INCLUDES= $(poslib_cxxflags) -I$(top_srcdir) -I$(top_srcdir)/tools LDFLAGS = $(poslib_ldflags) -export-dynamic EXTRA_DIST = posadis-init getzone.1 posadis-getroots.1 posask.1 poshost.1 \ Only in pos6/tools: Makefile.am~ diff -ur tmp/posadis-0.60.2/tools/Makefile.in pos6/tools/Makefile.in --- tmp/posadis-0.60.2/tools/Makefile.in 2003-11-07 09:42:02.000000000 -0500 +++ pos6/tools/Makefile.in 2003-12-22 22:12:32.000000000 -0500 @@ -87,7 +87,7 @@ poslib_srvldflags = @poslib_srvldflags@ poslib_version = @poslib_version@ -INCLUDES = $(poslib_cxxflags) -I$(top_srcdir) +INCLUDES = $(poslib_cxxflags) -I$(top_srcdir) -I$(top_srcdir)/tools LDFLAGS = $(poslib_ldflags) -export-dynamic EXTRA_DIST = posadis-init getzone.1 posadis-getroots.1 posask.1 poshost.1 answertostring.cpp @@ -143,6 +143,8 @@ TAR = gtar GZIP_ENV = --best +DEP_FILES = .deps/getroots.P .deps/getzone.P .deps/posask.P \ +.deps/poshost.P SOURCES = $(posask_SOURCES) $(posadis_getroots_SOURCES) $(getzone_SOURCES) $(poshost_SOURCES) OBJECTS = $(posask_OBJECTS) $(posadis_getroots_OBJECTS) $(getzone_OBJECTS) $(poshost_OBJECTS) @@ -150,9 +152,9 @@ .SUFFIXES: .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps tools/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -182,9 +184,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -207,9 +206,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -321,6 +317,11 @@ subdir = tools distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tools/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -331,11 +332,57 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -getroots.o: getroots.cpp -getzone.o: getzone.cpp -posask.o: posask.cpp ../posadis-config.h answertostring.cpp -poshost.o: poshost.cpp answertostring.cpp ../posadis-config.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -373,26 +420,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ - distclean-tags distclean-generic clean-am + distclean-tags distclean-depend distclean-generic \ + clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -404,12 +452,13 @@ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool install-man1 uninstall-man1 \ install-man uninstall-man tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Only in pos6/tools: Makefile.w32 Only in pos6/tools: posadis-getroots Only in pos6/tools: posask Only in pos6/tools: posask.o Only in pos6/tools: poshost Only in pos6/tools: poshost.o Only in pos6/: w32version.rc