Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
security/sudo/Makefile
View File

@@ -1,46 +1,55 @@
# $NetBSD: Makefile,v 1.146 2015/07/11 15:12:27 sevan Exp $
#
# $NetBSD: Makefile,v 1.152 2016/09/12 17:12:24 taca Exp $
DISTNAME= sudo-1.7.10p9
#PKGREVISION= 0
CATEGORIES= security
MASTER_SITES= http://www.sudo.ws/dist/ \
ftp://ftp.sudo.ws/pub/sudo/ \
ftp://ftp.uwsg.indiana.edu/pub/security/sudo/ \
ftp://ftp.twaren.net/Unix/Security/Sudo/ \
http://ftp.tux.org/pub/security/sudo/
DISTNAME= sudo-1.8.17p1
CATEGORIES= security
MASTER_SITES= http://www.sudo.ws/dist/ \
ftp://ftp.sudo.ws/pub/sudo/ \
ftp://ftp.uwsg.indiana.edu/pub/security/sudo/ \
ftp://ftp.twaren.net/Unix/Security/Sudo/ \
http://ftp.tux.org/pub/security/sudo/
MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.sudo.ws/
COMMENT= Allow others to run commands as root
LICENSE= isc AND modified-bsd
MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.sudo.ws/
COMMENT= Allow others to run commands as root
LICENSE= isc AND modified-bsd
USE_LIBTOOL= yes
OWN_DIRS+= ${VARBASE}/run
GNU_CONFIGURE= yes
BUILD_DEFS+= VARBASE
PLIST_VARS+= ldap noexec
.include "../../mk/bsd.prefs.mk"
CONFIGURE_ARGS+= --disable-path-info
CONFIGURE_ARGS+= --disable-root-mailer
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-exampledir=${PREFIX}/${EGDIR}
CONFIGURE_ARGS+= --with-ignore-dot
CONFIGURE_ARGS+= --with-nbsdops
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib # for a bunch of shared libs
CONFIGURE_ARGS+= --with-rundir=${VARBASE}/run/sudo
CONFIGURE_ARGS+= --with-logpath=${VARBASE}/log/sudo.log
# to always install man instead of cat
CONFIGURE_ENV+= NROFFPROG=${CAT:Q}
CONFIGURE_ENV+= mansectsu=8
CONFIGURE_ENV+= mansectform=5
CONFIGURE_ARGS+= --disable-root-mailer --with-ignore-dot
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-timedir=${VARBASE}/run/sudo
CONFIGURE_ARGS+= --with-logpath=${VARBASE}/log/sudo.log
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --with-noexec=no
CONFIGURE_ENV+= ax_cv_check_cflags___static_libgcc=no
.else
PLIST.noexec= yes
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-[7-9].*-*)
CFLAGS+= -D_OPENBSD_SOURCE=1
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*)
CFLAGS+= -D_INCOMPLETE_XOPEN_C063=1
.endif
.include "options.mk"
CONFIGURE_ARGS+= --with-nbsdops --disable-path-info
OWN_DIRS+= ${VARBASE}/run
BUILD_DEFS+= VARBASE
PLIST_VARS+= ldap nls noexec
DOCDIR= share/doc/${PKGBASE}
EGDIR= share/examples/${PKGBASE}
@@ -54,8 +63,8 @@ INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
NOT_FOR_UNPRIVILEGED= yes
post-install:
${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DESTDIR}${PREFIX}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/sudoers ${DESTDIR}${PREFIX}/${EGDIR}/sudoers
${INSTALL_DATA} ${WRKSRC}/doc/UPGRADE ${DESTDIR}${PREFIX}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/plugins/sudoers/sudoers ${DESTDIR}${PREFIX}/${EGDIR}/sudoers
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
.include "../../devel/zlib/buildlink3.mk"

71
security/sudo/PLIST
View File

@@ -1,15 +1,23 @@
@comment $NetBSD: PLIST,v 1.7 2014/07/28 20:07:42 jperkin Exp $
@comment $NetBSD: PLIST,v 1.9 2016/01/09 11:22:12 adam Exp $
bin/sudo
bin/sudoedit
bin/sudoreplay
${PLIST.noexec}libexec/sudo_noexec.so
include/sudo_plugin.h
lib/sudo/group_file.la
lib/sudo/libsudo_util.la
${PLIST.noexec}lib/sudo/sudo_noexec.la
lib/sudo/sudoers.la
lib/sudo/system_group.la
man/man5/sudo.conf.5
man/man5/sudoers.5
${PLIST.ldap}man/man5/sudoers.ldap.5
man/man8/sudo.8
man/man8/sudo_plugin.8
man/man8/sudoedit.8
man/man8/sudoreplay.8
man/man8/visudo.8
sbin/visudo
share/doc/sudo/CONTRIBUTORS
share/doc/sudo/ChangeLog
share/doc/sudo/HISTORY
share/doc/sudo/LICENSE
@@ -18,11 +26,64 @@ share/doc/sudo/README
${PLIST.ldap}share/doc/sudo/README.LDAP
share/doc/sudo/TROUBLESHOOTING
share/doc/sudo/UPGRADE
share/doc/sudo/sample.pam
share/doc/sudo/sample.sudoers
share/doc/sudo/sample.syslog.conf
${PLIST.ldap}share/doc/sudo/schema.ActiveDirectory
${PLIST.ldap}share/doc/sudo/schema.OpenLDAP
${PLIST.ldap}share/doc/sudo/schema.iPlanet
${PLIST.ldap}share/doc/sudo/sudoers2ldif
share/examples/sudo/pam.conf
share/examples/sudo/sudo.conf
share/examples/sudo/sudoers
share/examples/sudo/syslog.conf
${PLIST.nls}share/locale/ca/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/ca/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/cs/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/cs/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/da/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/da/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/de/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/de/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/el/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/eo/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/eo/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/es/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/eu/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/eu/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/fi/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/fi/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/fr/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/fr/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/gl/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/hr/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/hr/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/hu/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/it/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/it/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/ja/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/ja/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/lt/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/nb/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/nb/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/nl/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/nl/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/pl/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/pl/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/ru/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/ru/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/sk/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/sk/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/sl/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/sl/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/sr/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/sr/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/sv/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/sv/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/tr/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/tr/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/uk/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/uk/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/vi/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/vi/LC_MESSAGES/sudoers.mo
${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudo.mo
${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudoers.mo

20
security/sudo/distinfo
View File

@@ -1,9 +1,13 @@
$NetBSD: distinfo,v 1.82 2015/02/11 09:11:59 spz Exp $
$NetBSD: distinfo,v 1.88 2016/09/16 11:50:37 jperkin Exp $
SHA1 (sudo-1.7.10p9.tar.gz) = fc2cad927063f5d6249387e96c6bf0082c13e37e
RMD160 (sudo-1.7.10p9.tar.gz) = 5ca8479deae0a360934d130d97bc8daf77845366
Size (sudo-1.7.10p9.tar.gz) = 1224867 bytes
SHA1 (patch-aa) = 0c9c173a26ea72dd06a7d3947a0b3ba6dc00cf40
SHA1 (patch-af) = 3462525bd0863ec5f957173a10839aed2b7cbb69
SHA1 (patch-ag) = 86f9838045f2bed7eb8e4271553c510be31b7d6b
SHA1 (patch-logging.c) = a16a9c6020a79cc378c3cfd1c6a1abd2326c8e6d
SHA1 (sudo-1.8.17p1.tar.gz) = e9bb729513cd15e99def42019c35917bc9a73536
RMD160 (sudo-1.8.17p1.tar.gz) = c3af867a6047c21614c4550534fa2566d6540913
SHA512 (sudo-1.8.17p1.tar.gz) = e9facd2d5578d4effb516931322b5f4f9578baa779cba281d36a3d0995b1fd9d085d6b141544b3dc698569fa294163bbad9f779166a05a0f18f4ad81a630b954
Size (sudo-1.8.17p1.tar.gz) = 2786618 bytes
SHA1 (patch-aa) = 63c89e6d4e530ab92b7452f4025fbbf2a45dad65
SHA1 (patch-af) = 19c7cb41432404050c2452c3c53f2e4f588b3ab1
SHA1 (patch-ag) = cb03a0a7daf4b5ef203f23726ad3a335b712a718
SHA1 (patch-plugins_sudoers_Makefile.in) = d8612ac7bf2f5a892d9720c4df91810ca807f4ed
SHA1 (patch-plugins_sudoers_logging.c) = a42e54af2b6057804aecb3b6a48c565e8ac4df82
SHA1 (patch-src_Makefile.in) = 43f7266d3d106fca69003ee040342c3b201fd262
SHA1 (patch-src_sudo__edit.c) = ef411520ccefbd36bb4adf3329e6144e54647372

17
security/sudo/options.mk
View File

@@ -1,8 +1,7 @@
# $NetBSD: options.mk,v 1.18 2015/07/11 15:12:27 sevan Exp $
#
# $NetBSD: options.mk,v 1.20 2016/02/26 09:41:07 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sudo
PKG_SUPPORTED_OPTIONS= ldap
PKG_SUPPORTED_OPTIONS= ldap nls
PKG_OPTIONS_OPTIONAL_GROUPS= auth
PKG_OPTIONS_GROUP.auth= kerberos pam skey
@@ -10,12 +9,18 @@ PKG_OPTIONS_GROUP.auth= kerberos pam skey
PKG_SUGGESTED_OPTIONS= skey
.endif
.if ${OPSYS} == "Darwin"
PKG_SUGGESTED_OPTIONS= pam
.endif
PKG_SUGGESTED_OPTIONS.Darwin= pam
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mnls)
. include "../../devel/gettext-lib/buildlink3.mk"
CONFIGURE_ARGS+= --enable-nls
PLIST.nls= yes
.else
CONFIGURE_ARGS+= --disable-nls
.endif
.if !empty(PKG_OPTIONS:Mpam)
. include "../../mk/pam.buildlink3.mk"
DL_AUTO_VARS= yes

92
security/sudo/patches/patch-aa
View File

@@ -1,79 +1,25 @@
$NetBSD: patch-aa,v 1.30 2013/03/01 14:24:58 kim Exp $
$NetBSD: patch-aa,v 1.32 2016/01/09 11:22:12 adam 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 2013-01-15 19:59:25.000000000 +0000
+++ Makefile.in 2013-03-01 13:46:11.000000000 +0000
@@ -250,7 +250,7 @@
$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
--- Makefile.in.orig 2015-10-31 23:35:07.000000000 +0000
+++ Makefile.in
@@ -63,7 +63,8 @@ SHELL = @SHELL@
SED = @SED@
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)
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
-INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
+#INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
+INSTALL_OWNER =
GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate.c
ECHO_N = @ECHO_N@
ECHO_C = @ECHO_C@
@@ -129,7 +130,7 @@ install-doc: config.status ChangeLog
exit $$?; \
done
@@ -686,43 +686,43 @@
./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)$(sudoersdir) \
$(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \
`echo $(DESTDIR)$(timedir)|sed 's,/[^/]*$$,,'`
- $(INSTALL) -d -O $(install_uid) -G $(install_gid) -m 0700 $(DESTDIR)$(timedir)
+ $(INSTALL) -d -m 0700 $(DESTDIR)$(timedir)
install-binaries: install-dirs $(PROGS)
if [ X"$$SUDO_PREINSTALL_CMD" != X"" ]; then exec $$SUDO_PREINSTALL_CMD sudo; fi
- $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04755 sudo $(DESTDIR)$(sudodir)/sudo
+ $(INSTALL) sudo $(DESTDIR)$(sudodir)/sudo
rm -f $(DESTDIR)$(sudodir)/sudoedit
ln -s sudo $(DESTDIR)$(sudodir)/sudoedit
- if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
- $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 visudo $(DESTDIR)$(visudodir)/visudo
- if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 sesh $(DESTDIR)$(libexecdir)/sesh; fi
+ if [ -f sudoreplay ]; then $(INSTALL) sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
+ $(INSTALL) visudo $(DESTDIR)$(visudodir)/visudo
+ if [ -f sesh ]; then $(INSTALL) sesh $(DESTDIR)$(libexecdir)/sesh; fi
install-noexec: install-dirs libsudo_noexec.la
- if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m $(shlib_mode) .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi
+ if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -m $(shlib_mode) .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi
install-sudoers: install-dirs
- $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \
+ $(INSTALL) -d -m 0750 \
$(DESTDIR)$(sudoersdir)/sudoers.d
test -f $(DESTDIR)$(sudoersdir)/sudoers || \
- $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \
+ $(INSTALL) -m $(sudoers_mode) \
sudoers $(DESTDIR)$(sudoersdir)/sudoers
install-doc: install-dirs ChangeLog
- (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$f $(DESTDIR)$(docdir); done)
- @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$f $(DESTDIR)$(docdir); done)
- $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
- @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
- $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
- $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
- @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
+ (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -m 0644 $$f $(DESTDIR)$(docdir); done)
+ @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -m 0644 $$f $(DESTDIR)$(docdir); done)
+ $(INSTALL) -m 0644 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
+ @REPLAY@$(INSTALL) -m 0644 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
+ $(INSTALL) -m 0644 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
+ $(INSTALL) -m 0644 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
+ @LDAP@$(INSTALL) -m 0644 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
@if test -n "$(MANCOMPRESS)"; then \
for f in $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/sudoreplay.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform) $(mandirform)/sudoers.ldap.$(mansectform); do \
if test -f $(DESTDIR)$$f; then \
-install: config.status ChangeLog pre-install install-nls
+install: config.status ChangeLog install-nls
for d in $(SUBDIRS); do \
(cd $$d && exec $(MAKE) "INSTALL_OWNER=$(INSTALL_OWNER)" $@) && continue; \
exit $$?; \

65
security/sudo/patches/patch-af
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.31 2014/03/08 11:51:56 kim Exp $
$NetBSD: patch-af,v 1.33 2016/09/12 17:12:24 taca Exp $
* Add "--with-nbsdops" option, NetBSD standard options.
* Link with util(3) in the case of DragonFly, too.
@@ -7,59 +7,62 @@ $NetBSD: patch-af,v 1.31 2014/03/08 11:51:56 kim Exp $
functions (HAVE_KRB5_*).
* Remove setting sysconfdir to "/etc".
--- configure.in.orig 2014-03-05 08:08:53.000000000 -0500
+++ configure.in 2014-03-08 06:35:19.000000000 -0500
@@ -330,6 +330,18 @@
--- configure.ac.orig 2016-06-22 16:36:23.000000000 +0000
+++ configure.ac
@@ -439,6 +439,20 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
;;
esac])
+AC_ARG_WITH(nbsdops, [AS_HELP_STRING([--with-nbsdops], [add NetBSD standard options])],
++AC_ARG_WITH(nbsdops, [AS_HELP_STRING([--with-nbsdops], [add NetBSD standard opt
+ions])],
+[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"
+ ;;
+ 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)
@@ -1726,7 +1738,7 @@
@@ -1951,7 +1965,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"
@@ -2016,7 +2028,7 @@
test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
;;
@@ -2299,7 +2313,7 @@ SUDO_MAILDIR
if test ${with_logincap-'no'} != "no"; then
AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN=1
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
])
@@ -2635,6 +2647,8 @@
- freebsd|netbsd)
+ dragonfly*|freebsd|netbsd)
SUDO_LIBS="${SUDO_LIBS} -lutil"
SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
;;
@@ -3381,6 +3395,8 @@ if test ${with_kerb5-'no'} != "no"; then
])
AUTH_OBJS="$AUTH_OBJS kerb5.o"
AUTH_OBJS="$AUTH_OBJS kerb5.lo"
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)
@@ -3168,7 +3182,6 @@
LIBS="${LIBS} ${SUDOERS_LIBS}"
AC_CHECK_FUNCS([krb5_verify_user krb5_init_secure_context])
@@ -4220,7 +4236,7 @@ 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'
-test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+dnl test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
dnl
dnl Substitute into the Makefile, sudo_usage.h and example sudoers
dnl Substitute into the Makefile and man pages

51
security/sudo/patches/patch-ag
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
$NetBSD: patch-ag,v 1.24 2016/09/12 17:12:24 taca Exp $
* Add "--with-nbsdops" option, NetBSD standard options.
* Link with util(3) in the case of DragonFly, too.
@@ -7,9 +7,9 @@ $NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
functions (HAVE_KRB5_*).
* Remove setting sysconfdir to "/etc".
--- configure.orig 2014-03-05 08:09:14.000000000 -0500
+++ configure 2014-03-08 06:35:19.000000000 -0500
@@ -1484,7 +1484,7 @@
--- configure.orig 2016-06-22 16:36:22.000000000 +0000
+++ configure
@@ -1562,7 +1562,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,15 +18,15 @@ $NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
--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 @@
@@ -1661,6 +1661,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
@@ -3959,6 +3960,22 @@
--with-skey[=DIR] enable S/Key support
--with-opie[=DIR] enable OPIE support
@@ -4499,6 +4500,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
esac
fi
@@ -49,38 +49,39 @@ $NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
# Check whether --with-passwd was given.
@@ -14244,7 +14261,7 @@
@@ -15209,7 +15226,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"
@@ -15643,7 +15660,7 @@
test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
;;
@@ -17228,7 +17245,7 @@ if test "x$ac_cv_header_login_cap_h" = x
_ACEOF
LOGINCAP_USAGE='[-c class|-] '; LCMAN=1
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
@@ -18580,6 +18597,8 @@
- freebsd|netbsd)
+ dragonfly*|freebsd|netbsd)
SUDO_LIBS="${SUDO_LIBS} -lutil"
SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
;;
@@ -21839,6 +21856,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
AUTH_OBJS="$AUTH_OBJS kerb5.o"
AUTH_OBJS="$AUTH_OBJS kerb5.lo"
fi
+fi
+if test ${with_kerb5-'no'} != "no"; then
_LIBS="$LIBS"
LIBS="${LIBS} ${SUDO_LIBS}"
LIBS="${LIBS} ${SUDOERS_LIBS}"
for ac_func in krb5_verify_user krb5_init_secure_context
@@ -20324,7 +20343,6 @@
@@ -24341,7 +24360,7 @@ 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'
-test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
ac_config_files="$ac_config_files Makefile sudo_usage.h sudoers"
-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+# test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
if test X"$INIT_SCRIPT" != X""; then
ac_config_files="$ac_config_files init.d/$INIT_SCRIPT"

15
security/sudo/patches/patch-plugins_sudoers_Makefile.in Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-plugins_sudoers_Makefile.in,v 1.1 2016/01/01 17:00:49 spz Exp $
* don't install the sudoers file to etc
--- plugins/sudoers/Makefile.in.orig 2015-10-31 23:35:25.000000000 +0000
+++ plugins/sudoers/Makefile.in
@@ -305,7 +305,7 @@ pre-install:
./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
fi
-install: install-plugin install-binaries install-sudoers install-doc
+install: install-plugin install-binaries install-doc
install-dirs:
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) \

8
security/sudo/patches/patch-logging.c → security/sudo/patches/patch-plugins_sudoers_logging.c
View File

@@ -1,11 +1,11 @@
$NetBSD: patch-logging.c,v 1.4 2014/03/08 11:51:56 kim Exp $
$NetBSD: patch-plugins_sudoers_logging.c,v 1.1 2016/01/01 17:00:49 spz Exp $
Make sure CODESET is actually defined, for the sake of
old NetBSD versions
--- logging.c.orig 2013-03-01 11:08:30.000000000 -0500
+++ logging.c 2014-03-08 06:35:19.000000000 -0500
@@ -691,7 +691,7 @@
--- ./plugins/sudoers/logging.c.orig 2015-10-31 23:35:25.000000000 +0000
+++ ./plugins/sudoers/logging.c
@@ -722,7 +722,7 @@ send_mail(const char *fmt, ...)
(void) fputc(*p, mail);
}

15
security/sudo/patches/patch-src_Makefile.in Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_Makefile.in,v 1.1 2016/01/01 17:00:49 spz Exp $
* install the suid sudo without write-bits
--- ./src/Makefile.in.orig 2015-10-31 23:35:25.000000000 +0000
+++ ./src/Makefile.in
@@ -173,7 +174,7 @@ install-rc: install-dirs
fi
install-binaries: install-dirs $(PROGS)
- INSTALL_BACKUP='~' $(LIBTOOL) $(LTFLAGS) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 04755 sudo $(DESTDIR)$(bindir)/sudo
+ INSTALL_BACKUP='~' $(LIBTOOL) $(LTFLAGS) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 04555 sudo $(DESTDIR)$(bindir)/sudo
rm -f $(DESTDIR)$(bindir)/sudoedit
ln -s sudo $(DESTDIR)$(bindir)/sudoedit
if [ -f sesh ]; then \

18
security/sudo/patches/patch-src_sudo__edit.c Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-src_sudo__edit.c,v 1.1 2016/09/16 11:50:38 jperkin Exp $
Don't assume O_SEARCH implies support for O_DIRECTORY.
--- src/sudo_edit.c.orig 2016-06-18 02:44:21.000000000 +0000
+++ src/sudo_edit.c
@@ -347,7 +347,11 @@ dir_is_writable(int dfd, struct user_det
* Use O_SEARCH/O_PATH and/or O_DIRECTORY where possible.
*/
#if defined(O_SEARCH)
+# if defined(O_DIRECTORY)
# define DIR_OPEN_FLAGS (O_SEARCH|O_DIRECTORY)
+# else
+# define DIR_OPEN_FLAGS (O_SEARCH)
+# endif
#elif defined(O_PATH)
# define DIR_OPEN_FLAGS (O_PATH|O_DIRECTORY)
#elif defined(O_DIRECTORY)