[pkgsrc/trunk]: pkgsrc/security/sudo Fix build under GNU/kFreeBSD.

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/971cdc80c461
branches:  trunk
changeset: 622119:971cdc80c461
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Jul 26 10:48:22 2013 +0000

description:
Fix build under GNU/kFreeBSD.

* host_os in configure script is something wrong
  (gnukfreebsd, not kfreebsd*-gnu).

diffstat:

 security/sudo/distinfo         |   6 +++---
 security/sudo/patches/patch-af |  21 +++++++++++++++------
 security/sudo/patches/patch-ag |  25 +++++++++++++++++--------
 3 files changed, 35 insertions(+), 17 deletions(-)

diffs (146 lines):

diff -r 59e909da4432 -r 971cdc80c461 security/sudo/distinfo
--- a/security/sudo/distinfo    Fri Jul 26 10:35:44 2013 +0000
+++ b/security/sudo/distinfo    Fri Jul 26 10:48:22 2013 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.79 2013/03/01 14:24:57 kim Exp $
+$NetBSD: distinfo,v 1.80 2013/07/26 10:48:22 ryoon Exp $
 
 SHA1 (sudo-1.7.10p7.tar.gz) = b5beb1a470d1f03b3940aff612f5089244dd773a
 RMD160 (sudo-1.7.10p7.tar.gz) = 171e54506c30a85fa642070332db012aba4a6203
 Size (sudo-1.7.10p7.tar.gz) = 1217508 bytes
 SHA1 (patch-aa) = 0c9c173a26ea72dd06a7d3947a0b3ba6dc00cf40
-SHA1 (patch-af) = 045e6daceea982a161272af822e3554138ac7dbf
-SHA1 (patch-ag) = abd8b76259e0eae75fe4ef8c2fb63f090fe14999
+SHA1 (patch-af) = 463b1653f3015d08cd4c03b7f29d206d96aa1cc0
+SHA1 (patch-ag) = e0d9efd8afeda339d9cd186ffd6f644b15e8b213
 SHA1 (patch-logging.c) = 26608d7423b77f71f17b37cc87f4b2e75978d7cb
diff -r 59e909da4432 -r 971cdc80c461 security/sudo/patches/patch-af
--- a/security/sudo/patches/patch-af    Fri Jul 26 10:35:44 2013 +0000
+++ b/security/sudo/patches/patch-af    Fri Jul 26 10:48:22 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.29 2013/03/01 14:24:58 kim Exp $
+$NetBSD: patch-af,v 1.30 2013/07/26 10:48:22 ryoon Exp $
 
 * Add "--with-nbsdops" option, NetBSD standard options.
 * Link with util(3) in the case of DragonFly, too.
@@ -8,8 +8,8 @@
 * Remove setting sysconfdir to "/etc".
 
 --- configure.in.orig  2013-02-21 15:43:17.000000000 +0000
-+++ configure.in       2013-03-01 13:56:47.000000000 +0000
-@@ -330,6 +330,18 @@
++++ configure.in
+@@ -330,6 +330,18 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
                ;;
  esac])
  
@@ -28,7 +28,16 @@
  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)
-@@ -2015,7 +2027,7 @@
+@@ -1725,7 +1737,7 @@ case "$host" in
+               : ${mansectsu='1m'}
+               : ${mansectform='4'}
+               ;;
+-    *-*-linux*|*-*-k*bsd*-gnu)
++    *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd)
+               OSDEFS="${OSDEFS} -D_GNU_SOURCE"
+               # Some Linux versions need to link with -lshadow
+               shadow_funcs="getspnam"
+@@ -2015,7 +2027,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
@@ -37,7 +46,7 @@
            ;;
        esac
      ])
-@@ -2634,6 +2646,8 @@
+@@ -2634,6 +2646,8 @@ if test ${with_kerb5-'no'} != "no"; then
        ])
        AUTH_OBJS="$AUTH_OBJS kerb5.o"
      fi
@@ -46,7 +55,7 @@
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDO_LIBS}"
      AC_CHECK_FUNCS(krb5_verify_user krb5_init_secure_context)
-@@ -3167,7 +3181,6 @@
+@@ -3167,7 +3181,6 @@ test "$datarootdir" = '${prefix}/share' 
  test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
  test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
  test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
diff -r 59e909da4432 -r 971cdc80c461 security/sudo/patches/patch-ag
--- a/security/sudo/patches/patch-ag    Fri Jul 26 10:35:44 2013 +0000
+++ b/security/sudo/patches/patch-ag    Fri Jul 26 10:48:22 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.20 2013/03/01 14:24:58 kim Exp $
+$NetBSD: patch-ag,v 1.21 2013/07/26 10:48:22 ryoon Exp $
 
 * Add "--with-nbsdops" option, NetBSD standard options.
 * Link with util(3) in the case of DragonFly, too.
@@ -8,8 +8,8 @@
 * Remove setting sysconfdir to "/etc".
 
 --- configure.orig     2013-02-21 15:43:29.000000000 +0000
-+++ configure  2013-03-01 13:58:36.000000000 +0000
-@@ -1484,7 +1484,7 @@
++++ configure
+@@ -1484,7 +1484,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]
@@ -18,7 +18,7 @@
    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    --libdir=DIR            object code libraries [EPREFIX/lib]
-@@ -1569,6 +1569,7 @@
+@@ -1569,6 +1569,7 @@ Optional Packages:
    --with-libraries        additional libraries to link with
    --with-efence           link with -lefence for malloc() debugging
    --with-csops            add CSOps standard options
@@ -26,7 +26,7 @@
    --without-passwd        don't use passwd/shadow file for authentication
    --with-skey=DIR         enable S/Key support
    --with-opie=DIR         enable OPIE support
-@@ -3959,6 +3960,22 @@
+@@ -3959,6 +3960,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
  esac
  fi
  
@@ -49,7 +49,16 @@
  
  
  # Check whether --with-passwd was given.
-@@ -15632,7 +15649,7 @@
+@@ -14233,7 +14250,7 @@ fi
+               : ${mansectsu='1m'}
+               : ${mansectform='4'}
+               ;;
+-    *-*-linux*|*-*-k*bsd*-gnu)
++    *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd)
+               OSDEFS="${OSDEFS} -D_GNU_SOURCE"
+               # Some Linux versions need to link with -lshadow
+               shadow_funcs="getspnam"
+@@ -15632,7 +15649,7 @@ if test "x$ac_cv_header_login_cap_h" = x
  _ACEOF
   LOGINCAP_USAGE='[-c class|-] '; LCMAN=1
        case "$OS" in
@@ -58,7 +67,7 @@
            ;;
        esac
  
-@@ -18569,6 +18586,8 @@
+@@ -18569,6 +18586,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
        AUTH_OBJS="$AUTH_OBJS kerb5.o"
      fi
@@ -67,7 +76,7 @@
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDO_LIBS}"
      for ac_func in krb5_verify_user krb5_init_secure_context
-@@ -20313,7 +20332,6 @@
+@@ -20313,7 +20332,6 @@ test "$datarootdir" = '${prefix}/share' 
  test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
  test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
  test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'