Diff for /embedaddon/sudo/mkpkg between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2012/10/09 09:29:52 version 1.1.1.4, 2013/07/22 10:46:11
Line 1 Line 1
 #!/bin/sh  #!/bin/sh
 #  #
   # Copyright (c) 2010-2013 Todd C. Miller <Todd.Miller@courtesan.com>
   #
   # Permission to use, copy, modify, and distribute this software for any
   # purpose with or without fee is hereby granted, provided that the above
   # copyright notice and this permission notice appear in all copies.
   #
   # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
   # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
   # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
   # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
   # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
   # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
   # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   #
 # Build a binary package using polypkg  # Build a binary package using polypkg
 # Usage: mkpkg [--debug] [--flavor flavor] [--platform platform] [--osversion ver]  # Usage: mkpkg [--debug] [--flavor flavor] [--platform platform] [--osversion ver]
 #  #
Line 129  case "$osversion" in Line 143  case "$osversion" in
                 --with-tty-tickets                  --with-tty-tickets
                 --with-ldap                  --with-ldap
                 --with-passprompt=[sudo] password for %p:                   --with-passprompt=[sudo] password for %p: 
                   --with-sendmail=/usr/sbin/sendmail
                 $configure_opts"                  $configure_opts"
         ;;          ;;
     sles*)      sles*)
Line 147  case "$osversion" in Line 162  case "$osversion" in
         # Note, must indent with tabs, not spaces due to IFS trickery          # Note, must indent with tabs, not spaces due to IFS trickery
         # XXX - SuSE uses secure path but only for env_reset          # XXX - SuSE uses secure path but only for env_reset
         configure_opts="--prefix=/usr          configure_opts="--prefix=/usr
                --libexecdir=/usr/$libexec/sudo                --libexecdir=/usr/$libexec
                 --with-logging=syslog                  --with-logging=syslog
                 --with-logfac=auth                  --with-logfac=auth
                 --with-all-insults                  --with-all-insults
Line 160  case "$osversion" in Line 175  case "$osversion" in
                 --with-ldap                  --with-ldap
                 --with-env-editor                  --with-env-editor
                 --with-passprompt=%p\'s password:                   --with-passprompt=%p\'s password: 
                   --with-sendmail=/usr/sbin/sendmail
                 $configure_opts"                  $configure_opts"
   
         make_opts='docdir=$(datarootdir)/doc/packages/$(PACKAGE_TARNAME)'          make_opts='docdir=$(datarootdir)/doc/packages/$(PACKAGE_TARNAME)'
Line 197  case "$osversion" in Line 213  case "$osversion" in
                 --disable-setresuid                  --disable-setresuid
                 --with-sendmail=/usr/sbin/sendmail                  --with-sendmail=/usr/sbin/sendmail
                 --mandir=/usr/share/man                  --mandir=/usr/share/man
                --libexecdir=/usr/lib/sudo                --libexecdir=/usr/lib
                 --with-secure-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin                  --with-secure-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin
                 $configure_opts"                  $configure_opts"
         ;;          ;;
Line 240  case "$osversion" in Line 256  case "$osversion" in
                 --with-env-editor                  --with-env-editor
                 --enable-zlib=builtin                  --enable-zlib=builtin
                 --disable-nls                  --disable-nls
                   --with-sendmail=/usr/sbin/sendmail
                 $configure_opts"                  $configure_opts"
         PPVARS="${PPVARS}${PPVARS+$space}aix_freeware=true"          PPVARS="${PPVARS}${PPVARS+$space}aix_freeware=true"
         ;;          ;;

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>