]> git.pld-linux.org Git - packages/LPRng.git/commitdiff
- updated for 3.8.0.
authorkloczek <kloczek@pld-linux.org>
Mon, 5 Nov 2001 17:04:33 +0000 (17:04 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    LPRng-ac_fixes.patch -> 1.8
    LPRng-jobfilescan.patch -> 1.2
    LPRng-shutdown.patch -> 1.2

LPRng-ac_fixes.patch
LPRng-jobfilescan.patch
LPRng-shutdown.patch

index 9aa3ad8a2ceab47d2e2a2ea8a74dafac378b4c71..96c5a972d9af547f2361f8b6387293c9abe2136b 100644 (file)
---- LPRng-3.7.5/src/Makefile.in.wiget  Wed Jan 10 01:59:06 2001
-+++ LPRng-3.7.5/src/Makefile.in        Tue Oct  9 14:53:05 2001
-@@ -33,7 +33,8 @@
- @SET_MAKE@
+diff -Nru LPRng-3.8.0/Makefile.in LPRng-3.8.0.new/Makefile.in
+--- LPRng-3.8.0/Makefile.in    Tue Oct 16 22:09:21 2001
++++ LPRng-3.8.0.new/Makefile.in        Tue Oct 23 11:08:12 2001
+@@ -46,7 +46,6 @@
+ LOCKFILE=\"@LOCKFILE@\"
+ PSHOWALL="@PSHOWALL@"
+ FILTER_DIR=@FILTER_DIR@
+-LOCALEDIR=@LOCALEDIR@
+ INIT=@INIT@
+ USE_NLS=@USE_NLS@
+ USE_GDBM=@USE_GDBM@
+@@ -113,7 +112,7 @@
+ ###############################################################################
+ $(ALLDIRS):
+       if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
+-              cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
++              cd $@; $(MAKE) \
+                       DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
+       fi
  
- # what C compiler to use.
--CC:=@CC@
-+CC=@CC@
-+datadir=@datadir@
+--- LPRng-3.8.0/configure.in~  Tue Oct 16 22:27:47 2001
++++ LPRng-3.8.0/configure.in   Tue Oct 23 16:08:57 2001
+@@ -7,52 +7,16 @@
+ AC_INIT(Makefile.in)
  
- # what command to use to "ranlib" or "lorder" the library.
- RANLIB=@RANLIB@
-@@ -47,14 +48,9 @@
- SHELL_PATH=@SHELL@
- SHELL = @SHELL@
  
--# loader for c programs
--LDCC=@LDCC@
+-PACKAGE=LPRng
+-VERSION=3.8.0
 -
- # any libs that need to be used to get these programs to compile:
--LIBS=@USE_GDBM_LIB@ @INTLLIBS@ @LIBS@
-+LIBS=@LIBS@
--# add path to internationalization
--INTLINCS=@INTLINCS@
- ### PATHS ####
- # prefix
-@@ -72,12 +68,10 @@
- # install options
--STRIP=@STRIP@
- CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ \
-  -I${top_builddir} \
-- -I${SRC}/include -I${SRC}/common @INTLINCS@ \
-- -I@USE_GDBM_INC_DIR@ \
-+ -I${SRC}/include -I${SRC}/common \
-  -DCHOWN=\"@CHOWN@\"  \
-  -DCHGRP=\"@CHGRP@\"  \
-  -DPRINTCAP_PATH=\"@PRINTCAP_PATH@\"  \
-@@ -91,16 +85,15 @@
-  -DCLEAR=\"@CLEAR@\"  \
-  -DUSERID=\"@USERID@\"  \
-  -DGROUPID=\"@GROUPID@\"  \
-- -DLOCALEDIR=\"@LOCALEDIR@\"
-+ -DLOCALEDIR=\"$(datadir)/locale\"
- USER_OBJS := @USER_OBJS@
--LDFLAGS   := -L@USE_GDBM_LIB_DIR@ @LDFLAGS@
-+LDFLAGS   := @LDFLAGS@
- FILTER_DIR = @FILTER_DIR@
- LPD_DIR    = @LPD_DIR@
--STRIP      = @STRIP@
- #********************** End of configure modifiable settings ************
-@@ -178,7 +171,7 @@
- SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE
--INCLUDE=.. ${SRC}/include ${INTLINCS}
-+INCLUDE=.. ${SRC}/include
- VPATH=..:.:${SRC}/include:${SRC}/common
-@@ -244,33 +237,33 @@
-       $(RANLIB) $@
- lpd: $(LPD_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
- lpr: $(LPR_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
- lpq: $(LPQ_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
- lpstat: $(LPSTAT_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
- lprm: $(LPRM_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
- lpc: $(LPC_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
- checkpc: $(CHECKPC_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
- lpf: $(LPF_OBJS)
--      $(LDCC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
- lpbanner: $(LPBANNER_OBJS)
--      $(LDCC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
- monitor: $(MONITOR_OBJS) liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
- authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
-       rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
- sserver: sserver.o liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
- sclient: sclient.o liblpr.a
--      $(LDCC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
- sendauth.o lpd_secure.o :     user_auth.stub
-@@ -307,17 +300,17 @@
-         if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
-       done;
--      ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
--      ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
--      ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
--      ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
--      ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
--      ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
--      ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
--      ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
--      ${INSTALLCMD}    -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
--      ${INSTALLCMD}    -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
--      ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
-+      ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
-+      ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
-+      ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
-+      ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
-+      ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
-+      ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
-+      ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
-+      ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
-+      ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
-+      ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
-+      ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
-       cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
- uninstall:
---- LPRng-3.7.5/man/Makefile.in.wiget  Mon Jan  8 20:19:50 2001
-+++ LPRng-3.7.5/man/Makefile.in        Tue Oct  9 14:53:05 2001
-@@ -22,8 +22,8 @@
- ## fix up prefix to be a make variable
- prefix = @prefix@
--MAN =         @mandir@
--SHELL =               @SHELL@
-+mandir = @mandir@
-+SHELL =       @SHELL@
- # Install man pages in compressed form.
- # COMPRESS     = compression utility
-@@ -61,13 +61,13 @@
- install:
-       for suffix in 1 2 3 4 5 6 7 8 ; do \
-         if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
--          if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
--                  echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
--                  ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
-+          if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
-+                  echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
-+                  ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
-           fi; \
-           for i in ${SRC}/*.$$suffix; do \
--              echo   $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
--              $(INSTALL)   -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-+              echo   $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
-+              $(INSTALL)   -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
-           done; \
-         fi; \
-       done;
-@@ -76,8 +76,8 @@
-       for suffix in 1 2 3 4 5 6 7 8 ; do \
-         if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
-           for i in ${SRC}/*.$$suffix; do \
--              echo   rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
--              rm   $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-+              echo   rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
-+              rm   $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
-           done; \
-         fi; \
-       done;
---- LPRng-3.7.5/configure.in.wiget     Mon Jan 15 21:26:40 2001
-+++ LPRng-3.7.5/configure.in   Tue Oct  9 14:53:05 2001
-@@ -13,46 +13,13 @@
- AC_CANONICAL_SYSTEM
+-
+ AC_CONFIG_AUX_DIR(.)
+-AC_CANONICAL_SYSTEM
  AC_CONFIG_HEADER(config.h)
  
 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 -AC_SUBST(VERSION)
 -ALL_LINGUAS="fr"
 -
+-WITH_CC dnl
+-WITH_CCOPTS dnl
+-WITH_LINKER dnl
+-WITH_LDOPTS dnl
+-WITH_CPPOPTS dnl
+-if test -z "$LOCALEDIR" ; then
+-    LOCALEDIR='${prefix}/share/locale'
+-fi;
+-WITH_LOCALEDIR dnl
+-export LOCALEDIR
+-
 -AC_PREFIX_DEFAULT(/usr/local)
 -AC_SUBST(INSTALL)
 -AC_SUBST(INSTALL_MAN)
 -AC_SUBST(CPPFLAGS)
 -AC_SUBST(LDFLAGS)
 -AC_SUBST(LDCC)
-+AM_INIT_AUTOMAKE(LPRng, 3.7.4)
+-
++AM_INIT_AUTOMAKE(LPRng, 3.8.0)
  
  dnl check for awk
  AC_PROG_AWK
 -AC_PATH_PROG(CHGRP,chgrp)dnl
 -AC_SUBST(CHGRP)dnl
 -
--
--WITH_CC dnl
--WITH_CCOPTS dnl
--WITH_LINKER dnl
--WITH_LDOPTS dnl
--WITH_CPPOPTS dnl
--
--if test -z "$LOCALEDIR" ; then
--      LOCALEDIR='$(prefix)/share/locale'
--fi;
--
--WITH_LOCALEDIR dnl
--
--
 +AC_PATH_PROG(PERL,perl)
 +AC_PATH_PROG(CHOWN,chown)
 +AC_PATH_PROG(CHGRP,chgrp)
  
  dnl ----------------------------------------------------------------------------
  dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
-@@ -86,31 +53,6 @@
-       USE_GDBM_BUILD_DIR=`pwd`/db
-       USE_GDBM_LIB_DIR=`pwd`/db/.libs
-       USE_GDBM_INC_DIR=`pwd`/db
--      d=${srcdir}/${USE_GDBM}
--#     USE_GDBM=db-3.1.17
--#     USE_GDBM_LIB="-ldb"
--#     USE_GDBM_BUILD_DIR=`pwd`/db
--#     USE_GDBM_LIB_DIR=`pwd`/db
--#     USE_GDBM_INC_DIR=`pwd`/db
--#     d=${srcdir}/${USE_GDBM}/dist
--      if test "!" -d db ; then
--              mkdir db
--      fi
--      if test "!" -d ${d} ; then
--              echo "Missing $d";
--              exit 1
--      fi
--      e=`cd $d; pwd`
--      echo DIR $d is $e
--      f=$e/configure
--      if test "!" -f $f ; then
--              echo "Missing $f";
--              exit 1
--      fi
--      echo "#!/bin/sh
--/bin/sh $f \"\$@\" --srcdir=$e
--" >db/configure
--      chmod a+x db/configure
- fi
- AC_SUBST(USE_GDBM)dnl
- AC_SUBST(USE_GDBM_LIB)dnl
-@@ -382,38 +324,11 @@
+@@ -333,16 +297,6 @@
  AC_MSG_RESULT($FILTER_DIR)
  AC_SUBST(FILTER_DIR)
  
 -)
 -AC_MSG_RESULT($v)
 -AC_SUBST(STRIP)
+-
+ dnl ----------------------------------------------------------------------------
+ dnl ------------   OS Checks  --------------------------------------------------
+@@ -350,50 +304,12 @@
+ AC_MINIX
+ AC_AIX
+-
+-changequote(, )dnl
+-release=`uname -r 2>/dev/null; exit 0`;
+-version=`echo $target_os | sed -e 's/[^0-9][^0-9]*//' -e 's/\./X/' -e 's/\.//g' -e 's/X/./' \
+-      | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
+-if test "$version" -eq 0 ; then
+-      version=`echo $release | sed -e 's/-.*//' -e 's/\.//g' \
+-      | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
+-fi
+-osword=`echo $target_os | sed -e 's/[0-9].*//'`; export osword
+-changequote([, ])dnl
+-AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
+-
+-AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
+-AC_DEFINE_UNQUOTED(OSNAME,"$osword")
+-AC_DEFINE_UNQUOTED(OSVERSION,$version)
+-OSNAME=$osword
+-OSVERSION=$version
+-AC_SUBST(OSNAME)dnl
+-AC_SUBST(OSVERSION)dnl
 -
 -
  dnl ----------------------------------------------------------------------------
  dnl -----------   C compiler checks    -----------------------------------------
- AC_PROG_CC
  AC_PROG_CPP
+ AC_PROG_CC
  
 -if test "$ac_cv_prog_gcc" = yes; then
 -      cat >conftest.c <<EOF
 -fi;
 -
 -LDCC="$CC"
+-
+ AM_PROG_LIBTOOL
+ AC_C_CONST
+@@ -451,77 +367,6 @@
+   AC_DEFINE(HAVE_QUAD_T)
+ fi
+-
+-dnl ----------------------------------------------------------------------------
+-dnl OS dependency checks
+-checklibs=
+-case $target_os in
+-       *linux* )
+-              no_resolv_lib=yes;
+-              case $release in
+-changequote(, )dnl
+-              2.2.1[0-5]* )
+-changequote([, ])dnl
+-                      AC_DEFINE(SETUID_CHECK)
+-                      AC_MSG_WARN([Kernel may have SETUID compromise.  Update kernel])
+-                      ;;
+-              esac
+-              ;;
+-       *bsdi* )
+-              LDCC=shlicc
+-              dnl BSDI uses this for setproctitle
+-              AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
+-              ;;
+-       *bsd* )
+-              dnl *BSD uses this for setproctitle
+-              AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
+-              ;;
+-       *unicos* )
+-              checklibs=no
+-              ;;
+-       *irix6* )
+-              checklibs=no
+-              AC_DEFINE_UNQUOTED(IRIX,$version)
+-              ;;
+-       *irix5* )
+-              checklibs=no
+-              AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
+-              AC_DEFINE(SVR4)
+-              AC_DEFINE_UNQUOTED(IRIX,$version)
+-              ;;
+-       *irix* )
+-              checklibs=no
+-              AC_DEFINE_UNQUOTED(IRIX,$version)
+-              ;;
+-      *solaris* )
+-              AC_DEFINE(SVR4)
+-              AC_DEFINE_UNQUOTED(SOLARIS,$version)
+-              no_resolv_lib=yes;
+-              ;;
+-      *hpux* )
+-              AC_DEFINE(_HPUX_SOURCE)
+-              CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE=1"
+-              CFLAGS="$CFLAGS -D_HPUX_SOURCE=1"
+-              AC_DEFINE_UNQUOTED(HPUX,$version)
+-              ;;
+-      *sunos* )
+-              AC_DEFINE_UNQUOTED(SUNOS,$version)
+-              ;;
+-      osf* )
+-              AC_DEFINE_UNQUOTED(DECALPHA,$version)
+-              if test "$ac_cv_prog_gcc" != yes; then
+-                      CPPFLAGS="$CPPFLAGS -std";
+-                      CFLAGS="$CFLAGS -std";
+-        else
+-            CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
+-            CFLAGS="$CFLAGS -DAES_SOURCE"
+-              fi
+-              ;;
+-      *mips-sni* )
+-              ;;
+-esac
+-AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
 -
  dnl ----------------------------------------------------------------------------
- dnl ------------   OS Checks  --------------------------------------------------
- AC_ISC_POSIX
-@@ -1359,38 +1274,9 @@
- SHELL=/bin/sh
- AC_MSG_RESULT(using $SHELL (FORCED))
+ dnl headers:
  
+@@ -549,7 +394,6 @@
+       dnl A/UX uses this...
+       AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
+-      dnl use old-style shared libs if we have 'em.
+       AC_CHECK_LIB(socket_s, socket, [LIBS="$LIBS -lsocket_s"; have_socket=1], ,-lnsl)
+       if test -z "$have_socket"; then
+               AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], , -lnsl)
+@@ -1007,8 +851,8 @@
+ dnl ----------------------------------------------------------------------------
+ dnl check to see if you have getpgrp(0) or getpgrp()
+ dnl
+-dnl POSIX `getpgrp(void)'  define HAVE_GETPGRP_0
+-dnl BSD   `getpgrp(int)' - takes 0 as argument
++dnl POSIX getpgrp(void)  define HAVE_GETPGRP_0
++dnl BSD   getpgrp(int) - takes 0 as argument
+ dnl                        define HAVE_GETPGRP_0 0
+ dnl check to see if you have getpgrp(0) or getpgrp()
+@@ -1055,11 +899,11 @@
+ dnl ----------------------------------------------------------------------------
+ dnl just for (really) backwards compatibility
+-dnl we really try not to use union wait -- it's heinously unportable.
++dnl we really try not to use union wait -- it is heinously unportable.
+ dnl nicked this check from Tcl as well. ;
+ dnl
+ dnl The check below checks whether <sys/wait.h> defines the type
+-dnl "union wait" correctly.  It's needed because of weirdness in
++dnl "union wait" correctly.  It is needed because of weirdness in
+ dnl HP-UX where "union wait" is defined in both the BSD and SYS-V
+ dnl environments.  Checking the usability of WIFEXITED seems to do
+ dnl the trick.
+@@ -1307,41 +1151,9 @@
+ AC_PROG_MAKE_SET
+-dnl ----------------- force this to be Bourne Shell for now ---------------
+-AC_MSG_CHECKING(for shell)
+-SHELL=/bin/sh
+-AC_MSG_RESULT(using $SHELL (FORCED))
+-
 +ALL_LINGUAS="fr"
  AM_GNU_GETTEXT
  
+-AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
 - if test "${USE_NLS}" = yes; then
--   AC_MSG_CHECKING([Using NLS, localedir ${LOCALEDIR}, ])
+-   AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
 -   if test "${USE_INCLUDED_LIBINTL}" = yes ; then
--        AC_MSG_RESULT([using the local libintl installation])
--        if test -f ${srcdir}/${nls_cv_header_libgt} ; then
--              INTLINCS='-I $(top_builddir)/intl'
--        else
--              AC_MSG_RESULT([NLS enabled, local libintl support is needed, and])
--              AC_MSG_RESULT([ source code is not in the ${srcdir}/intl directory.])
--              AC_MSG_RESULT([ See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details.])
+-      CPPFLAGS="$CPPFLAGS -I \${top_builddir}/intl"
+-        AC_MSG_RESULT([using \${top_builddir}/intl])
+-        if test "$nls_cv_force_use_gnu_gettext" = no ; then
+-              echo "NLS enabled and requested system gettext support not available."
+-              echo " You may need to use:"
+-              echo "  configure '--with-cppopts=-I/usr/local/include' '--with-ldopts=-L/usr/local/lib'"
+-              echo " See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
+-              exit 1;
+-      fi
+-        if test ! -f ${srcdir}/intl/gettext.h ; then
+-              echo "gettext code is not in the ${srcdir}/intl directory."
+-              echo "See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
 -              exit 1;
 -        fi
--   else
--        AC_MSG_RESULT([using -lintl])
--        INTLLIBS=-lintl
 -   fi
+-   LIBS="$INTLLIBS $LIBS"
 - else
 -   AC_MSG_RESULT([No NLS])
 - fi   
-- if test "${USE_NLS}" != yes -o "${USE_INCLUDED_LIBINTL}" != yes ; then
--      nls_cv_header_intl=
--      nls_cv_header_libgt=
-- fi
 - if test "$XGETTEXT" = "" ; then
 -       XGETTEXT=xgettext;
 - fi
 - AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
-- AC_SUBST(INTLINCS)
-- AC_SUBST(INTLLIBS)
 -
  dnl ----------------------------------------------------------------------------
  dnl ----------------- END OF GENERAL CONFIGURATION   ---------------------------
  
-@@ -1525,11 +1411,7 @@
- fi;
+@@ -1393,12 +1205,12 @@
+               found=
+               if test "$found" = "" ; then
+                       LIBS=" -lcrypto -lcom_err $SAVELIBS"
+-                      AC_CHECKING(for krb5_des_string_to_key in $LIBS, )
++                      AC_MSG_NOTICE([for krb5_des_string_to_key in $LIBS])
+                       AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
+               fi;
+               if test "$found" = "" ; then
+                       LIBS=" -lk5crypto -lcom_err $SAVELIBS"
+-                      AC_CHECKING(for krb5_des_string_to_keyin $LIBS, )
++                      AC_MSG_NOTICE([for krb5_des_string_to_keyin $LIBS])
+                       AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
+               fi;
+               if test "$found" = "" ; then
+@@ -1413,7 +1225,7 @@
+               found= 
+               if test "$found" = "" ; then
+                       LIBS=" -lkrb5 $SAVELIBS"
+-                      AC_CHECKING(for krb5_init_context in $LIBS, )
++                      AC_CHECKING([for krb5_init_context in $LIBS])
+                       AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
+               fi;
+               if test "$found" = "" ; then
+@@ -1427,12 +1239,12 @@
+                       found=;
+                       if test "$found" = "" ; then
+                               LIBS=" -lkrb4 -ldes425 $SAVELIBS"
+-                              AC_CHECKING(for krb_recvauth in $LIBS, )
++                              AC_CHECKING([for krb_recvauth in $LIBS])
+                               AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
+                       fi;
+                       if test "$found" = "" ; then
+                               LIBS=" -lkrb4 -ldes $SAVELIBS"
+-                              AC_CHECKING(for krb_recvauth in $LIBS, )
++                              AC_CHECKING([for krb_recvauth in $LIBS])
+                               AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
+                       fi;
+                       if test "$found" = "" ; then
+@@ -1501,12 +1313,7 @@
+ dnl ----------------- START OF OUTPUT ------------------------------------------
  
  
--if test "$USE_GDBM" != ""  ; then
--      AC_CONFIG_SUBDIRS( db )
--fi
- AC_OUTPUT(
+-if test "$ac_cv_prog_gcc" = yes; then
+-      CFLAGS="$CFLAGS -Wall -Werror"
+-fi;
+-
+-AC_OUTPUT(
 -[
++AC_OUTPUT([
  Makefile
  HOWTO/Makefile
  TESTSUPPORT/Makefile
-@@ -1558,28 +1440,22 @@
+@@ -1535,29 +1342,23 @@
  src/psbanner
  po/Makefile.in
  intl/Makefile
 -; do chmod +x $i ; done
 -]
 -
+-)
 +UTILS/LPRng.pm
 +UTILS/accounting.pl
 +UTILS/decode_args_with_perl
 +UTILS/remote_active
 +UTILS/test_read
 +UTILS/update_z.pl
- )
++])
  
  dnl ----------------------------------------------------------------------------
---- LPRng-3.7.5/Makefile.in.wiget      Mon Jan 15 22:27:47 2001
-+++ LPRng-3.7.5/Makefile.in    Tue Oct  9 14:53:45 2001
-@@ -44,7 +44,6 @@
- LOCKFILE=\"@LOCKFILE@\"
- PSHOWALL="@PSHOWALL@"
- FILTER_DIR=@FILTER_DIR@
--LOCALEDIR=@LOCALEDIR@
- INIT=@INIT@
- USE_NLS=@USE_NLS@
- USE_GDBM=@USE_GDBM@
-@@ -58,7 +57,7 @@
- # ALLDIRS for other such as documentation
- #=============================================================================
--DIRS= UTILS ${USE_GDBM_BUILD_DIR} intl src po man
-+DIRS= UTILS intl src po man
- INSTALLDIRS= UTILS intl src po man
- FILES=./postinstall ./preremove ./postremove ./lpd.conf
- ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/HOWTO ${SRC}/DISTRIBUTIONS
-@@ -113,7 +112,7 @@
- ###############################################################################
- $(ALLDIRS): FRC
-       if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
--              cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
-+              cd $@; $(MAKE) \
-                       DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
-       fi
+ dnl ----------------- END OF OUTPUT --------------------------------------------
+--- LPRng-3.8.0/man/Makefile.in        Sat Aug 25 20:10:01 2001
++++ LPRng-3.8.0.new/man/Makefile.in    Tue Oct 23 11:08:12 2001
+@@ -22,8 +22,8 @@
+ ## fix up prefix to be a make variable
+ prefix = @prefix@
+-MAN =         @mandir@
+-SHELL =               @SHELL@
++mandir = @mandir@
++SHELL =       @SHELL@
+ # Install man pages in compressed form.
+ # COMPRESS     = compression utility
+@@ -61,13 +61,13 @@
+ install:
+       for suffix in 1 2 3 4 5 6 7 8 ; do \
+         if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
+-          if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
+-                  echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
+-                  ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
++          if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
++                  echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
++                  ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
+           fi; \
+           for i in ${SRC}/*.$$suffix; do \
+-              echo   $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
+-              $(INSTALL)   -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
++              echo   $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
++              $(INSTALL)   -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
+           done; \
+         fi; \
+       done;
+@@ -76,8 +76,8 @@
+       for suffix in 1 2 3 4 5 6 7 8 ; do \
+         if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
+           for i in ${SRC}/*.$$suffix; do \
+-              echo   rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
+-              rm   $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
++              echo   rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
++              rm   $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
+           done; \
+         fi; \
+       done;
+--- LPRng-3.8.0/src/Makefile.in~       Sat Aug 25 20:02:01 2001
++++ LPRng-3.8.0/src/Makefile.in        Tue Oct 23 20:41:57 2001
+@@ -33,7 +33,8 @@
+ @SET_MAKE@
+ # what C compiler to use.
+-CC:=@CC@
++CC=@CC@
++datadir=@datadir@
  
+ # what command to use to "ranlib" or "lorder" the library.
+ RANLIB=@RANLIB@
+@@ -47,9 +48,6 @@
+ SHELL_PATH=@SHELL@
+ SHELL = @SHELL@
+-# loader for c programs
+-LDCC=@LDCC@
+-
+ # any libs that need to be used to get these programs to compile:
+ LIBS= @LIBS@
+@@ -74,8 +72,6 @@
+ # install options
+-STRIP=@STRIP@
+-
+ CFLAGS:= \
+       -I${top_builddir} \
+       -I${SRC}/include -I${SRC}/common \
+@@ -93,7 +89,7 @@
+       -DCLEAR=\"@CLEAR@\"  \
+       -DUSERID=\"@USERID@\"  \
+       -DGROUPID=\"@GROUPID@\"  \
+-      -DLOCALEDIR=\"@LOCALEDIR@\"
++      -DLOCALEDIR=\"$(datadir)/locale\"
+ USER_OBJS := @USER_OBJS@
+ LDFLAGS   := @LDFLAGS@
+@@ -101,8 +97,6 @@
+ FILTER_DIR = @FILTER_DIR@
+ LPD_DIR    = @LPD_DIR@
+-STRIP      = @STRIP@
+-
+ #********************** End of configure modifiable settings ************
+@@ -187,7 +181,7 @@
+ ########################################################################
+ .SUFFIXES: .lo
+-LINK =  $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@
++LINK =  $(LIBTOOL) --mode=link $(CC) -o $@
+ .c.lo:
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
+@@ -249,25 +243,25 @@
+       $(LINK) $(LIBLPR_OBJS) -rpath ${libdir}
+ lpd: $(LPD_OBJS) liblpr.la
+-      $(LINK) ${LPD_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPD_OBJS} liblpr.la $(LIBS)
+ lpr: $(LPR_OBJS) liblpr.la
+-      $(LINK) ${LPR_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPR_OBJS} liblpr.la $(LIBS)
+ lpq: $(LPQ_OBJS) liblpr.la
+-      $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPQ_OBJS} liblpr.la $(LIBS)
+ lpstat: $(LPSTAT_OBJS) liblpr.la
+-      $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPSTAT_OBJS} liblpr.la $(LIBS)
+ lprm: $(LPRM_OBJS) liblpr.la
+-      $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPRM_OBJS} liblpr.la $(LIBS)
+ lpc: $(LPC_OBJS) liblpr.la
+-      $(LINK) ${LPC_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPC_OBJS} liblpr.la $(LIBS)
+ checkpc: $(CHECKPC_OBJS) liblpr.la
+-      $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${CHECKPC_OBJS} liblpr.la $(LIBS)
+ lpf: $(LPF_OBJS)
+-      $(LINK) ${LPF_OBJS} $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPF_OBJS} $(LIBS)
+ lpbanner: $(LPBANNER_OBJS)
+-      $(LINK) ${LPBANNER_OBJS} $(LIBS)
++      $(LINK) $(LDFLAGS) ${LPBANNER_OBJS} $(LIBS)
+ monitor: $(MONITOR_OBJS) liblpr.la
+-      $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS)
++      $(LINK) $(LDFLAGS) ${MONITOR_OBJS} liblpr.la $(LIBS)
+ authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
+       rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
+@@ -313,17 +307,17 @@
+       done;
+       ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD}    -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD}    -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
+-      ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
++      ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
+       cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
+ uninstall:
index 7852dc4f330fc45b84c72d5d7bccb7ee5939ebda..2a6b0040c05c216224897d285c2625d347b42993 100644 (file)
@@ -1,11 +1,12 @@
---- LPRng-3.7.3/src/common/checkpc.c.jobfilescan       Thu Mar 29 14:58:23 2001
-+++ LPRng-3.7.3/src/common/checkpc.c   Thu Mar 29 14:59:51 2001
-@@ -440,7 +440,7 @@
-                               continue;
-                       }
+--- LPRng-3.8.0/src/common/checkpc.c.orig      Tue Oct 16 22:32:38 2001
++++ LPRng-3.8.0/src/common/checkpc.c   Tue Oct 23 11:07:23 2001
+@@ -458,7 +458,8 @@
                }
+               /* we update all real files in this directory */
+               WARNMSG( "calling Check_file for '%s', fix %d", cf_name, Fix ); 
 -              Check_file( cf_name, Fix, 0, 0 );
-+              if ( jobfile ) Check_file( cf_name, Fix, 0, 0 );
++              if ( jobfile )
++                      Check_file( cf_name, Fix, 0, 0 );
        }
        closedir(dir);
  
index 8f24468c70aeecf7dff15fd2cda09f033e721019..a3a9068994b11f75ed3638981b51fb0ec6b86caa 100644 (file)
@@ -1,26 +1,3 @@
---- LPRng-3.7.4/src/common/sendjob.c.shutdown  Sun Feb 25 21:54:07 2001
-+++ LPRng-3.7.4/src/common/sendjob.c   Sun Feb 25 21:55:40 2001
-@@ -195,7 +195,7 @@
-  error:
--      if( sock >= 0 ) shutdown(sock,1);
-+/*    if( sock >= 0 ) shutdown(sock,1); */
-       if( status ){
-               if( (s = Find_str_value(&job->info,ERROR,Value_sep )) ){
-                       SETSTATUS(logjob) "job '%s' transfer to %s@%s failed\n  %s",
-@@ -508,9 +508,9 @@
-                               status = Link_copy( RemoteHost_DYN, sock, 0, transfer_timeout,
-                                               openname, fd, size );
-                       }
--                      if( fd == 0 ){
-+/*                    if( fd == 0 ){
-                               shutdown(*sock,1);
--                      }
-+                      }*/
-                       if( status 
-                               || ( fd !=0 && (status = Link_send( RemoteHost_DYN,sock,
-                                       transfer_timeout,"",1,&ack )) ) ){
 --- LPRng-3.7.4/src/common/sendauth.c.shutdown Sun Feb 25 21:55:50 2001
 +++ LPRng-3.7.4/src/common/sendauth.c  Sun Feb 25 21:56:40 2001
 @@ -157,7 +157,7 @@
        if( (tempfd = Checkwrite(pgpfile,&statb,O_WRONLY|O_TRUNC,1,0)) < 0){
                SNPRINTF(error,errlen)
                        "Pgp_send: open '%s' for write failed - %s", pgpfile, Errormsg(errno));
---- LPRng-3.7.4/src/common/lpstat.c.shutdown   Sun Feb 25 21:57:03 2001
-+++ LPRng-3.7.4/src/common/lpstat.c    Sun Feb 25 21:57:19 2001
-@@ -243,7 +243,7 @@
+--- LPRng-3.8.0/src/common/lpstat.c~   Tue Oct 23 15:17:35 2001
++++ LPRng-3.8.0/src/common/lpstat.c    Tue Oct 23 15:23:46 2001
+@@ -243,7 +243,6 @@
        fd = Send_request( 'Q', Displayformat,
                0, Connect_timeout_DYN, Send_query_rw_timeout_DYN, 1 );
        if( fd >= 0 ){
--              shutdown( fd, 1 );
-+/*            shutdown( fd, 1 );*/
+-              /* shutdown( fd, 1 ); */
                Read_status_info( RemoteHost_DYN, fd,
                        1, Send_query_rw_timeout_DYN, display_format,
                        Status_line_count );
                        /* we wait for eof on status_fd */
                        buffer[0] = 0;
                        Get_status_from_OF(&prjob,"LP",pid,
---- LPRng-3.7.4/src/common/lpq.c.shutdown      Sun Feb 25 22:00:21 2001
-+++ LPRng-3.7.4/src/common/lpq.c       Sun Feb 25 22:00:35 2001
-@@ -231,7 +231,7 @@
+--- LPRng-3.8.0/src/common/lpq.c~      Tue Oct 23 15:17:35 2001
++++ LPRng-3.8.0/src/common/lpq.c       Tue Oct 23 15:24:52 2001
+@@ -239,7 +239,6 @@
                &argv[Optind], Connect_timeout_DYN,
                Send_query_rw_timeout_DYN, 1 );
        if( fd >= 0 ){
--              shutdown( fd, 1 );
-+/*            shutdown( fd, 1 );*/
+-              /* shutdown( fd, 1 ); */
                if( Read_status_info( RemoteHost_DYN, fd,
                        1, Send_query_rw_timeout_DYN, Displayformat,
                        Status_line_count ) ){
---- LPRng-3.7.4/src/common/linelist.c.shutdown Sun Feb 25 22:00:55 2001
-+++ LPRng-3.7.4/src/common/linelist.c  Sun Feb 25 22:01:53 2001
-@@ -3612,7 +3612,7 @@
+--- LPRng-3.8.0/src/common/linelist.c~ Tue Oct 23 15:17:36 2001
++++ LPRng-3.8.0/src/common/linelist.c  Tue Oct 23 15:21:04 2001
+@@ -3642,7 +3642,7 @@
        if( fd < 0 || fstat( fd, &statb ) == -1 ){
                fd = -1;
--      } else if( !(S_ISSOCK(statb.st_mode)) || shutdown( fd, 1 ) == -1 ){
-+      } else if( !(S_ISSOCK(statb.st_mode))/* || shutdown( fd, 1 ) == -1*/ ){
+       } else if( Backwards_compatible_DYN || !Half_close_DYN
+-              || !(S_ISSOCK(statb.st_mode)) || shutdown( fd, 1 ) == -1 ){
++              || !S_ISSOCK(statb.st_mode)){
                close(fd);
                fd = -1;
        }
                return JFAIL;
        } else {
                SETSTATUS(job)"krb4 authentication succeeded to %s@%s",
---- LPRng-3.7.4/src/common/lpd_status.c.shutdown       Sun Feb 25 22:03:47 2001
-+++ LPRng-3.7.4/src/common/lpd_status.c        Sun Feb 25 22:04:13 2001
-@@ -1169,7 +1169,7 @@
+--- LPRng-3.8.0/src/common/lpd_status.c~       Tue Oct 23 15:17:36 2001
++++ LPRng-3.8.0/src/common/lpd_status.c        Tue Oct 23 15:22:46 2001
+@@ -1216,7 +1216,6 @@
                                        Send_query_rw_timeout_DYN, *sock );
                                if( fd >= 0 ){
                                        char *tempfile;
--                                      shutdown( fd, 1 );
-+/*                                    shutdown( fd, 1 );*/
+-                                      /* shutdown( fd, 1 ); */
                                        tempfd = Make_temp_fd( &tempfile );
                                        while( (nx = read(fd,msg,sizeof(msg))) > 0 ){
                                                if( Write_fd_len(tempfd,msg,nx) < 0 ) cleanup(0);
-@@ -1341,7 +1341,7 @@
+@@ -1387,7 +1386,6 @@
                fd = Send_request( 'Q', displayformat, tokens->list, Connect_timeout_DYN,
                        Send_query_rw_timeout_DYN, *sock );
                if( fd >= 0 ){
--                      shutdown( fd, 1 );
-+/*                    shutdown( fd, 1 );*/
+-                      /* shutdown( fd, 1 ); */
                        tempfd = Make_temp_fd( 0 );
                        while( (n = read(fd,msg,sizeof(msg))) > 0 ){
                                if( Write_fd_len(tempfd,msg,n) < 0 ) cleanup(0);
  
        DEBUG1("md5_send: sent file" );
  
---- LPRng-3.7.4/src/common/accounting.c.shutdown       Sun Feb 25 22:05:57 2001
-+++ LPRng-3.7.4/src/common/accounting.c        Sun Feb 25 22:06:21 2001
-@@ -78,7 +78,7 @@
-                       err = JABORT;
-                       LOGERR(LOG_INFO)"Do_accounting: write to %s failed", command);
-               }
--              shutdown(tempfd,1);
-+/*            shutdown(tempfd,1);*/
-       } else {
-               tempfd = Checkwrite( Accounting_file_DYN, &statb, 0, Create_files_DYN, 0 );
-               DEBUG2("Setup_accounting: fd %d", tempfd );
+--- LPRng-3.8.0/src/common/accounting.c~       Tue Oct 23 15:17:36 2001
++++ LPRng-3.8.0/src/common/accounting.c        Tue Oct 23 15:18:45 2001
+@@ -143,7 +143,6 @@
+                               Errorcode= JFAIL;
+                               LOGERR_DIE(LOG_INFO)"Do_accounting: write to '%s' failed", command);
+                       }
+-                      shutdown(tempfd,1);
+               } else {
+                       tempfd = Checkwrite( Accounting_file_DYN, &statb, 0, Create_files_DYN, 0 );
+                       DEBUG2("Setup_accounting: fd %d", tempfd );
This page took 0.084037 seconds and 4 git commands to generate.