===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -c -r1.7 -r1.7.2.1
*** src/usr.bin/sudo/Attic/Makefile.in	2000/11/21 17:58:43	1.7
--- src/usr.bin/sudo/Attic/Makefile.in	2002/01/18 17:20:22	1.7.2.1
***************
*** 1,5 ****
  #
! # Copyright (c) 1996, 1998-2000 Todd C. Miller <Todd.Miller@courtesan.com>
  # All rights reserved.
  #
  # Redistribution and use in source and binary forms, with or without
--- 1,5 ----
  #
! # Copyright (c) 1996, 1998-2002 Todd C. Miller <Todd.Miller@courtesan.com>
  # All rights reserved.
  #
  # Redistribution and use in source and binary forms, with or without
***************
*** 34,40 ****
  #
  # @configure_input@
  #
! # $Sudo: Makefile.in,v 1.200 2000/03/27 02:57:52 millert Exp $
  #
  
  #### Start of system configuration section. ####
--- 34,40 ----
  #
  # @configure_input@
  #
! # $Sudo: Makefile.in,v 1.223 2002/01/16 23:37:33 millert Exp $
  #
  
  #### Start of system configuration section. ####
***************
*** 49,55 ****
  YACC = @YACC@
  NROFF = nroff
  
! # Which install program?
  INSTALL = $(SHELL) $(srcdir)/install-sh -c
  
  # Libraries
--- 49,55 ----
  YACC = @YACC@
  NROFF = nroff
  
! # Our install program supports extra flags...
  INSTALL = $(SHELL) $(srcdir)/install-sh -c
  
  # Libraries
***************
*** 109,152 ****
  
  PROGS = @PROGS@
  
! SRCS = alloc.c alloca.c check.c defaults.c fileops.c find_path.c fnmatch.c \
!        getcwd.c getspwuid.c goodpath.c interfaces.c lex.yy.c lsearch.c \
!        logging.c parse.c parse.lex parse.yacc putenv.c snprintf.c strcasecmp.c \
!        strerror.c sudo.c sudo.tab.c sudo_setenv.c testsudoers.c tgetpass.c \
!        utime.c visudo.c $(AUTH_SRCS)
  
  AUTH_SRCS = auth/afs.c auth/aix_auth.c auth/bsdauth.c auth/dce.c auth/fwtk.c \
  	    auth/kerb4.c auth/kerb5.c auth/pam.c auth/passwd.c auth/rfc1938.c \
  	    auth/secureware.c auth/securid.c auth/sia.c auth/sudo_auth.c
  
! HDRS = compat.h defaults.h ins_2001.h ins_classic.h ins_csops.h ins_goons.h \
!        insults.h interfaces.h logging.h parse.h sudo.h sudo.tab.h version.h \
!        auth/sudo_auth.h emul/fnmatch.h emul/search.h emul/utime.h
  
  AUTH_OBJS = sudo_auth.o @AUTH_OBJS@
  
  PARSEOBJS = sudo.tab.o lex.yy.o alloc.o defaults.o
  
! SUDOBJS = check.o getspwuid.o goodpath.o fileops.o find_path.o interfaces.o \
! 	  logging.o parse.o sudo.o sudo_setenv.o tgetpass.o \
  	  $(AUTH_OBJS) $(PARSEOBJS)
  
! VISUDOBJS = visudo.o fileops.o $(PARSEOBJS)
  
  TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS)
  
  LIBOBJS = @LIBOBJS@ @ALLOCA@
  
! VERSION = 1.6.3
  
! DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES FAQ HISTORY INSTALL INSTALL.configure \
  	    LICENSE Makefile.in PORTING README RUNSON TODO TROUBLESHOOTING \
! 	    UPGRADE acsite.m4 aixcrypt.exp config.guess config.h.in config.sub \
! 	    configure configure.in fnmatch.3 indent.pro install-sh \
! 	    mkinstalldirs pathnames.h.in sample.pam sample.syslog.conf \
! 	    sample.sudoers sudo.cat sudo.man.in sudo.pod sudoers sudoers.cat \
! 	    sudoers.man.in sudoers.pod visudo.cat visudo.man.in visudo.pod \
! 	    auth/API
  
  BINFILES= BUGS CHANGES HISTORY LICENSE README TODO TROUBLESHOOTING \
  	  UPGRADE install-sh mkinstalldirs sample.syslog.conf sample.sudoers \
--- 109,153 ----
  
  PROGS = @PROGS@
  
! SRCS = alloc.c alloca.c check.c def_data.c defaults.c env.c fileops.c \
!        find_path.c fnmatch.c getcwd.c getspwuid.c goodpath.c \
!        interfaces.c lex.yy.c lsearch.c logging.c parse.c parse.lex \
!        parse.yacc set_perms.c sigaction.c snprintf.c strcasecmp.c strerror.c \
!        sudo.c sudo.tab.c testsudoers.c tgetpass.c utime.c visudo.c \
!        $(AUTH_SRCS)
  
  AUTH_SRCS = auth/afs.c auth/aix_auth.c auth/bsdauth.c auth/dce.c auth/fwtk.c \
  	    auth/kerb4.c auth/kerb5.c auth/pam.c auth/passwd.c auth/rfc1938.c \
  	    auth/secureware.c auth/securid.c auth/sia.c auth/sudo_auth.c
  
! HDRS = compat.h def_data.h defaults.h ins_2001.h ins_classic.h ins_csops.h \
!        ins_goons.h insults.h interfaces.h logging.h parse.h sudo.h sudo.tab.h \
!        version.h auth/sudo_auth.h emul/fnmatch.h emul/search.h emul/utime.h
  
  AUTH_OBJS = sudo_auth.o @AUTH_OBJS@
  
  PARSEOBJS = sudo.tab.o lex.yy.o alloc.o defaults.o
  
! SUDOBJS = check.o env.o getspwuid.o goodpath.o fileops.o find_path.o \
! 	  interfaces.o logging.o parse.o set_perms.o sudo.o tgetpass.o \
  	  $(AUTH_OBJS) $(PARSEOBJS)
  
! VISUDOBJS = visudo.o fileops.o goodpath.o find_path.o $(PARSEOBJS)
  
  TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS)
  
  LIBOBJS = @LIBOBJS@ @ALLOCA@
  
! VERSION = 1.6.5
  
! DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
  	    LICENSE Makefile.in PORTING README RUNSON TODO TROUBLESHOOTING \
! 	    UPGRADE aclocal.m4 aixcrypt.exp config.guess config.h.in \
!             config.sub configure configure.in def_data.in fnmatch.3 indent.pro \
! 	    install-sh mkdefaults mkinstalldirs pathnames.h.in sample.pam \
! 	    sample.syslog.conf sample.sudoers sudo.cat sudo.man.in sudo.pod \
! 	    sudoers sudoers.cat sudoers.man.in sudoers.pod visudo.cat \
! 	    visudo.man.in visudo.pod auth/API
  
  BINFILES= BUGS CHANGES HISTORY LICENSE README TODO TROUBLESHOOTING \
  	  UPGRADE install-sh mkinstalldirs sample.syslog.conf sample.sudoers \
***************
*** 156,162 ****
  BINSPECIAL= INSTALL.binary Makefile.binary
  
  SUDODEP = $(srcdir)/sudo.h $(srcdir)/compat.h $(srcdir)/defaults.h \
! 	  $(srcdir)/logging.h config.h pathnames.h
  
  AUTHDEP = $(SUDODEP) $(authdir)/sudo_auth.h
  
--- 157,163 ----
  BINSPECIAL= INSTALL.binary Makefile.binary
  
  SUDODEP = $(srcdir)/sudo.h $(srcdir)/compat.h $(srcdir)/defaults.h \
! 	  $(srcdir)/logging.h config.h def_data.h pathnames.h
  
  AUTHDEP = $(SUDODEP) $(authdir)/sudo_auth.h
  
***************
*** 196,210 ****
  @DEV@	rm -f lex.yy.c
  @DEV@	$(LEX) $(srcdir)/parse.lex
  
  # Dependencies (not counting auth functions)
  alloc.o: alloc.c $(SUDODEP)
  check.o: check.c $(SUDODEP)
  fileops.o: fileops.c $(SUDODEP)
  find_path.o: find_path.c $(SUDODEP)
  getspwuid.o: getspwuid.c $(SUDODEP)
  goodpath.o: goodpath.c $(SUDODEP)
  logging.o: logging.c $(SUDODEP)
! sudo_setenv.o: sudo_setenv.c $(SUDODEP)
  tgetpass.o: tgetpass.c $(SUDODEP)
  visudo.o: visudo.c $(SUDODEP) version.h
  sudo.o: sudo.c $(SUDODEP) interfaces.h version.h
--- 197,216 ----
  @DEV@	rm -f lex.yy.c
  @DEV@	$(LEX) $(srcdir)/parse.lex
  
+ # Uncomment the following if you intend to modify def_data.in
+ @DEV@def_data.h def_data.c: def_data.in
+ @DEV@	perl $(srcdir)/mkdefaults -o def_data $(srcdir)/def_data.in
+ 
  # Dependencies (not counting auth functions)
  alloc.o: alloc.c $(SUDODEP)
  check.o: check.c $(SUDODEP)
+ env.o: env.c $(SUDODEP)
  fileops.o: fileops.c $(SUDODEP)
  find_path.o: find_path.c $(SUDODEP)
  getspwuid.o: getspwuid.c $(SUDODEP)
  goodpath.o: goodpath.c $(SUDODEP)
  logging.o: logging.c $(SUDODEP)
! set_perms.o: set_perms.c $(SUDODEP)
  tgetpass.o: tgetpass.c $(SUDODEP)
  visudo.o: visudo.c $(SUDODEP) version.h
  sudo.o: sudo.c $(SUDODEP) interfaces.h version.h
***************
*** 212,223 ****
  testsudoers.o: testsudoers.c $(SUDODEP) parse.h interfaces.h
  parse.o: parse.c $(SUDODEP) parse.h interfaces.h
  lex.yy.o: lex.yy.c $(SUDODEP) parse.h sudo.tab.h
! sudo.tab.o: sudo.tab.c $(SUDODEP) parse.h
! defaults.o: defaults.c $(SUDODEP) auth/sudo_auth.h
  fnmatch.o: fnmatch.c config.h compat.h emul/fnmatch.h
  getcwd.o: getcwd.c config.h compat.h
  lsearch.o: lsearch.c config.h compat.h emul/search.h
- putenv.o: putenv.c config.h compat.h
  snprintf.o: snprintf.c config.h compat.h
  strcasecmp.o: strcasecmp.c config.h
  strerror.o: strerror.c config.h
--- 218,228 ----
  testsudoers.o: testsudoers.c $(SUDODEP) parse.h interfaces.h
  parse.o: parse.c $(SUDODEP) parse.h interfaces.h
  lex.yy.o: lex.yy.c $(SUDODEP) parse.h sudo.tab.h
! sudo.tab.o: sudo.tab.c $(SUDODEP) parse.h sudo.tab.c sudo.tab.h
! defaults.o: defaults.c $(SUDODEP) def_data.c auth/sudo_auth.h
  fnmatch.o: fnmatch.c config.h compat.h emul/fnmatch.h
  getcwd.o: getcwd.c config.h compat.h
  lsearch.o: lsearch.c config.h compat.h emul/search.h
  snprintf.o: snprintf.c config.h compat.h
  strcasecmp.o: strcasecmp.c config.h
  strerror.o: strerror.c config.h
***************
*** 255,261 ****
  
  sudo.man.in: $(srcdir)/sudo.pod
  	@rm -f $(srcdir)/$@
! 	(cd $(srcdir); pod2man --section=`echo @MANSECTSU@|tr A-Z a-z` --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudo.pod > $(srcdir)/$@)
  
  sudo.man: sudo.man.in
  	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
--- 260,266 ----
  
  sudo.man.in: $(srcdir)/sudo.pod
  	@rm -f $(srcdir)/$@
! 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" > $@ )
  
  sudo.man: sudo.man.in
  	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
***************
*** 264,270 ****
  
  visudo.man.in: $(srcdir)/visudo.pod
  	@rm -f $(srcdir)/$@
! 	(cd $(srcdir); pod2man --section=`echo @MANSECTSU@|tr A-Z a-z` --release=$(VERSION) --center="MAINTENANCE COMMANDS" visudo.pod > $(srcdir)/$@)
  
  visudo.man: visudo.man.in
  	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
--- 269,275 ----
  
  visudo.man.in: $(srcdir)/visudo.pod
  	@rm -f $(srcdir)/$@
! 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" visudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" > $@ )
  
  visudo.man: visudo.man.in
  	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
***************
*** 273,279 ****
  
  sudoers.man.in: $(srcdir)/sudoers.pod
  	@rm -f $(srcdir)/$@
! 	(cd $(srcdir); pod2man --section=`echo @MANSECTFORM@|tr A-Z a-z` --release=$(VERSION) --center="FILE FORMATS" sudoers.pod | sed 's/"\\f(CW""\\fR"/\\f(CW""\\fR/' > $(srcdir)/$@)
  
  sudoers.man:: sudoers.man.in
  	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
--- 278,284 ----
  
  sudoers.man.in: $(srcdir)/sudoers.pod
  	@rm -f $(srcdir)/$@
! 	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectform --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudoers.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" > $@ )
  
  sudoers.man:: sudoers.man.in
  	CONFIG_FILES=$@ CONFIG_HEADERS= sh ./config.status
***************
*** 283,309 ****
  install: install-dirs install-binaries install-sudoers install-man
  
  install-dirs:
! 	$(SHELL) $(srcdir)/mkinstalldirs $(sudodir) $(visudodir) $(sudoersdir) $(mandirsu) $(mandirform)
  
  install-binaries: $(PROGS)
! 	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 4111 -s sudo $(sudodir)/sudo
! 	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0111 -s visudo $(visudodir)/visudo
  
  install-sudoers:
! 	@if [ -f $(sudoersdir)/sudoers ]; then \
! 	    echo "Setting user/group and mode on existing $(sudoersdir)/sudoers file."; \
! 	    chown $(sudoers_uid) $(sudoersdir)/sudoers; \
! 	    chgrp $(sudoers_gid) $(sudoersdir)/sudoers; \
! 	    chmod $(sudoers_mode) $(sudoersdir)/sudoers; \
! 	else \
! 	    $(INSTALL) -o $(sudoers_uid) -g $(sudoers_gid) -m $(sudoers_mode) \
! 		$(srcdir)/sudoers $(sudoersdir)/sudoers; \
! 	fi
  
  install-man:
! 	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(mandirsu)/sudo.$(mansectsu)
! 	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(mandirsu)/visudo.$(mansectsu)
! 	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(mandirform)/sudoers.$(mansectform)
  @MAN_POSTINSTALL@
  
  check:
--- 288,310 ----
  install: install-dirs install-binaries install-sudoers install-man
  
  install-dirs:
! 	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)/$(sudodir) \
! 	    $(DESTDIR)/$(visudodir) $(DESTDIR)/$(sudoersdir) \
! 	    $(DESTDIR)/$(mandirsu) $(DESTDIR)/$(mandirform)
  
  install-binaries: $(PROGS)
! 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)/$(sudodir)/sudo
! 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)/$(visudodir)/visudo
  
  install-sudoers:
! 	test -f $(DESTDIR)/$(sudoersdir)/sudoers || \
! 	    $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
! 		$(srcdir)/sudoers $(DESTDIR)/$(sudoersdir)/sudoers
  
  install-man:
! 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)/$(mandirsu)/sudo.$(mansectsu)
! 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)/$(mandirsu)/visudo.$(mansectsu)
! 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)/$(mandirform)/sudoers.$(mansectform)
  @MAN_POSTINSTALL@
  
  check:
***************
*** 343,369 ****
  bindist:
  	@mkdir tmp.`arch -l`
  	@mkdir tmp.`arch -l`/sudo-$(VERSION)
! 	( cd tmp.`arch -l`/sudo-$(VERSION) ; \
  	  for i in $(BINFILES) ; do \
! 	    if [ -f ../../$$i ]; then \
! 	      cp ../../$$i . ; \
  	    elif [ -f $(srcdir)/$$i ]; then \
! 	      cp $(srcdir)/$$i . ; \
  	    else \
! 	      cp ../../$(srcdir)/$$i . ; \
  	    fi ; \
  	  done ; \
! 	  ln -s TROUBLESHOOTING FAQ ; \
! 	  for i in $(BINSPECIAL) ; do \
! 	    if [ -f ../../$$i ]; then \
! 	      cp ../../$$i `basename $$i .binary` ; \
! 	    elif [ -f $(srcdir)/$$i ]; then \
! 	      cp $(srcdir)/$$i `basename $$i .binary` ; \
! 	    else \
! 	      cp ../../$(srcdir)/$$i `basename $$i .binary` ; \
! 	    fi ; \
! 	  done ; \
! 	  cd .. ; tar Ocf ../sudo-$(VERSION)-`arch -l`.tar sudo-$(VERSION) ; \
  	)  
  	gzip --best sudo-$(VERSION)-`arch -l`.tar
  	rm -rf tmp.`arch -l`
--- 344,368 ----
  bindist:
  	@mkdir tmp.`arch -l`
  	@mkdir tmp.`arch -l`/sudo-$(VERSION)
! 	( \
! 	  tdir=tmp.`arch -l`/sudo-$(VERSION) ; \
  	  for i in $(BINFILES) ; do \
! 	    if [ -f $$i ]; then \
! 	      cp $$i $$tdir ; \
  	    elif [ -f $(srcdir)/$$i ]; then \
! 	      cp $(srcdir)/$$i $$tdir ; \
  	    else \
! 	      echo cannot find $$i ; \
! 	      exit 1 ; \
  	    fi ; \
  	  done ; \
! 	  cp $(srcdir)/INSTALL.binary $$tdir/INSTALL ; \
! 	  sed -e 's/@_MANTYPE@/$(mantype)/g' -e 's/@_mansectsu@/$(mansectsu)/g' \
! 	      -e 's/@_mansectform@/$(mansectform)/g' $(srcdir)/Makefile.binary \
! 	      > $$tdir/Makefile ; \
  	)  
+ 	strip sudo
+ 	strip visudo
+ 	( cd tmp.`arch -l` && tar Ocf ../sudo-$(VERSION)-`arch -l`.tar sudo-$(VERSION) )
  	gzip --best sudo-$(VERSION)-`arch -l`.tar
  	rm -rf tmp.`arch -l`