 @@ -1,32 +1,32 @@
-$NetBSD: patch-aa,v 1.27 2011/06/19 15:54:55 taca Exp $
+$NetBSD: patch-aa,v 1.28 2011/09/18 14:18:25 ryoon Exp $
 * Fix libtools's link option.
 * Prevent to install sudoers files and directory.
 * Use standard instal(8) option instead of shell wrapper.
 * Don't setuid here.
---- Makefile.in.orig	2011-03-29 19:25:56.000000000 +0000
+--- Makefile.in.orig	2011-08-13 17:29:18 +0000
 +++ Makefile.in
 @@ -222,7 +222,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c
  	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
  libsudo_noexec.la: sudo_noexec.lo
 -	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
 +	$(LIBTOOL) --mode=link $(CC) -module $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
  # Uncomment the following if you want "make distclean" to clean the parser
  @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate
-@@ -541,43 +541,43 @@ pre-install:
+@@ -543,43 +543,43 @@ pre-install:
  	    ./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
  	fi
 -install: pre-install install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc
 +install: install-binaries @INSTALL_NOEXEC@ install-doc
  install-dirs:
  	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \
  	    $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \
 -	    $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
 +	    $(DESTDIR)$(docdir) \
  	    $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform)
  	$(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir)

 @@ -1,56 +1,56 @@
-$NetBSD: patch-af,v 1.27 2011/06/19 15:54:55 taca Exp $
+$NetBSD: patch-af,v 1.28 2011/09/18 14:18:25 ryoon Exp $
 * Add "--with-nbsdops" option, NetBSD standard options.
 * Link with util(3) in the case of DragonFly, too.
 * When specified "--with-kerb5" option, test existence of several functions
   even if there is krb5-config.  krb5-config dosen't give all definitions for
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
---- configure.in.orig	2011-05-16 17:38:07.000000000 +0000
+--- configure.in.orig	2011-08-17 13:51:59 +0000
 +++ configure.in
 @@ -326,6 +326,18 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
  		;;
  esac])
 +AC_ARG_WITH(nbsdops, [AS_HELP_STRING([--with-nbsdops], [add NetBSD standard options])],
 +[case $with_nbsdops in
 +    yes)	echo 'Adding NetBSD standard options'
 +		CHECKSIA=false
 +		with_ignore_dot=yes
 +		with_env_editor=yes
 +		with_tty_tickets=yes
 +		;;
 +    no)		;;
 +    *)		echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
 +		;;
 +esac])
  AC_ARG_WITH(passwd, [AS_HELP_STRING([--without-passwd], [don't use passwd/shadow file for authentication])],
  [case $with_passwd in
      yes|no)	AC_MSG_CHECKING(whether to use shadow/passwd file authentication)
-@@ -1925,7 +1937,7 @@ SUDO_MAILDIR
+@@ -1968,7 +1980,7 @@ SUDO_MAILDIR
  if test ${with_logincap-'no'} != "no"; then
      AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN=1
  	case "$OS" in
 -	    freebsd|netbsd)	SUDO_LIBS="${SUDO_LIBS} -lutil"
 +	    dragonfly*|freebsd*|netbsd*)	SUDO_LIBS="${SUDO_LIBS} -lutil"
  	    ;;
  	esac
      ])
-@@ -2429,6 +2441,8 @@ if test ${with_kerb5-'no'} != "no"; then
+@@ -2476,6 +2488,8 @@ if test ${with_kerb5-'no'} != "no"; then
  	])
  	AUTH_OBJS="$AUTH_OBJS kerb5.o"
      fi
 +fi
 +if test ${with_kerb5-'no'} != "no"; then
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDO_LIBS}"
      AC_CHECK_FUNCS(krb5_verify_user krb5_init_secure_context)
-@@ -2869,7 +2883,6 @@ test "$libexecdir" = '${exec_prefix}/lib
+@@ -2932,7 +2946,6 @@ test "$libexecdir" = '${exec_prefix}/lib
  test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include'
  test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
  test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
 -test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
  dnl
  dnl Substitute into the Makefile and man pages

 @@ -1,77 +1,77 @@
-$NetBSD: patch-ag,v 1.18 2011/06/19 15:54:55 taca Exp $
+$NetBSD: patch-ag,v 1.19 2011/09/18 14:18:25 ryoon Exp $
 * Add "--with-nbsdops" option, NetBSD standard options.
 * Link with util(3) in the case of DragonFly, too.
 * When specified "--with-kerb5" option, test existence of several functions
   even if there is krb5-config.  krb5-config dosen't give all definitions for
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
---- configure.orig	2011-05-16 17:38:16.000000000 +0000
+--- configure.orig	2011-08-17 13:51:59 +0000
 +++ configure
-@@ -1596,7 +1596,7 @@ Fine tuning of the installation director
+@@ -1470,7 +1470,7 @@ Fine tuning of the installation director
    --bindir=DIR            user executables [EPREFIX/bin]
    --sbindir=DIR           system admin executables [EPREFIX/sbin]
    --libexecdir=DIR        program executables [EPREFIX/libexec]
 -  --sysconfdir=DIR        read-only single-machine data [/etc]
 +  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    --libdir=DIR            object code libraries [EPREFIX/lib]
-@@ -1676,6 +1676,7 @@ Optional Packages:
+@@ -1550,6 +1550,7 @@ Optional Packages:
    --with-libraries        additional libraries to link with
    --with-efence           link with -lefence for malloc() debugging
    --with-csops            add CSOps standard options
 +  --with-nbsdops          add NetBSD standard options
    --without-passwd        don't use passwd/shadow file for authentication
    --with-skey=DIR         enable S/Key support
    --with-opie=DIR         enable OPIE support
-@@ -4052,6 +4053,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
+@@ -3934,6 +3935,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
  esac
  fi
 +# Check whether --with-nbsdops or --without-nbsdops was given.
 +if test "${with_nbsdops+set}" = set; then
 +  withval="$with_nbsdops"
 +  case $with_nbsdops in
 +    yes)	echo 'Adding NetBSD standard options'
 +		CHECKSIA=false
 +		with_ignore_dot=yes
 +		with_env_editor=yes
 +		with_tty_tickets=yes
 +		;;
 +    no)		;;
 +    *)		echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
 +		;;
 +esac
 +fi;
++
  # Check whether --with-passwd was given.
-@@ -14469,7 +14486,7 @@ if test "x$ac_cv_header_login_cap_h" = x
+@@ -15374,7 +15391,7 @@ if test "x$ac_cv_header_login_cap_h" = x
  _ACEOF
   LOGINCAP_USAGE='[-c class|-] '; LCMAN=1
  	case "$OS" in
 -	    freebsd|netbsd)	SUDO_LIBS="${SUDO_LIBS} -lutil"
 +	    dragonfly*|freebsd*|netbsd*)	SUDO_LIBS="${SUDO_LIBS} -lutil"
  	    ;;
  	esac
-@@ -17439,6 +17456,8 @@ fi
+@@ -18438,6 +18455,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  	AUTH_OBJS="$AUTH_OBJS kerb5.o"
      fi
 +fi
 +if test ${with_kerb5-'no'} != "no"; then
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDO_LIBS}"
      for ac_func in krb5_verify_user krb5_init_secure_context
-@@ -18811,7 +18830,6 @@ test "$libexecdir" = '${exec_prefix}/lib
+@@ -19859,7 +19878,6 @@ test "$libexecdir" = '${exec_prefix}/lib
  test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include'
  test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
  test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
 -test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
  ac_config_files="$ac_config_files Makefile sudo.man visudo.man sudoers.man sudoers.ldap.man sudoreplay.man sudo_usage.h sudoers"

 @@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.73 2011/08/18 12:45:05 taca Exp $
+$NetBSD: distinfo,v 1.74 2011/09/18 14:18:24 ryoon Exp $
 SHA1 (sudo-1.7.7.tar.gz) = cb0af05f4fa43920fff538687d4bd9a66ab3b251
 RMD160 (sudo-1.7.7.tar.gz) = bd2464dba8a986e6172dd305fc6a1adba78d9779
 Size (sudo-1.7.7.tar.gz) = 1152132 bytes
-SHA1 (patch-aa) = df93a99bdcecdcee7f836d1123bcf740b054ed4e
+SHA1 (patch-aa) = 70aa1a1da2d0cd9c8c8d9cbeab747b85028511f7
-SHA1 (patch-af) = c9e09c77f520874ea165750380c3b985b31f559c
+SHA1 (patch-af) = 0dce4ebbc82ab644565f71e8f472c407ddbaabf5
-SHA1 (patch-ag) = 4c4771911b93c8760c3a8195311cf2b3456aeafd
+SHA1 (patch-ag) = fe8409164b61bdb229ca81d391de96898436ea0b
-SHA1 (patch-logging.c) = b4f10e64564e0cece07d4211d3a3ae6723057393
+SHA1 (patch-alias.c) = efe15c21ec221b839806c8b22a6b5c351ac4bf80
 SHA1 (patch-logging.c) = 26608d7423b77f71f17b37cc87f4b2e75978d7cb

 @@ -1,16 +1,16 @@
-$NetBSD: patch-logging.c,v 1.2 2011/06/19 15:54:55 taca Exp $
+$NetBSD: patch-logging.c,v 1.3 2011/09/18 14:18:25 ryoon Exp $
 Make sure CODESET is actually defined, for the sake of
 old NetBSD versions
---- logging.c.orig	2011-02-04 22:59:42.000000000 +0000
+--- logging.c.orig	2011-08-13 17:32:04 +0000
 +++ logging.c
-@@ -619,7 +619,7 @@ send_mail(fmt, va_alist)
+@@ -573,7 +573,7 @@ send_mail(fmt, va_alist)
  	    (void) fputc(*p, mail);
+     }
 -#ifdef HAVE_NL_LANGINFO
 +#if defined(HAVE_NL_LANGINFO) && defined(CODESET)
      if (strcmp(def_sudoers_locale, "C") != 0)
  	(void) fprintf(mail, "\nContent-Type: text/plain; charset=\"%s\"\nContent-Transfer-Encoding: 8bit", nl_langinfo(CODESET));
  #endif /* HAVE_NL_LANGINFO */