Date: Tue, 9 Mar 2010 23:12:19 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204935 - in user/jmallett/octeon: . bin/setfacl bin/sh contrib/ipfilter/ipsend contrib/tzdata crypto/openssh crypto/openssh/openbsd-compat etc etc/rc.d include lib/libc/posix1e lib/lib... Message-ID: <201003092312.o29NCJOo058197@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Tue Mar 9 23:12:18 2010 New Revision: 204935 URL: http://svn.freebsd.org/changeset/base/204935 Log: Merge from head. Added: user/jmallett/octeon/crypto/openssh/PROTOCOL.certkeys - copied unchanged from r204934, head/crypto/openssh/PROTOCOL.certkeys user/jmallett/octeon/crypto/openssh/PROTOCOL.mux - copied unchanged from r204934, head/crypto/openssh/PROTOCOL.mux user/jmallett/octeon/crypto/openssh/openbsd-compat/pwcache.c - copied unchanged from r204934, head/crypto/openssh/openbsd-compat/pwcache.c user/jmallett/octeon/crypto/openssh/pkcs11.h - copied unchanged from r204934, head/crypto/openssh/pkcs11.h user/jmallett/octeon/crypto/openssh/roaming_client.c - copied unchanged from r204934, head/crypto/openssh/roaming_client.c user/jmallett/octeon/crypto/openssh/roaming_serv.c - copied unchanged from r204934, head/crypto/openssh/roaming_serv.c user/jmallett/octeon/crypto/openssh/ssh-pkcs11-client.c - copied unchanged from r204934, head/crypto/openssh/ssh-pkcs11-client.c user/jmallett/octeon/crypto/openssh/ssh-pkcs11-helper.0 - copied unchanged from r204934, head/crypto/openssh/ssh-pkcs11-helper.0 user/jmallett/octeon/crypto/openssh/ssh-pkcs11-helper.8 - copied unchanged from r204934, head/crypto/openssh/ssh-pkcs11-helper.8 user/jmallett/octeon/crypto/openssh/ssh-pkcs11-helper.c - copied unchanged from r204934, head/crypto/openssh/ssh-pkcs11-helper.c user/jmallett/octeon/crypto/openssh/ssh-pkcs11.c - copied unchanged from r204934, head/crypto/openssh/ssh-pkcs11.c user/jmallett/octeon/crypto/openssh/ssh-pkcs11.h - copied unchanged from r204934, head/crypto/openssh/ssh-pkcs11.h user/jmallett/octeon/secure/libexec/ssh-pkcs11-helper/ - copied from r204934, head/secure/libexec/ssh-pkcs11-helper/ user/jmallett/octeon/tools/regression/bin/sh/builtins/command10.0 - copied unchanged from r204934, head/tools/regression/bin/sh/builtins/command10.0 user/jmallett/octeon/tools/regression/bin/sh/builtins/command8.0 - copied unchanged from r204934, head/tools/regression/bin/sh/builtins/command8.0 user/jmallett/octeon/tools/regression/bin/sh/builtins/command9.0 - copied unchanged from r204934, head/tools/regression/bin/sh/builtins/command9.0 user/jmallett/octeon/tools/regression/bin/sh/builtins/var-assign2.0 - copied unchanged from r204934, head/tools/regression/bin/sh/builtins/var-assign2.0 user/jmallett/octeon/tools/regression/bin/sh/errors/redirection-error3.0 - copied unchanged from r204934, head/tools/regression/bin/sh/errors/redirection-error3.0 user/jmallett/octeon/tools/regression/bin/sh/expansion/assign1.0 - copied unchanged from r204934, head/tools/regression/bin/sh/expansion/assign1.0 user/jmallett/octeon/tools/regression/bin/sh/expansion/plus-minus1.0 - copied unchanged from r204934, head/tools/regression/bin/sh/expansion/plus-minus1.0 user/jmallett/octeon/tools/regression/bin/sh/parser/heredoc1.0 - copied unchanged from r204934, head/tools/regression/bin/sh/parser/heredoc1.0 user/jmallett/octeon/usr.bin/procstat/procstat_sigs.c - copied unchanged from r204934, head/usr.bin/procstat/procstat_sigs.c Deleted: user/jmallett/octeon/crypto/openssh/README.smartcard user/jmallett/octeon/crypto/openssh/scard-opensc.c user/jmallett/octeon/crypto/openssh/scard.c user/jmallett/octeon/crypto/openssh/scard.h Modified: user/jmallett/octeon/Makefile.inc1 user/jmallett/octeon/bin/setfacl/file.c user/jmallett/octeon/bin/setfacl/mask.c user/jmallett/octeon/bin/setfacl/merge.c user/jmallett/octeon/bin/setfacl/remove.c user/jmallett/octeon/bin/setfacl/setfacl.1 user/jmallett/octeon/bin/setfacl/setfacl.c user/jmallett/octeon/bin/setfacl/setfacl.h user/jmallett/octeon/bin/setfacl/util.c user/jmallett/octeon/bin/sh/eval.c user/jmallett/octeon/bin/sh/exec.c user/jmallett/octeon/bin/sh/exec.h user/jmallett/octeon/bin/sh/sh.1 user/jmallett/octeon/contrib/ipfilter/ipsend/sbpf.c user/jmallett/octeon/contrib/tzdata/asia user/jmallett/octeon/contrib/tzdata/australasia user/jmallett/octeon/contrib/tzdata/southamerica user/jmallett/octeon/crypto/openssh/ChangeLog user/jmallett/octeon/crypto/openssh/INSTALL user/jmallett/octeon/crypto/openssh/PROTOCOL user/jmallett/octeon/crypto/openssh/PROTOCOL.agent user/jmallett/octeon/crypto/openssh/README user/jmallett/octeon/crypto/openssh/addrmatch.c user/jmallett/octeon/crypto/openssh/auth-krb5.c user/jmallett/octeon/crypto/openssh/auth-options.c user/jmallett/octeon/crypto/openssh/auth-options.h user/jmallett/octeon/crypto/openssh/auth-rh-rsa.c user/jmallett/octeon/crypto/openssh/auth-rhosts.c user/jmallett/octeon/crypto/openssh/auth-rsa.c user/jmallett/octeon/crypto/openssh/auth.c user/jmallett/octeon/crypto/openssh/auth.h user/jmallett/octeon/crypto/openssh/auth2-hostbased.c user/jmallett/octeon/crypto/openssh/auth2-pubkey.c user/jmallett/octeon/crypto/openssh/authfd.c user/jmallett/octeon/crypto/openssh/authfd.h user/jmallett/octeon/crypto/openssh/authfile.c user/jmallett/octeon/crypto/openssh/authfile.h user/jmallett/octeon/crypto/openssh/bufaux.c user/jmallett/octeon/crypto/openssh/buffer.c user/jmallett/octeon/crypto/openssh/buffer.h user/jmallett/octeon/crypto/openssh/canohost.c user/jmallett/octeon/crypto/openssh/channels.c user/jmallett/octeon/crypto/openssh/channels.h user/jmallett/octeon/crypto/openssh/clientloop.c user/jmallett/octeon/crypto/openssh/clientloop.h user/jmallett/octeon/crypto/openssh/config.guess user/jmallett/octeon/crypto/openssh/config.h user/jmallett/octeon/crypto/openssh/config.h.in user/jmallett/octeon/crypto/openssh/defines.h user/jmallett/octeon/crypto/openssh/dh.c user/jmallett/octeon/crypto/openssh/dns.c user/jmallett/octeon/crypto/openssh/dns.h user/jmallett/octeon/crypto/openssh/hostfile.c user/jmallett/octeon/crypto/openssh/hostfile.h user/jmallett/octeon/crypto/openssh/kex.c user/jmallett/octeon/crypto/openssh/kex.h user/jmallett/octeon/crypto/openssh/kexdhs.c user/jmallett/octeon/crypto/openssh/kexgexs.c user/jmallett/octeon/crypto/openssh/key.c user/jmallett/octeon/crypto/openssh/key.h user/jmallett/octeon/crypto/openssh/loginrec.c user/jmallett/octeon/crypto/openssh/match.h user/jmallett/octeon/crypto/openssh/misc.c user/jmallett/octeon/crypto/openssh/misc.h user/jmallett/octeon/crypto/openssh/monitor.c user/jmallett/octeon/crypto/openssh/monitor_fdpass.c user/jmallett/octeon/crypto/openssh/monitor_wrap.c user/jmallett/octeon/crypto/openssh/mux.c user/jmallett/octeon/crypto/openssh/myproposal.h user/jmallett/octeon/crypto/openssh/nchan.c user/jmallett/octeon/crypto/openssh/openbsd-compat/bsd-cygwin_util.c user/jmallett/octeon/crypto/openssh/openbsd-compat/openbsd-compat.h user/jmallett/octeon/crypto/openssh/openbsd-compat/openssl-compat.c user/jmallett/octeon/crypto/openssh/openbsd-compat/port-aix.c user/jmallett/octeon/crypto/openssh/openbsd-compat/port-aix.h user/jmallett/octeon/crypto/openssh/openbsd-compat/port-linux.c user/jmallett/octeon/crypto/openssh/openbsd-compat/port-linux.h user/jmallett/octeon/crypto/openssh/openbsd-compat/readpassphrase.c user/jmallett/octeon/crypto/openssh/pathnames.h user/jmallett/octeon/crypto/openssh/platform.c user/jmallett/octeon/crypto/openssh/platform.h user/jmallett/octeon/crypto/openssh/readconf.c user/jmallett/octeon/crypto/openssh/readconf.h user/jmallett/octeon/crypto/openssh/roaming.h user/jmallett/octeon/crypto/openssh/roaming_common.c user/jmallett/octeon/crypto/openssh/scp.1 user/jmallett/octeon/crypto/openssh/scp.c user/jmallett/octeon/crypto/openssh/servconf.c user/jmallett/octeon/crypto/openssh/servconf.h user/jmallett/octeon/crypto/openssh/session.c user/jmallett/octeon/crypto/openssh/sftp-client.c user/jmallett/octeon/crypto/openssh/sftp-client.h user/jmallett/octeon/crypto/openssh/sftp-common.c user/jmallett/octeon/crypto/openssh/sftp-common.h user/jmallett/octeon/crypto/openssh/sftp-server.8 user/jmallett/octeon/crypto/openssh/sftp-server.c user/jmallett/octeon/crypto/openssh/sftp.1 user/jmallett/octeon/crypto/openssh/sftp.c user/jmallett/octeon/crypto/openssh/ssh-add.1 user/jmallett/octeon/crypto/openssh/ssh-add.c user/jmallett/octeon/crypto/openssh/ssh-agent.1 user/jmallett/octeon/crypto/openssh/ssh-agent.c user/jmallett/octeon/crypto/openssh/ssh-dss.c user/jmallett/octeon/crypto/openssh/ssh-keygen.1 user/jmallett/octeon/crypto/openssh/ssh-keygen.c user/jmallett/octeon/crypto/openssh/ssh-keyscan.1 user/jmallett/octeon/crypto/openssh/ssh-keyscan.c user/jmallett/octeon/crypto/openssh/ssh-keysign.c user/jmallett/octeon/crypto/openssh/ssh-rand-helper.c user/jmallett/octeon/crypto/openssh/ssh-rsa.c user/jmallett/octeon/crypto/openssh/ssh.1 user/jmallett/octeon/crypto/openssh/ssh.c user/jmallett/octeon/crypto/openssh/ssh2.h user/jmallett/octeon/crypto/openssh/ssh_config user/jmallett/octeon/crypto/openssh/ssh_config.5 user/jmallett/octeon/crypto/openssh/ssh_namespace.h user/jmallett/octeon/crypto/openssh/sshconnect.c user/jmallett/octeon/crypto/openssh/sshconnect2.c user/jmallett/octeon/crypto/openssh/sshd.8 user/jmallett/octeon/crypto/openssh/sshd.c user/jmallett/octeon/crypto/openssh/sshd_config user/jmallett/octeon/crypto/openssh/sshd_config.5 user/jmallett/octeon/crypto/openssh/sshpty.h user/jmallett/octeon/crypto/openssh/sshtty.c user/jmallett/octeon/crypto/openssh/version.h user/jmallett/octeon/etc/Makefile user/jmallett/octeon/etc/rc.d/jail user/jmallett/octeon/etc/termcap.small user/jmallett/octeon/include/regexp.h user/jmallett/octeon/lib/libc/posix1e/acl_strip.c user/jmallett/octeon/lib/libcompat/Makefile user/jmallett/octeon/lib/libpam/modules/pam_ssh/pam_ssh.c user/jmallett/octeon/sbin/ipfw/Makefile user/jmallett/octeon/sbin/mount/mount.c user/jmallett/octeon/sbin/newfs/mkfs.c user/jmallett/octeon/sbin/newfs/newfs.c user/jmallett/octeon/sbin/newfs/newfs.h user/jmallett/octeon/secure/lib/libssh/Makefile user/jmallett/octeon/secure/libexec/Makefile user/jmallett/octeon/secure/usr.bin/ssh/Makefile user/jmallett/octeon/secure/usr.sbin/sshd/Makefile user/jmallett/octeon/share/man/man4/acpi.4 user/jmallett/octeon/share/man/man4/ufm.4 user/jmallett/octeon/sys/amd64/amd64/mca.c user/jmallett/octeon/sys/amd64/amd64/pmap.c user/jmallett/octeon/sys/amd64/include/md_var.h user/jmallett/octeon/sys/amd64/include/specialreg.h user/jmallett/octeon/sys/boot/arm/at91/boot2/bwct_board.c user/jmallett/octeon/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/jmallett/octeon/sys/compat/linprocfs/linprocfs.c user/jmallett/octeon/sys/conf/newvers.sh user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwsleep.c user/jmallett/octeon/sys/contrib/x86emu/x86emu.c user/jmallett/octeon/sys/dev/acpica/acpi.c user/jmallett/octeon/sys/dev/bwn/if_bwn.c user/jmallett/octeon/sys/dev/bwn/if_bwnvar.h user/jmallett/octeon/sys/dev/cxgb/common/cxgb_ael1002.c user/jmallett/octeon/sys/dev/cxgb/cxgb_main.c user/jmallett/octeon/sys/dev/hwpmc/hwpmc_logging.c user/jmallett/octeon/sys/dev/siba/siba.c user/jmallett/octeon/sys/dev/siba/siba_bwn.c user/jmallett/octeon/sys/dev/siba/siba_cc.c user/jmallett/octeon/sys/dev/siba/siba_core.c user/jmallett/octeon/sys/dev/siba/siba_pcib.c user/jmallett/octeon/sys/dev/siba/sibavar.h user/jmallett/octeon/sys/dev/sound/pci/es137x.h user/jmallett/octeon/sys/geom/vinum/geom_vinum.c user/jmallett/octeon/sys/ia64/ia64/nexus.c user/jmallett/octeon/sys/ia64/ia64/vm_machdep.c user/jmallett/octeon/sys/kern/subr_firmware.c user/jmallett/octeon/sys/mips/include/cpu.h user/jmallett/octeon/sys/mips/include/cpuregs.h user/jmallett/octeon/sys/modules/Makefile user/jmallett/octeon/sys/modules/acpi/acpi/Makefile user/jmallett/octeon/sys/net/flowtable.c user/jmallett/octeon/sys/net/if_epair.c user/jmallett/octeon/sys/net/if_lagg.c user/jmallett/octeon/sys/net/radix.c user/jmallett/octeon/sys/net/radix.h user/jmallett/octeon/sys/net/radix_mpath.c user/jmallett/octeon/sys/net/route.c user/jmallett/octeon/sys/net/route.h user/jmallett/octeon/sys/netinet/in.c user/jmallett/octeon/sys/netinet/in_pcb.h user/jmallett/octeon/sys/netinet/ip_divert.c user/jmallett/octeon/sys/netinet/ip_output.c user/jmallett/octeon/sys/netinet/ipfw/dn_heap.c user/jmallett/octeon/sys/netinet/ipfw/dn_heap.h user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw2.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_private.h user/jmallett/octeon/sys/netinet/ipfw/ip_fw_table.c user/jmallett/octeon/sys/netinet/ipfw/test/dn_test.h user/jmallett/octeon/sys/netinet/tcp_input.c user/jmallett/octeon/sys/netinet/tcp_reass.c user/jmallett/octeon/sys/netinet/tcp_subr.c user/jmallett/octeon/sys/netinet/tcp_timer.c user/jmallett/octeon/sys/netinet/tcp_timewait.c user/jmallett/octeon/sys/netinet/tcp_usrreq.c user/jmallett/octeon/sys/netinet/tcp_var.h user/jmallett/octeon/sys/netinet/udp_usrreq.c user/jmallett/octeon/sys/powerpc/aim/interrupt.c user/jmallett/octeon/sys/powerpc/booke/interrupt.c user/jmallett/octeon/sys/sys/pmc.h user/jmallett/octeon/sys/sys/timeb.h user/jmallett/octeon/usr.bin/comm/comm.c user/jmallett/octeon/usr.bin/ncal/ncal.1 user/jmallett/octeon/usr.bin/ncal/ncal.c user/jmallett/octeon/usr.bin/procstat/Makefile user/jmallett/octeon/usr.bin/procstat/procstat.1 user/jmallett/octeon/usr.bin/procstat/procstat.c user/jmallett/octeon/usr.bin/procstat/procstat.h user/jmallett/octeon/usr.bin/uniq/uniq.c user/jmallett/octeon/usr.bin/xlint/lint1/scan.l user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_callgraph.c user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_calltree.c user/jmallett/octeon/usr.sbin/pmcstat/pmcstat.c user/jmallett/octeon/usr.sbin/pmcstat/pmcstat_log.c Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/contrib/tzdata/ (props changed) user/jmallett/octeon/crypto/openssh/ (props changed) user/jmallett/octeon/sys/contrib/x86emu/ (props changed) Modified: user/jmallett/octeon/Makefile.inc1 ============================================================================== --- user/jmallett/octeon/Makefile.inc1 Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/Makefile.inc1 Tue Mar 9 23:12:18 2010 (r204935) @@ -1259,7 +1259,7 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @for file in ${OLD_FILES}; do \ + @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}"; \ @@ -1279,7 +1279,7 @@ delete-old-files: check-old-files: @echo ">>> Checking for old files" - @for file in ${OLD_FILES}; do \ + @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ Modified: user/jmallett/octeon/bin/setfacl/file.c ============================================================================== --- user/jmallett/octeon/bin/setfacl/file.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/file.c Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include <sys/cdefs.h> Modified: user/jmallett/octeon/bin/setfacl/mask.c ============================================================================== --- user/jmallett/octeon/bin/setfacl/mask.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/mask.c Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include <sys/cdefs.h> Modified: user/jmallett/octeon/bin/setfacl/merge.c ============================================================================== --- user/jmallett/octeon/bin/setfacl/merge.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/merge.c Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include <sys/cdefs.h> Modified: user/jmallett/octeon/bin/setfacl/remove.c ============================================================================== --- user/jmallett/octeon/bin/setfacl/remove.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/remove.c Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include <sys/cdefs.h> Modified: user/jmallett/octeon/bin/setfacl/setfacl.1 ============================================================================== --- user/jmallett/octeon/bin/setfacl/setfacl.1 Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/setfacl.1 Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE -.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" .\" $FreeBSD$ .\" Modified: user/jmallett/octeon/bin/setfacl/setfacl.c ============================================================================== --- user/jmallett/octeon/bin/setfacl/setfacl.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/setfacl.c Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include <sys/cdefs.h> Modified: user/jmallett/octeon/bin/setfacl/setfacl.h ============================================================================== --- user/jmallett/octeon/bin/setfacl/setfacl.h Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/setfacl.h Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * $FreeBSD$ */ Modified: user/jmallett/octeon/bin/setfacl/util.c ============================================================================== --- user/jmallett/octeon/bin/setfacl/util.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/setfacl/util.c Tue Mar 9 23:12:18 2010 (r204935) @@ -14,14 +14,14 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include <sys/cdefs.h> Modified: user/jmallett/octeon/bin/sh/eval.c ============================================================================== --- user/jmallett/octeon/bin/sh/eval.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/sh/eval.c Tue Mar 9 23:12:18 2010 (r204935) @@ -597,6 +597,7 @@ evalcommand(union node *cmd, int flags, char *lastarg; int realstatus; int do_clearcmdentry; + char *path = pathval(); /* First expand the arguments. */ TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags)); @@ -682,7 +683,7 @@ evalcommand(union node *cmd, int flags, cmdentry.special = 1; } else { static const char PATH[] = "PATH="; - char *path = pathval(); + int cmd_flags = 0, bltinonly = 0; /* * Modify the command lookup path, if a PATH= assignment @@ -713,24 +714,68 @@ evalcommand(union node *cmd, int flags, do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 0, path); - /* implement the bltin builtin here */ - if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { - for (;;) { - argv++; - if (--argc == 0) - break; - if ((cmdentry.u.index = find_builtin(*argv, - &cmdentry.special)) < 0) { + for (;;) { + if (bltinonly) { + cmdentry.u.index = find_builtin(*argv, &cmdentry.special); + if (cmdentry.u.index < 0) { cmdentry.u.index = BLTINCMD; argv--; argc++; break; } - if (cmdentry.u.index != BLTINCMD) + } else + find_command(argv[0], &cmdentry, cmd_flags, path); + /* implement the bltin and command builtins here */ + if (cmdentry.cmdtype != CMDBUILTIN) + break; + if (cmdentry.u.index == BLTINCMD) { + if (argc == 1) break; - } + argv++; + argc--; + bltinonly = 1; + } else if (cmdentry.u.index == COMMANDCMD) { + if (argc == 1) + break; + if (!strcmp(argv[1], "-p")) { + if (argc == 2) + break; + if (argv[2][0] == '-') { + if (strcmp(argv[2], "--")) + break; + if (argc == 3) + break; + argv += 3; + argc -= 3; + } else { + argv += 2; + argc -= 2; + } + path = _PATH_STDPATH; + clearcmdentry(0); + do_clearcmdentry = 1; + } else if (!strcmp(argv[1], "--")) { + if (argc == 2) + break; + argv += 2; + argc -= 2; + } else if (argv[1][0] == '-') + break; + else { + argv++; + argc--; + } + cmd_flags |= DO_NOFUNC; + bltinonly = 0; + } else + break; } + /* + * Special builtins lose their special properties when + * called via 'command'. + */ + if (cmd_flags & DO_NOFUNC) + cmdentry.special = 0; } /* Fork off a child process if necessary. */ @@ -741,9 +786,7 @@ evalcommand(union node *cmd, int flags, && (cmdentry.cmdtype != CMDBUILTIN || cmdentry.u.index == CDCMD || cmdentry.u.index == DOTCMD - || cmdentry.u.index == EVALCMD)) - || (cmdentry.cmdtype == CMDBUILTIN && - cmdentry.u.index == COMMANDCMD)) { + || cmdentry.u.index == EVALCMD))) { jp = makejob(cmd, 1); mode = cmd->ncmd.backgnd; if (flags & EV_BACKCMD) { @@ -770,7 +813,6 @@ evalcommand(union node *cmd, int flags, #ifdef DEBUG trputs("Shell function: "); trargs(argv); #endif - redirect(cmd->ncmd.redirect, REDIR_PUSH); saveparam = shellparam; shellparam.malloc = 0; shellparam.reset = 1; @@ -788,6 +830,8 @@ evalcommand(union node *cmd, int flags, else { freeparam(&shellparam); shellparam = saveparam; + if (exception == EXERROR || exception == EXEXEC) + popredir(); } unreffunc(cmdentry.u.func); poplocalvars(); @@ -798,6 +842,7 @@ evalcommand(union node *cmd, int flags, } handler = &jmploc; funcnest++; + redirect(cmd->ncmd.redirect, REDIR_PUSH); INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); @@ -871,6 +916,9 @@ cmddone: backcmd->nleft = memout.nextc - memout.buf; memout.buf = NULL; } + if (cmdentry.u.index != EXECCMD && + (e == -1 || e == EXERROR || e == EXEXEC)) + popredir(); if (e != -1) { if ((e != EXERROR && e != EXEXEC) || cmdentry.special) @@ -879,8 +927,6 @@ cmddone: if (flags != EV_BACKCMD) FORCEINTON; } - if (cmdentry.u.index != EXECCMD) - popredir(); } else { #ifdef DEBUG trputs("normal command: "); trargs(argv); @@ -889,7 +935,7 @@ cmddone: for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); envp = environment(); - shellexec(argv, envp, pathval(), cmdentry.u.index); + shellexec(argv, envp, path, cmdentry.u.index); /*NOTREACHED*/ } goto out; @@ -996,15 +1042,11 @@ int commandcmd(int argc, char **argv) { static char stdpath[] = _PATH_STDPATH; - struct jmploc loc, *old; - struct strlist *sp; char *path; int ch; int cmd = -1; - for (sp = cmdenviron; sp ; sp = sp->next) - setvareq(sp->text, VEXPORT|VSTACK); - path = pathval(); + path = bltinlookup("PATH", 1); optind = optreset = 1; opterr = 0; @@ -1032,22 +1074,14 @@ commandcmd(int argc, char **argv) error("wrong number of arguments"); return typecmd_impl(2, argv - 1, cmd, path); } - if (argc != 0) { - old = handler; - handler = &loc; - if (setjmp(handler->loc) == 0) - shellexec(argv, environment(), path, 0); - handler = old; - if (exception == EXEXEC) - exit(exerrno); - exraise(exception); - } + if (argc != 0) + error("commandcmd() called while it should not be"); /* * Do nothing successfully if no command was specified; * ksh also does this. */ - exit(0); + return 0; } Modified: user/jmallett/octeon/bin/sh/exec.c ============================================================================== --- user/jmallett/octeon/bin/sh/exec.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/sh/exec.c Tue Mar 9 23:12:18 2010 (r204935) @@ -248,7 +248,7 @@ hashcmd(int argc __unused, char **argv _ && (cmdp->cmdtype == CMDNORMAL || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) delete_cmd_entry(); - find_command(name, &entry, 1, pathval()); + find_command(name, &entry, DO_ERR, pathval()); if (verbose) { if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ cmdp = cmdlookup(name, 0); @@ -310,10 +310,10 @@ printentry(struct tblentry *cmdp, int ve */ void -find_command(const char *name, struct cmdentry *entry, int printerr, +find_command(const char *name, struct cmdentry *entry, int act, const char *path) { - struct tblentry *cmdp; + struct tblentry *cmdp, loc_cmd; int idx; int prev; char *fullname; @@ -330,13 +330,19 @@ find_command(const char *name, struct cm } /* If name is in the table, and not invalidated by cd, we're done */ - if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) - goto success; + if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) { + if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC) + cmdp = NULL; + else + goto success; + } /* If %builtin not in path, check for builtin next */ if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -365,6 +371,8 @@ loop: goto loop; INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -414,6 +422,8 @@ loop: TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname)); INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDNORMAL; cmdp->param.index = idx; INTON; @@ -421,9 +431,9 @@ loop: } /* We failed. If there was an entry for this command, delete it */ - if (cmdp) + if (cmdp && cmdp->cmdtype != CMDFUNCTION) delete_cmd_entry(); - if (printerr) { + if (act & DO_ERR) { if (e == ENOENT || e == ENOTDIR) outfmt(out2, "%s: not found\n", name); else Modified: user/jmallett/octeon/bin/sh/exec.h ============================================================================== --- user/jmallett/octeon/bin/sh/exec.h Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/sh/exec.h Tue Mar 9 23:12:18 2010 (r204935) @@ -57,6 +57,10 @@ struct cmdentry { }; +/* action to find_command() */ +#define DO_ERR 0x01 /* prints errors */ +#define DO_NOFUNC 0x02 /* don't return shell functions, for command */ + extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ Modified: user/jmallett/octeon/bin/sh/sh.1 ============================================================================== --- user/jmallett/octeon/bin/sh/sh.1 Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/bin/sh/sh.1 Tue Mar 9 23:12:18 2010 (r204935) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd December 31, 2009 +.Dd March 6, 2010 .Dt SH 1 .Os .Sh NAME @@ -1571,10 +1571,12 @@ built-in command. .It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... .It Ic command Oo Fl v | V Oc Op Ar utility The first form of invocation executes the specified +.Ar utility , +ignoring shell functions in the search. +If .Ar utility -as a simple command (see the -.Sx Simple Commands -section). +is a special builtin, +it is executed as if it were a regular builtin. .Pp If the .Fl p Modified: user/jmallett/octeon/contrib/ipfilter/ipsend/sbpf.c ============================================================================== --- user/jmallett/octeon/contrib/ipfilter/ipsend/sbpf.c Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/contrib/ipfilter/ipsend/sbpf.c Tue Mar 9 23:12:18 2010 (r204935) @@ -9,7 +9,6 @@ #include <sys/types.h> #include <sys/mbuf.h> #include <sys/time.h> -#include <sys/timeb.h> #include <sys/socket.h> #include <sys/file.h> #include <sys/ioctl.h> Modified: user/jmallett/octeon/contrib/tzdata/asia ============================================================================== --- user/jmallett/octeon/contrib/tzdata/asia Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/contrib/tzdata/asia Tue Mar 9 23:12:18 2010 (r204935) @@ -1,4 +1,4 @@ -# @(#)asia 8.51 +# @(#)asia 8.55 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -225,11 +225,31 @@ Zone Asia/Bahrain 3:22:20 - LMT 1920 # # until further notice." I take that last sentence as the # establishment of a rule. +# From Nobutomo Nakano (2010-02-19): +# We received a report from Bangladesh saying that the start/end of +# Bangladesh DST is incorrect. Currently we have only the Bengali version +# of the official mail from BTRC which describes the following: +# +# "From 2010 each year when local standard time is about to reach +# March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM) +# and when local daylight time is about to October 31 at 11:59:00 PM +# clocks are turned backward 1 hour (10:59:00 PM)." +# +# So, DST will start/end 1 minute earlier. + +# From Arthur David Olson (2010-03-03): +# The file +# <a href=http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf> +# http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf +# </a> +# is in Bengali; it does contain two "31"s as well as two "11.59"s and a "10.59" +# which is consistent with the information provided by Nobutomo Nakano. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Dhaka 2009 only - Jun 19 23:00 1:00 S -Rule Dhaka 2010 only - Jan 1 0:00 0 - -Rule Dhaka 2010 max - Mar 31 23:00 1:00 S -Rule Dhaka 2010 max - Nov 1 0:00 0 - +Rule Dhaka 2009 only - Dec 31 23:59 0 - +Rule Dhaka 2010 max - Mar 31 22:59 1:00 S +Rule Dhaka 2010 max - Oct 31 23:59 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Dhaka 6:01:40 - LMT 1890 Modified: user/jmallett/octeon/contrib/tzdata/australasia ============================================================================== --- user/jmallett/octeon/contrib/tzdata/australasia Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/contrib/tzdata/australasia Tue Mar 9 23:12:18 2010 (r204935) @@ -1,5 +1,5 @@ # <pre> -# @(#)australasia 8.15 +# @(#)australasia 8.16 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -267,11 +267,30 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # <a href="http://www.fiji.gov.fj/publish/page_16198.shtml"> # http://www.fiji.gov.fj/publish/page_16198.shtml # </a> + +# From Steffen Thorsen (2010-03-03): +# The Cabinet in Fiji has decided to end DST about a month early, on +# 2010-03-28 at 03:00. +# The plan is to observe DST again, from 2010-10-24 to sometime in March +# 2011 (last Sunday a good guess?). +# +# Official source: +# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166"> +# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166 +# </a> +# +# A bit more background info here: +# <a href="http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html"> +# http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html +# </a> + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S -Rule Fiji 2010 only - Apr 25 3:00 0 - +Rule Fiji 2010 only - Mar lastSun 3:00 0 - +Rule Fiji 2010 only - Oct 24 2:00 1:00 S +Rule Fiji 2011 only - Mar lastSun 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time @@ -449,70 +468,30 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Samoa -# From Alexander Krivenyshev (2008-12-06): -# The Samoa government (Western Samoa) may implement DST on the first Sunday of -# October 2009 (October 4, 2009) until the last Sunday of March 2010 (March 28, -# 2010). -# -# "Selected Committee reports to Cabinet on Daylight Saving Time", -# Government of Samoa: -# <a href="http://www.govt.ws/pr_article.cfm?pr_id=560"> -# http://www.govt.ws/pr_article.cfm?pr_id=560 -# </a> -# or -# <a href="http://www.worldtimezone.com/dst_news/dst_news_samoa01.html"> -# http://www.worldtimezone.com/dst_news/dst_news_samoa01.html -# </a> - -# From Steffen Thorsen (2009-08-27): -# Samoa's parliament passed the Daylight Saving Bill 2009, and will start -# daylight saving time on the first Sunday of October 2009 and end on the -# last Sunday of March 2010. We hope that the full text will be published -# soon, but we believe that the bill is only valid for 2009-2010. Samoa's -# Daylight Saving Act 2009 will be enforced as soon as the Head of State -# executes a proclamation publicizing this Act. +# From Steffen Thorsen (2009-10-16): +# We have been in contact with the government of Samoa again, and received +# the following info: +# +# "Cabinet has now approved Daylight Saving to be effected next year +# commencing from the last Sunday of September 2010 and conclude first +# Sunday of April 2011." # -# Some background information here, which will be updated once we have -# more details: +# Background info: # <a href="http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html"> # http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html # </a> - -# From Alexander Krivenyshev (2009-10-03): -# First, my deepest condolences to people of Samoa islands and all families and -# loved ones around the world who lost their lives in the earthquake and tsunami. -# -# Considering the recent devastation on Samoa by earthquake and tsunami and that -# many government offices/ ministers are closed- not sure if "Daylight Saving -# Bill 2009" will be implemented in next few days- on October 4, 2009. -# -# Here is reply from Consulate-General of Samoa in New Zealand -# --------------------------- -# Consul General -# consulgeneral@samoaconsulate.org.nz -# -# Talofa Alexander, -# -# Thank you for your sympathy for our country but at this time we have not -# been informed about the Daylight Savings Time Change. Most Ministries in -# Apia are closed or relocating due to weather concerns. -# -# When we do find out if they are still proceeding with the time change we -# will advise you soonest. -# -# Kind Regards, -# Lana -# for: Consul General - -# From Steffen Thorsen (2009-10-05): -# We have called a hotel in Samoa and asked about local time there - they -# are still on standard time. +# +# Samoa's Daylight Saving Time Act 2009 is available here, but does not +# contain any dates: +# <a href="http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf"> +# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf +# </a> Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time - -11:00 - WST 2009 Oct 4 - -11:00 1:00 WSDT 2010 Mar 28 + -11:00 - WST 2010 Oct 24 + -11:00 1:00 WSDT 2011 Apr 3 -11:00 - WST # Solomon Is Modified: user/jmallett/octeon/contrib/tzdata/southamerica ============================================================================== --- user/jmallett/octeon/contrib/tzdata/southamerica Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/contrib/tzdata/southamerica Tue Mar 9 23:12:18 2010 (r204935) @@ -1,5 +1,5 @@ # <pre> -# @(#)southamerica 8.41 +# @(#)southamerica 8.43 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1121,6 +1121,18 @@ Zone America/Rio_Branco -4:31:12 - LMT 1 # http://www.shoa.cl/noticias/2008/04hora/hora.htm # </a>. +# From Angel Chiang (2010-03-04): +# Subject: DST in Chile exceptionally extended to 3 April due to earthquake +# <a href="http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098"> +# http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098 +# </a> +# (in Spanish, last paragraph). +# +# This is breaking news. There should be more information available later. + +# From Arthur Daivd Olson (2010-03-06): +# Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Chile 1927 1932 - Sep 1 0:00 1:00 S Rule Chile 1928 1932 - Apr 1 0:00 0 - @@ -1155,7 +1167,9 @@ Rule Chile 2000 2007 - Mar Sun>=9 3:00u # N.B.: the end of March 29 in Chile is March 30 in Universal time, # which is used below in specifying the transition. Rule Chile 2008 only - Mar 30 3:00u 0 - -Rule Chile 2009 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - +Rule Chile 2010 only - Apr 4 3:00u 0 - +Rule Chile 2011 max - Mar Sun>=9 3:00u 0 - # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1380,7 +1394,7 @@ Rule Para 2005 2009 - Mar Sun>=8 0:00 0 # and that on the first Sunday of the month of October, it is to be set # forward 60 minutes, in all the territory of the Paraguayan Republic. # ... -Rule Para 2010 max - Oct Sun<=7 0:00 1:00 S +Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S Rule Para 2010 max - Apr Sun>=8 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Modified: user/jmallett/octeon/crypto/openssh/ChangeLog ============================================================================== --- user/jmallett/octeon/crypto/openssh/ChangeLog Tue Mar 9 22:42:24 2010 (r204934) +++ user/jmallett/octeon/crypto/openssh/ChangeLog Tue Mar 9 23:12:18 2010 (r204935) @@ -1,3 +1,982 @@ +20100307 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/03/07 22:16:01 + [ssh-keygen.c] + make internal strptime string match strftime format; + suggested by vinschen AT redhat.com and markus@ + - djm@cvs.openbsd.org 2010/03/08 00:28:55 + [ssh-keygen.1] + document permit-agent-forwarding certificate constraint; patch from + stevesk@ + - djm@cvs.openbsd.org 2010/03/07 22:01:32 + [version.h] + openssh-5.4 + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + crank version numbers + - (djm) Release OpenSSH-5.4p1 + +20100307 + - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that + it gets the passwd struct from the LAM that knows about the user which is + not necessarily the default. Patch from Alexandre Letourneau. + - (dtucker) [session.c] Bug #1567: move setpcred call to before chroot and + do not set real uid, since that's needed for the chroot, and will be set + by permanently_set_uid. + - (dtucker) [session.c] Also initialize creds to NULL for handing to + setpcred. + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2010/03/07 11:57:13 + [auth-rhosts.c monitor.c monitor_wrap.c session.c auth-options.c sshd.c] + Hold authentication debug messages until after successful authentication. + Fixes an info leak of environment variables specified in authorized_keys, + reported by Jacob Appelbaum. ok djm@ + +20100305 + - OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/03/04 12:51:25 + [ssh.1 sshd_config.5] + tweak previous; + - djm@cvs.openbsd.org 2010/03/04 20:35:08 + [ssh-keygen.1 ssh-keygen.c] + Add a -L flag to print the contents of a certificate; ok markus@ + - jmc@cvs.openbsd.org 2010/03/04 22:52:40 + [ssh-keygen.1] + fix Bk/Ek; + - djm@cvs.openbsd.org 2010/03/04 23:17:25 + [sshd_config.5] + missing word; spotted by jmc@ + - djm@cvs.openbsd.org 2010/03/04 23:19:29 + [ssh.1 sshd.8] + move section on CA and revoked keys from ssh.1 to sshd.8's known hosts + format section and rework it a bit; requested by jmc@ + - djm@cvs.openbsd.org 2010/03/04 23:27:25 + [auth-options.c ssh-keygen.c] + "force-command" is not spelled "forced-command"; spotted by + imorgan AT nas.nasa.gov + - djm@cvs.openbsd.org 2010/03/05 02:58:11 + [auth.c] + make the warning for a revoked key louder and more noticable + - jmc@cvs.openbsd.org 2010/03/05 06:50:35 + [ssh.1 sshd.8] + tweak previous; + - jmc@cvs.openbsd.org 2010/03/05 08:31:20 + [ssh.1] + document certificate authentication; help/ok djm + - djm@cvs.openbsd.org 2010/03/05 10:28:21 + [ssh-add.1 ssh.1 ssh_config.5] + mention loading of certificate files from [private]-cert.pub when + they are present; feedback and ok jmc@ + - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older + compilers. OK djm@ + - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure + on some platforms + - (djm) [configure.ac] set -fno-strict-aliasing for gcc4; ok dtucker@ + +20100304 + - (djm) [ssh-keygen.c] Use correct local variable, instead of + maybe-undefined global "optarg" + - (djm) [contrib/redhat/openssh.spec] Replace obsolete BuildPreReq + on XFree86-devel with neutral /usr/include/X11/Xlib.h; + imorgan AT nas.nasa.gov in bz#1731 + - (djm) [.cvsignore] Ignore ssh-pkcs11-helper + - (djm) [regress/Makefile] Cleanup sshd_proxy_orig + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/03/03 01:44:36 + [auth-options.c key.c] + reject strings with embedded ASCII nul chars in certificate key IDs, + principal names and constraints + - djm@cvs.openbsd.org 2010/03/03 22:49:50 + [sshd.8] + the authorized_keys option for CA keys is "cert-authority", not + "from=cert-authority". spotted by imorgan AT nas.nasa.gov + - djm@cvs.openbsd.org 2010/03/03 22:50:40 + [PROTOCOL.certkeys] + s/similar same/similar/; from imorgan AT nas.nasa.gov + - djm@cvs.openbsd.org 2010/03/04 01:44:57 + [key.c] + use buffer_get_string_ptr_ret() where we are checking the return + value explicitly instead of the fatal()-causing buffer_get_string_ptr() + - djm@cvs.openbsd.org 2010/03/04 10:36:03 + [auth-rh-rsa.c auth-rsa.c auth.c auth.h auth2-hostbased.c auth2-pubkey.c] + [authfile.c authfile.h hostfile.c hostfile.h servconf.c servconf.h] + [ssh-keygen.c ssh.1 sshconnect.c sshd_config.5] + Add a TrustedUserCAKeys option to sshd_config to specify CA keys that + are trusted to authenticate users (in addition than doing it per-user + in authorized_keys). + + Add a RevokedKeys option to sshd_config and a @revoked marker to + known_hosts to allow keys to me revoked and banned for user or host + authentication. + + feedback and ok markus@ + - djm@cvs.openbsd.org 2010/03/03 00:47:23 + [regress/cert-hostkey.sh regress/cert-userkey.sh] + add an extra test to ensure that authentication with the wrong + certificate fails as it should (and it does) + - djm@cvs.openbsd.org 2010/03/04 10:38:23 + [regress/cert-hostkey.sh regress/cert-userkey.sh] + additional regression tests for revoked keys and TrustedUserCAKeys + +20100303 + - (djm) [PROTOCOL.certkeys] Add RCS Ident + - OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/02/26 22:09:28 + [ssh-keygen.1 ssh.1 sshd.8] + tweak previous; + - otto@cvs.openbsd.org 2010/03/01 11:07:06 + [ssh-add.c] + zap what seems to be a left-over debug message; ok markus@ + - djm@cvs.openbsd.org 2010/03/02 23:20:57 + [ssh-keygen.c] + POSIX strptime is stricter than OpenBSD's so do a little dance to + appease it. + - (djm) [regress/cert-userkey.sh] s/echo -n/echon/ here too + +20100302 + - (tim) [config.guess config.sub] Bug 1722: Update to latest versions from + http://git.savannah.gnu.org/gitweb/ (2009-12-30 and 2010-01-22 + respectively). + +20100301 + - (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace + "echo -n" with "echon" for portability. + - (dtucker) [openbsd-compat/port-linux.c] Make failure to write to the OOM + adjust log at verbose only, since according to cjwatson in bug #1470 + some virtualization platforms don't allow writes. + +20100228 + - (djm) [auth.c] On Cygwin, refuse usernames that have differences in + case from that matched in the system password database. On this + platform, passwords are stored case-insensitively, but sshd requires + exact case matching for Match blocks in sshd_config(5). Based on + a patch from vinschen AT redhat.com. + - (tim) [ssh-pkcs11-helper.c] Move declarations before calling functions + to make older compilers (gcc 2.95) happy. + +20100227 + - (djm) [ssh-pkcs11-helper.c ] Ensure RNG is initialised and seeded + - (djm) [openbsd-compat/bsd-cygwin_util.c] Reduce the set of environment + variables copied into sshd child processes. From vinschen AT redhat.com + +20100226 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/02/26 20:29:54 + [PROTOCOL PROTOCOL.agent PROTOCOL.certkeys addrmatch.c auth-options.c] + [auth-options.h auth.h auth2-pubkey.c authfd.c dns.c dns.h hostfile.c] + [hostfile.h kex.h kexdhs.c kexgexs.c key.c key.h match.h monitor.c] + [myproposal.h servconf.c servconf.h ssh-add.c ssh-agent.c ssh-dss.c] + [ssh-keygen.1 ssh-keygen.c ssh-rsa.c ssh.1 ssh.c ssh2.h sshconnect.c] + [sshconnect2.c sshd.8 sshd.c sshd_config.5] + Add support for certificate key types for users and hosts. + + OpenSSH certificate key types are not X.509 certificates, but a much + simpler format that encodes a public key, identity information and + some validity constraints and signs it with a CA key. CA keys are + regular SSH keys. This certificate style avoids the attack surface + of X.509 certificates and is very easy to deploy. + + Certified host keys allow automatic acceptance of new host keys + when a CA certificate is marked as trusted in ~/.ssh/known_hosts. + see VERIFYING HOST KEYS in ssh(1) for details. + + Certified user keys allow authentication of users when the signing + CA key is marked as trusted in authorized_keys. See "AUTHORIZED_KEYS + FILE FORMAT" in sshd(8) for details. + + Certificates are minted using ssh-keygen(1), documentation is in + the "CERTIFICATES" section of that manpage. + + Documentation on the format of certificates is in the file + PROTOCOL.certkeys + + feedback and ok markus@ + - djm@cvs.openbsd.org 2010/02/26 20:33:21 + [Makefile regress/cert-hostkey.sh regress/cert-userkey.sh] + regression tests for certified keys + +20100224 + - (djm) [pkcs11.h ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] + [ssh-pkcs11.h] Add $OpenBSD$ RCS idents so we can sync portable + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/02/11 20:37:47 + [pathnames.h] + correct comment + - dtucker@cvs.openbsd.org 2009/11/09 04:20:04 + [regress/Makefile] + add regression test for ssh-keygen pubkey conversions + - dtucker@cvs.openbsd.org 2010/01/11 02:53:44 + [regress/forwarding.sh] + regress test for stdio forwarding + - djm@cvs.openbsd.org 2010/02/09 04:57:36 + [regress/addrmatch.sh] + clean up droppings + - djm@cvs.openbsd.org 2010/02/09 06:29:02 + [regress/Makefile] + turn on all the malloc(3) checking options when running regression + tests. this has caught a few bugs for me in the past; ok dtucker@ + - djm@cvs.openbsd.org 2010/02/24 06:21:56 + [regress/test-exec.sh] + wait for sshd to fully stop in cleanup() function; avoids races in tests + that do multiple start_sshd/cleanup cycles; "I hate pidfiles" deraadt@ + - markus@cvs.openbsd.org 2010/02/08 10:52:47 + [regress/agent-pkcs11.sh] + test for PKCS#11 support (currently disabled) + - (djm) [Makefile.in ssh-pkcs11-helper.8] Add manpage for PKCS#11 helper + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Add PKCS#11 helper binary and manpage *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003092312.o29NCJOo058197>