From 3412c8541df0c9b81059fed3089cae98b86a2073 Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Wed, 1 May 2013 14:40:22 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- doc/CHANGES-2013 | 5 +- filesystems/fs-utils/DESCR | 4 +- filesystems/fs-utils/Makefile | 76 ++-- filesystems/fs-utils/PLIST | 33 +- filesystems/fs-utils/distinfo | 13 +- filesystems/fs-utils/patches/patch-aa | 13 - filesystems/fs-utils/patches/patch-ab | 13 - .../fs-utils/patches/patch-lib_Makefile_inc | 15 - misc/rump/DESCR | 13 +- misc/rump/Makefile | 102 ++--- misc/rump/PLIST | 175 --------- misc/rump/PLIST.Linux | 11 + misc/rump/PLIST.SunOS | 5 + misc/rump/PLIST.common | 412 +++++++++++++++++++++ misc/rump/buildlink3.mk | 4 +- misc/rump/distinfo | 8 +- security/openssh/Makefile | 22 +- security/openssh/PLIST.ldap | 5 - security/openssh/distinfo | 65 ++-- security/openssh/options.mk | 24 +- security/openssh/patches/patch-Makefile.in | 24 ++ security/openssh/patches/patch-ah | 22 -- security/openssh/patches/patch-ak | 31 -- security/openssh/patches/patch-atomicio.c | 3 +- .../patches/{patch-af => patch-auth-passwd.c} | 6 +- .../patches/{patch-aj => patch-auth-rhosts.c} | 6 +- security/openssh/patches/patch-auth.c | 15 + .../openssh/patches/{patch-al => patch-auth1.c} | 10 +- .../openssh/patches/{patch-am => patch-auth2.c} | 8 +- .../patches/{patch-ag => patch-config.h.in} | 10 +- .../openssh/patches/{patch-aa => patch-configure} | 32 +- .../patches/{patch-ab => patch-configure.ac} | 28 +- .../openssh/patches/{patch-ac => patch-defines.h} | 8 +- .../openssh/patches/{patch-ae => patch-includes.h} | 8 +- .../openssh/patches/{patch-ad => patch-loginrec.c} | 18 +- ...patch-au => patch-openbsd-compat_bsd-openpty.c} | 6 +- ...ch-ai => patch-openbsd-compat_openbsd-compat.h} | 6 +- .../{patch-aw => patch-openbsd-compat_port-tun.c} | 4 +- security/openssh/patches/patch-platform.c | 4 +- security/openssh/patches/{patch-an => patch-scp.c} | 10 +- .../openssh/patches/{patch-ao => patch-session.c} | 18 +- security/openssh/patches/{patch-ap => patch-ssh.c} | 8 +- .../openssh/patches/{patch-av => patch-sshd.c} | 26 +- .../openssh/patches/{patch-aq => patch-sshpty.c} | 6 +- .../openssh/patches/{patch-ar => patch-uidswap.c} | 14 +- 45 files changed, 725 insertions(+), 624 deletions(-) rewrite filesystems/fs-utils/Makefile (81%) rewrite filesystems/fs-utils/distinfo (99%) delete mode 100644 filesystems/fs-utils/patches/patch-aa delete mode 100644 filesystems/fs-utils/patches/patch-ab delete mode 100644 filesystems/fs-utils/patches/patch-lib_Makefile_inc rewrite misc/rump/DESCR (100%) rewrite misc/rump/Makefile (90%) delete mode 100644 misc/rump/PLIST create mode 100644 misc/rump/PLIST.Linux create mode 100644 misc/rump/PLIST.SunOS create mode 100644 misc/rump/PLIST.common delete mode 100644 security/openssh/PLIST.ldap rewrite security/openssh/distinfo (99%) create mode 100644 security/openssh/patches/patch-Makefile.in delete mode 100644 security/openssh/patches/patch-ah delete mode 100644 security/openssh/patches/patch-ak rename security/openssh/patches/{patch-af => patch-auth-passwd.c} (85%) rename security/openssh/patches/{patch-aj => patch-auth-rhosts.c} (91%) create mode 100644 security/openssh/patches/patch-auth.c rename security/openssh/patches/{patch-al => patch-auth1.c} (75%) rename security/openssh/patches/{patch-am => patch-auth2.c} (66%) rename security/openssh/patches/{patch-ag => patch-config.h.in} (75%) rename security/openssh/patches/{patch-aa => patch-configure} (74%) rename security/openssh/patches/{patch-ab => patch-configure.ac} (72%) rename security/openssh/patches/{patch-ac => patch-defines.h} (84%) rename security/openssh/patches/{patch-ae => patch-includes.h} (56%) rename security/openssh/patches/{patch-ad => patch-loginrec.c} (74%) rename security/openssh/patches/{patch-au => patch-openbsd-compat_bsd-openpty.c} (78%) rename security/openssh/patches/{patch-ai => patch-openbsd-compat_openbsd-compat.h} (71%) rename security/openssh/patches/{patch-aw => patch-openbsd-compat_port-tun.c} (85%) rename security/openssh/patches/{patch-an => patch-scp.c} (77%) rename security/openssh/patches/{patch-ao => patch-session.c} (68%) rename security/openssh/patches/{patch-ap => patch-ssh.c} (69%) rename security/openssh/patches/{patch-av => patch-sshd.c} (78%) rename security/openssh/patches/{patch-aq => patch-sshpty.c} (87%) rename security/openssh/patches/{patch-ar => patch-uidswap.c} (85%) diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 42b0583c3bd..66640a8452e 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.1544 2013/04/30 20:57:02 markd Exp $ +$NetBSD: CHANGES-2013,v 1.1546 2013/05/01 17:18:36 stacktic Exp $ Changes to the packages collection and infrastructure in 2013: @@ -2367,3 +2367,6 @@ Changes to the packages collection and infrastructure in 2013: Updated net/samba to 3.6.14 [adam 2013-04-30] Updated print/gv to 3.7.4 [markd 2013-04-30] Updated security/libsodium to 0.4.1 [agc 2013-04-30] + Updated misc/rump to 20130430 [stacktic 2013-05-01] + Updated filesystems/fs-utils to 20130430 [stacktic 2013-05-01] + Updated security/openssh to 6.2.1 [imil 2013-05-01] diff --git a/filesystems/fs-utils/DESCR b/filesystems/fs-utils/DESCR index 811580a5afb..c6eee32e980 100644 --- a/filesystems/fs-utils/DESCR +++ b/filesystems/fs-utils/DESCR @@ -3,7 +3,7 @@ mount it. Classic commands included (prefixed with fsu_): -* cat, diff, du, find, ls +* cat, diff, du, find, ls, stat * chflags, chmod, chown, mv, rm, rmdir * cp, ln, mkdir, mkfifo, mknod, touch @@ -12,5 +12,3 @@ New commands: * fsu_ecp (cp-like which allows the user to get/put files from/to the image) * fsu_exec (executes a local command like text editor on a file from the image) * fsu_write (writes its input in a file on the image) -* fsu_console (a command console tool that uses previous commands and adds - directory browsing) diff --git a/filesystems/fs-utils/Makefile b/filesystems/fs-utils/Makefile dissimilarity index 81% index 82c10182507..5e6af504386 100644 --- a/filesystems/fs-utils/Makefile +++ b/filesystems/fs-utils/Makefile @@ -1,48 +1,28 @@ -# $NetBSD: Makefile,v 1.11 2011/12/21 07:46:59 dholland Exp $ -# - -DISTNAME= fs-utils_20091116 -PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 -CATEGORIES= filesystems -MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/stacktic/ - -MAINTAINER= stacktic@NetBSD.org -HOMEPAGE= http://www.NetBSD.org/~stacktic/fs-utils.html -COMMENT= Tools to access/modify a file system image through RUMP - -ONLY_FOR_PLATFORM= NetBSD-[5-9]*-* FreeBSD-*-* Linux-*-* - -USE_BSD_MAKEFILE= yes -WRKSRC= ${WRKDIR}/fs-utils -INSTALLATION_DIRS= bin lib include ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 -MAKE_FLAGS+= MKPROFILE=yes - -SUBST_CLASSES+= path -SUBST_STAGE.path= pre-configure -SUBST_MESSAGE.path= Adjusting path. -SUBST_FILES.path= Makefile.gen -SUBST_SED.path= -e "s|/usr/pkg|${PREFIX}|g" - -post-install: - ${INSTALL_DATA} ${WRKSRC}/lib/libfsu_utils/fsu_fts.h \ - ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/lib/libfsu_utils/fsu_utils.h \ - ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/lib/libfsu_utils/fts2fsufts.h \ - ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/lib/libfsu_mount/fsu_mount.h \ - ${DESTDIR}${PREFIX}/include - -OSNAME!= uname -s -.if ${OSNAME} != "NetBSD" -MAKEFLAGS+= NOGCCERROR=1 -USE_FEATURES= nbcompat -NBCOMPAT_CONFIGURE_ARGS+= CFLAGS='-D_FILE_OFFSET_BITS=64 -fPIC' -NBCOMPAT_CONFIGURE_ARGS+= CPPFLAGS='-DPIC' -NBCOMPAT_CONFIGURE_ARGS+= --enable-bsd-getopt - -.include "../../misc/rump/buildlink3.mk" -.endif # !NetBSD - -.include "../../mk/bsd.pkg.mk" +# $NetBSD$ +# + +GIT_COMMIT= a6bfcf +DISTNAME= ${GIT_COMMIT} +PKGNAME= fs-utils-20130430 + +CATEGORIES= filesystems +MASTER_SITES= -http://nodeload.github.com/stacktic/fs-utils/tar.gz/${GIT_COMMIT} + +MAINTAINER= stacktic@NetBSD.org +HOMEPAGE= https://github.com/stacktic/fs-utils +COMMENT= Tools to access/modify a file system image through RUMP +LICENSE= 2-clause-bsd +DEPENDS+= rump-2013[0-9]*:../../misc/rump + +ONLY_FOR_PLATFORM= Linux-*-* SunOS-*-* NetBSD-*-* + +INSTALLATION_DIRS= bin lib include ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 + +USE_TOOLS+= gmake + +WRKSRC= ${WRKDIR}/fs-utils-${GIT_COMMIT} + +GNU_CONFIGURE= + +.include "../../misc/rump/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/filesystems/fs-utils/PLIST b/filesystems/fs-utils/PLIST index f5223bad379..4bde6f86bae 100644 --- a/filesystems/fs-utils/PLIST +++ b/filesystems/fs-utils/PLIST @@ -3,11 +3,11 @@ bin/fsu_cat bin/fsu_chflags bin/fsu_chmod bin/fsu_chown -bin/fsu_console bin/fsu_cp bin/fsu_diff bin/fsu_du bin/fsu_ecp +bin/fsu_emv bin/fsu_exec bin/fsu_find bin/fsu_get @@ -20,26 +20,13 @@ bin/fsu_mv bin/fsu_put bin/fsu_rm bin/fsu_rmdir +bin/fsu_stat bin/fsu_touch bin/fsu_write -include/fsu_fts.h -include/fsu_mount.h -include/fsu_utils.h -include/fts2fsufts.h -lib/libfsu_mount.a -lib/libfsu_mount.so -lib/libfsu_mount.so.0 -lib/libfsu_mount.so.0.0 -lib/libfsu_mount_p.a -lib/libfsu_mount_pic.a -lib/libfsu_utils.a -lib/libfsu_utils.so -lib/libfsu_utils.so.0 -lib/libfsu_utils.so.0.0 -lib/libfsu_utils_p.a -lib/libfsu_utils_pic.a +lib/libfsu.la man/man1/fsu_cat.1 man/man1/fsu_chflags.1 +man/man1/fsu_chgrp.1 man/man1/fsu_chmod.1 man/man1/fsu_chown.1 man/man1/fsu_cp.1 @@ -53,9 +40,7 @@ man/man1/fsu_mv.1 man/man1/fsu_rm.1 man/man1/fsu_rmdir.1 man/man1/fsu_touch.1 -man/man3/fsu_clearerr.3 man/man3/fsu_fclose.3 -man/man3/fsu_feof.3 man/man3/fsu_ferror.3 man/man3/fsu_fflush.3 man/man3/fsu_fgetc.3 @@ -63,16 +48,6 @@ man/man3/fsu_fopen.3 man/man3/fsu_fputc.3 man/man3/fsu_fread.3 man/man3/fsu_fseek.3 -man/man3/fsu_fseeko.3 -man/man3/fsu_ftell.3 -man/man3/fsu_ftello.3 man/man3/fsu_fts.3 -man/man3/fsu_fts_children.3 -man/man3/fsu_fts_close.3 -man/man3/fsu_fts_open.3 -man/man3/fsu_fts_read.3 -man/man3/fsu_fts_set.3 -man/man3/fsu_fwrite.3 man/man3/fsu_mount.3 -man/man3/fsu_rewind.3 man/man3/fsu_utils.3 diff --git a/filesystems/fs-utils/distinfo b/filesystems/fs-utils/distinfo dissimilarity index 99% index 48a44737920..abf6c1f01c2 100644 --- a/filesystems/fs-utils/distinfo +++ b/filesystems/fs-utils/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.8 2011/04/30 19:50:56 stacktic Exp $ - -SHA1 (fs-utils_20091116.tar.gz) = cb49494a66a5d6bf69f2d80d79482b3f7607da29 -RMD160 (fs-utils_20091116.tar.gz) = 8381dfc13d8470560342c96167e033c255233ab2 -Size (fs-utils_20091116.tar.gz) = 153103 bytes -SHA1 (patch-aa) = 654fc2827e1c41bd28cc31535a91fff799424017 -SHA1 (patch-ab) = e0654d25a6e0f8456f0568c9b20de16cfe1b77c1 -SHA1 (patch-lib_Makefile_inc) = e004fd2eaa287dd683e95718b3d3cb714c63f003 +$NetBSD$ + +SHA1 (a6bfcf.tar.gz) = b85cff41d49ff055e428c3b1c6432af195a9c95a +RMD160 (a6bfcf.tar.gz) = d5169e9a18a868a0215c410985f5b1da40338899 +Size (a6bfcf.tar.gz) = 492847 bytes diff --git a/filesystems/fs-utils/patches/patch-aa b/filesystems/fs-utils/patches/patch-aa deleted file mode 100644 index b127fcbfcfd..00000000000 --- a/filesystems/fs-utils/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ ---- usr.bin/du/du.c.orig 2011-04-30 19:09:26.000000000 +0200 -+++ usr.bin/du/du.c 2011-04-30 19:10:22.000000000 +0200 -@@ -51,6 +51,10 @@ - #include - #include - -+#ifdef __NetBSD__ -+#include -+#endif -+ - #if HAVE_NBCOMPAT_H - #include - #endif diff --git a/filesystems/fs-utils/patches/patch-ab b/filesystems/fs-utils/patches/patch-ab deleted file mode 100644 index a018f5dbef1..00000000000 --- a/filesystems/fs-utils/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- bin/ls/ls.c.orig 2011-04-30 19:09:36.000000000 +0200 -+++ bin/ls/ls.c 2011-04-30 19:10:56.000000000 +0200 -@@ -56,6 +56,10 @@ - #include - #include - -+#ifdef __NetBSD__ -+#include -+#endif -+ - #include - #include - #include diff --git a/filesystems/fs-utils/patches/patch-lib_Makefile_inc b/filesystems/fs-utils/patches/patch-lib_Makefile_inc deleted file mode 100644 index 3795e30cd16..00000000000 --- a/filesystems/fs-utils/patches/patch-lib_Makefile_inc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD$ - -Fix shared library linkage with USE_BSD_MAKEFILE in a bootstrapped -environment, where the rules for building .so files don't really -accomodate multiple libs in the same package properly. - -This is a hack; bootstrap-mk-files should be fixed. - ---- lib/Makefile.inc~ 2009-11-15 16:29:22.000000000 +0000 -+++ lib/Makefile.inc -@@ -4,3 +4,4 @@ - - CFLAGS+= -I${RUMPINCSDIR} - LDADD+= -L${RUMPLIBDIR} -lukfs -+LDADD+= -R${PREFIX}/lib diff --git a/misc/rump/DESCR b/misc/rump/DESCR dissimilarity index 100% index 7573cd75d41..307efeb0148 100644 --- a/misc/rump/DESCR +++ b/misc/rump/DESCR @@ -1,5 +1,8 @@ -This package provides file system driver support for the -filesystems/fs-utils package using vintage 2009 NetBSD. - -Newer versions are available by checking out the entire NetBSD source -and using buildrump.sh (https://github.com/anttikantee/buildrump.sh) +Rump (Runnable Userspace Meta Program) is a mechanism for running kernel code +as part of a user program's address space. As opposed to executing system calls +for requesting kernel services, rump programs do a library call into the kernel +code for equivalent functionality. Kernel code is simply recompiled as a +userspace shared library from the kernel sources instead of being rewritten, +so services imitate the same services being provided by the kernel. Select +architectures such as i386 and amd64 also support directly linking binary +kernel modules against rump programs. diff --git a/misc/rump/Makefile b/misc/rump/Makefile dissimilarity index 90% index 863879e640f..b506db0a526 100644 --- a/misc/rump/Makefile +++ b/misc/rump/Makefile @@ -1,73 +1,29 @@ -# $NetBSD: Makefile,v 1.15 2011/09/03 20:35:48 alnsn Exp $ -# - -DISTNAME= rump_20091108 -PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 3 - -CATEGORIES= misc -MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/stacktic/ - -MAINTAINER= stacktic@NetBSD.org -HOMEPAGE= http://www.NetBSD.org/docs/rump/ -COMMENT= Virtualized NetBSD kernel components in userspace - -ONLY_FOR_PLATFORM= Linux-*-* FreeBSD-*-* - -INSTALLATION_DIRS= lib include/rump ${PKGMANDIR}/man3 - -USE_BSD_MAKEFILE= yes - -WRKSRC= ${WRKDIR}/rump - -MAKEFLAGS+= MACHINE_ARCH=${MACHINE_ARCH} -MAKEFLAGS+= BSDSRCDIR=${WRKSRC} -MAKEFLAGS+= NOGCCERROR=1 - -SUBST_CLASSES+= alloc -SUBST_STAGE.alloc= pre-configure -SUBST_MESSAGE.alloc= Using malloc. -SUBST_FILES.alloc= sys/rump/librump/rumpkern/Makefile.rumpkern -SUBST_SED.alloc= -e "s|CPPFLAGS.*USE_REAL_ALLOCATORS.*|\# &|" -SUBST_SED.alloc+= -e "s|SRCS.*subr_pool.*|\# &|" - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Linux" - -SUBST_CLASSES+= crt -SUBST_STAGE.crt= pre-configure -SUBST_MESSAGE.crt= Fix crt path. -SUBST_FILES.crt= share/mk/bsd.lib.mk share/mk/bsd.prog.mk -SUBST_SED.crt= -e "s|lib/crt|lib$$\{LIBABISUFFIX\}/crt|" -MAKEFLAGS+= LIBABISUFFIX=${LIBABISUFFIX} - -SUBST_CLASSES+= dl -SUBST_STAGE.dl= pre-configure -SUBST_MESSAGE.dl= Fix dlopen. -SUBST_FILES.dl= lib/libukfs/ukfs.c -SUBST_SED.dl= -e "s|RTLD_GLOBAL|&\|RTLD_LAZY|" - -MAKEFLAGS+= MACHINE=${MACHINE_ARCH:C/x86_64/amd64/} - -CRT_PATH!= gcc --print-file-name=crtbegin.o -MAKEFLAGS+= _GCC_CRTBEGIN=${CRT_PATH} -MAKEFLAGS+= _GCC_CRTBEGINS=${CRT_PATH:C/begin/beginS/} -MAKEFLAGS+= _GCC_CRTEND=${CRT_PATH:C/begin/end/} -MAKEFLAGS+= _GCC_CRTENDS=${CRT_PATH:C/begin/endS/} -.endif - -RUMP_INCS= rump.h rump_compat.h rump_namei.h rump_syscalls.h -RUMP_INCS+= rumpdefs.h rumpuser.h rumpvnode_if.h -RUMP_INCS+= rumpkern_if_pub.h rumpnet_if_pub.h rumpvfs_if_pub.h - -post-install: -.for i in ${RUMP_INCS} - ${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/${i} \ - ${DESTDIR}${PREFIX}/include/rump -.endfor - ${INSTALL_DATA} ${WRKSRC}/lib/libukfs/ukfs.h \ - ${DESTDIR}${PREFIX}/include/rump - -.include "../../devel/zlib/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" +# $NetBSD$ +# + +GIT_COMMIT= 067df5 +DISTNAME= ${GIT_COMMIT} +PKGNAME= rump-20130430 + +CATEGORIES= misc +MASTER_SITES= -http://nodeload.github.com/anttikantee/buildrump.sh/tar.gz/${GIT_COMMIT} + +MAINTAINER= stacktic@NetBSD.org +HOMEPAGE= http://github.com/anttikantee/buildrump.sh +COMMENT= Virtualized NetBSD kernel components in userspace +LICENSE= 2-clause-bsd +USE_TOOLS+= pax + +ONLY_FOR_PLATFORM= Linux-*-* SunOS-*-* NetBSD-*-* + +INSTALLATION_DIRS= lib include/rump ${PKGMANDIR}/man3 + +WRKSRC= ${WRKDIR}/buildrump.sh-${GIT_COMMIT} + +do-build: + cd ${WRKSRC} && ./buildrump.sh -r checkout tools build install + +do-install: + cd ${WRKSRC}/rump && ${PAX} -wr lib include share ${DESTDIR}${PREFIX}/ + +.include "../../mk/bsd.pkg.mk" diff --git a/misc/rump/PLIST b/misc/rump/PLIST deleted file mode 100644 index bfa5cf4fff1..00000000000 --- a/misc/rump/PLIST +++ /dev/null @@ -1,175 +0,0 @@ -@comment $NetBSD$ -include/rump/rump.h -include/rump/rump_compat.h -include/rump/rump_namei.h -include/rump/rump_syscalls.h -include/rump/rumpdefs.h -include/rump/rumpkern_if_pub.h -include/rump/rumpnet_if_pub.h -include/rump/rumpuser.h -include/rump/rumpvfs_if_pub.h -include/rump/rumpvnode_if.h -include/rump/ukfs.h -lib/librump.a -lib/librump.so -lib/librump.so.0 -lib/librump.so.0.0 -lib/librump_p.a -lib/librump_pic.a -lib/librumpfs_cd9660.a -lib/librumpfs_cd9660.so -lib/librumpfs_cd9660.so.0 -lib/librumpfs_cd9660.so.0.0 -lib/librumpfs_cd9660_p.a -lib/librumpfs_cd9660_pic.a -lib/librumpfs_efs.a -lib/librumpfs_efs.so -lib/librumpfs_efs.so.0 -lib/librumpfs_efs.so.0.0 -lib/librumpfs_efs_p.a -lib/librumpfs_efs_pic.a -lib/librumpfs_ext2fs.a -lib/librumpfs_ext2fs.so -lib/librumpfs_ext2fs.so.0 -lib/librumpfs_ext2fs.so.0.0 -lib/librumpfs_ext2fs_p.a -lib/librumpfs_ext2fs_pic.a -lib/librumpfs_fdesc.a -lib/librumpfs_fdesc.so -lib/librumpfs_fdesc.so.0 -lib/librumpfs_fdesc.so.0.0 -lib/librumpfs_fdesc_p.a -lib/librumpfs_fdesc_pic.a -lib/librumpfs_ffs.a -lib/librumpfs_ffs.so -lib/librumpfs_ffs.so.0 -lib/librumpfs_ffs.so.0.0 -lib/librumpfs_ffs_p.a -lib/librumpfs_ffs_pic.a -lib/librumpfs_hfs.a -lib/librumpfs_hfs.so -lib/librumpfs_hfs.so.0 -lib/librumpfs_hfs.so.0.0 -lib/librumpfs_hfs_p.a -lib/librumpfs_hfs_pic.a -lib/librumpfs_lfs.a -lib/librumpfs_lfs.so -lib/librumpfs_lfs.so.0 -lib/librumpfs_lfs.so.0.0 -lib/librumpfs_lfs_p.a -lib/librumpfs_lfs_pic.a -lib/librumpfs_msdos.a -lib/librumpfs_msdos.so -lib/librumpfs_msdos.so.0 -lib/librumpfs_msdos.so.0.0 -lib/librumpfs_msdos_p.a -lib/librumpfs_msdos_pic.a -lib/librumpfs_nfs.a -lib/librumpfs_nfs.so -lib/librumpfs_nfs.so.0 -lib/librumpfs_nfs.so.0.0 -lib/librumpfs_nfs_p.a -lib/librumpfs_nfs_pic.a -lib/librumpfs_nilfs.a -lib/librumpfs_nilfs.so -lib/librumpfs_nilfs.so.0 -lib/librumpfs_nilfs.so.0.0 -lib/librumpfs_nilfs_p.a -lib/librumpfs_nilfs_pic.a -lib/librumpfs_ntfs.a -lib/librumpfs_ntfs.so -lib/librumpfs_ntfs.so.0 -lib/librumpfs_ntfs.so.0.0 -lib/librumpfs_ntfs_p.a -lib/librumpfs_ntfs_pic.a -lib/librumpfs_smbfs.a -lib/librumpfs_smbfs.so -lib/librumpfs_smbfs.so.0 -lib/librumpfs_smbfs.so.0.0 -lib/librumpfs_smbfs_p.a -lib/librumpfs_smbfs_pic.a -lib/librumpfs_syspuffs.a -lib/librumpfs_syspuffs.so -lib/librumpfs_syspuffs.so.0 -lib/librumpfs_syspuffs.so.0.0 -lib/librumpfs_syspuffs_p.a -lib/librumpfs_syspuffs_pic.a -lib/librumpfs_sysvbfs.a -lib/librumpfs_sysvbfs.so -lib/librumpfs_sysvbfs.so.0 -lib/librumpfs_sysvbfs.so.0.0 -lib/librumpfs_sysvbfs_p.a -lib/librumpfs_sysvbfs_pic.a -lib/librumpfs_tmpfs.a -lib/librumpfs_tmpfs.so -lib/librumpfs_tmpfs.so.0 -lib/librumpfs_tmpfs.so.0.0 -lib/librumpfs_tmpfs_p.a -lib/librumpfs_tmpfs_pic.a -lib/librumpfs_udf.a -lib/librumpfs_udf.so -lib/librumpfs_udf.so.0 -lib/librumpfs_udf.so.0.0 -lib/librumpfs_udf_p.a -lib/librumpfs_udf_pic.a -lib/librumpnet.a -lib/librumpnet.so -lib/librumpnet.so.0 -lib/librumpnet.so.0.0 -lib/librumpnet_local.a -lib/librumpnet_local.so -lib/librumpnet_local.so.0 -lib/librumpnet_local.so.0.0 -lib/librumpnet_local_p.a -lib/librumpnet_local_pic.a -lib/librumpnet_net.a -lib/librumpnet_net.so -lib/librumpnet_net.so.0 -lib/librumpnet_net.so.0.0 -lib/librumpnet_net_p.a -lib/librumpnet_net_pic.a -lib/librumpnet_netinet.a -lib/librumpnet_netinet.so -lib/librumpnet_netinet.so.0 -lib/librumpnet_netinet.so.0.0 -lib/librumpnet_netinet_p.a -lib/librumpnet_netinet_pic.a -lib/librumpnet_p.a -lib/librumpnet_pic.a -lib/librumpnet_shmif.a -lib/librumpnet_shmif.so -lib/librumpnet_shmif.so.0 -lib/librumpnet_shmif.so.0.0 -lib/librumpnet_shmif_p.a -lib/librumpnet_shmif_pic.a -lib/librumpnet_sockin.a -lib/librumpnet_sockin.so -lib/librumpnet_sockin.so.0 -lib/librumpnet_sockin.so.0.0 -lib/librumpnet_sockin_p.a -lib/librumpnet_sockin_pic.a -lib/librumpnet_virtif.a -lib/librumpnet_virtif.so -lib/librumpnet_virtif.so.0 -lib/librumpnet_virtif.so.0.0 -lib/librumpnet_virtif_p.a -lib/librumpnet_virtif_pic.a -lib/librumpuser.a -lib/librumpuser.so -lib/librumpuser.so.0 -lib/librumpuser.so.0.0 -lib/librumpuser_p.a -lib/librumpuser_pic.a -lib/librumpvfs.a -lib/librumpvfs.so -lib/librumpvfs.so.0 -lib/librumpvfs.so.0.0 -lib/librumpvfs_p.a -lib/librumpvfs_pic.a -lib/libukfs.a -lib/libukfs.so -lib/libukfs.so.1 -lib/libukfs.so.1.0 -lib/libukfs_p.a -lib/libukfs_pic.a -man/man3/ukfs.3 diff --git a/misc/rump/PLIST.Linux b/misc/rump/PLIST.Linux new file mode 100644 index 00000000000..eb9bb345c0a --- /dev/null +++ b/misc/rump/PLIST.Linux @@ -0,0 +1,11 @@ +lib/librumphijack_pic.a +lib/librumphijack.so +lib/librumphijack.so.0 +lib/librumphijack.so.0.0 +lib/librumpkern_sys_linux.a +lib/librumpkern_sys_linux_pic.a +lib/librumpkern_sys_linux.so +lib/librumpkern_sys_linux.so.0 +lib/librumpkern_sys_linux.so.0.0 +share/man/cat3/rumphijack.0 +share/man/man3/rumphijack.3 diff --git a/misc/rump/PLIST.SunOS b/misc/rump/PLIST.SunOS new file mode 100644 index 00000000000..ccfce0c7d2f --- /dev/null +++ b/misc/rump/PLIST.SunOS @@ -0,0 +1,5 @@ +lib/librumpkern_sys_sunos.a +lib/librumpkern_sys_sunos_pic.a +lib/librumpkern_sys_sunos.so +lib/librumpkern_sys_sunos.so.0 +lib/librumpkern_sys_sunos.so.0.0 diff --git a/misc/rump/PLIST.common b/misc/rump/PLIST.common new file mode 100644 index 00000000000..c84e2b827ec --- /dev/null +++ b/misc/rump/PLIST.common @@ -0,0 +1,412 @@ +@comment $NetBSD$ +lib/librump.a +lib/librumpclient.a +lib/librumpclient_pic.a +lib/librumpclient.so +lib/librumpclient.so.0 +lib/librumpclient.so.0.0 +lib/librumpdev.a +lib/librumpdev_audio.a +lib/librumpdev_audio_pic.a +lib/librumpdev_audio.so +lib/librumpdev_audio.so.0 +lib/librumpdev_audio.so.0.0 +lib/librumpdev_bpf.a +lib/librumpdev_bpf_pic.a +lib/librumpdev_bpf.so +lib/librumpdev_bpf.so.0 +lib/librumpdev_bpf.so.0.0 +lib/librumpdev_cgd.a +lib/librumpdev_cgd_pic.a +lib/librumpdev_cgd.so +lib/librumpdev_cgd.so.0 +lib/librumpdev_cgd.so.0.0 +lib/librumpdev_disk.a +lib/librumpdev_disk_pic.a +lib/librumpdev_disk.so +lib/librumpdev_disk.so.0 +lib/librumpdev_disk.so.0.0 +lib/librumpdev_dm.a +lib/librumpdev_dm_pic.a +lib/librumpdev_dm.so +lib/librumpdev_dm.so.0 +lib/librumpdev_dm.so.0.0 +lib/librumpdev_drvctl.a +lib/librumpdev_drvctl_pic.a +lib/librumpdev_drvctl.so +lib/librumpdev_drvctl.so.0 +lib/librumpdev_drvctl.so.0.0 +lib/librumpdev_fss.a +lib/librumpdev_fss_pic.a +lib/librumpdev_fss.so +lib/librumpdev_fss.so.0 +lib/librumpdev_fss.so.0.0 +lib/librumpdev_md.a +lib/librumpdev_md_pic.a +lib/librumpdev_md.so +lib/librumpdev_md.so.0 +lib/librumpdev_md.so.0.0 +lib/librumpdev_netsmb.a +lib/librumpdev_netsmb_pic.a +lib/librumpdev_netsmb.so +lib/librumpdev_netsmb.so.0 +lib/librumpdev_netsmb.so.0.0 +lib/librumpdev_pad.a +lib/librumpdev_pad_pic.a +lib/librumpdev_pad.so +lib/librumpdev_pad.so.0 +lib/librumpdev_pad.so.0.0 +lib/librumpdev_pic.a +lib/librumpdev_pud.a +lib/librumpdev_pud_pic.a +lib/librumpdev_pud.so +lib/librumpdev_pud.so.0 +lib/librumpdev_pud.so.0.0 +lib/librumpdev_putter.a +lib/librumpdev_putter_pic.a +lib/librumpdev_putter.so +lib/librumpdev_putter.so.0 +lib/librumpdev_putter.so.0.0 +lib/librumpdev_raidframe.a +lib/librumpdev_raidframe_pic.a +lib/librumpdev_raidframe.so +lib/librumpdev_raidframe.so.0 +lib/librumpdev_raidframe.so.0.0 +lib/librumpdev_rnd.a +lib/librumpdev_rnd_pic.a +lib/librumpdev_rnd.so +lib/librumpdev_rnd.so.0 +lib/librumpdev_rnd.so.0.0 +lib/librumpdev_scsipi.a +lib/librumpdev_scsipi_pic.a +lib/librumpdev_scsipi.so +lib/librumpdev_scsipi.so.0 +lib/librumpdev_scsipi.so.0.0 +lib/librumpdev_scsitest.a +lib/librumpdev_scsitest_pic.a +lib/librumpdev_scsitest.so +lib/librumpdev_scsitest.so.0 +lib/librumpdev_scsitest.so.0.0 +lib/librumpdev.so +lib/librumpdev.so.0 +lib/librumpdev.so.0.0 +lib/librumpdev_sysmon.a +lib/librumpdev_sysmon_pic.a +lib/librumpdev_sysmon.so +lib/librumpdev_sysmon.so.0 +lib/librumpdev_sysmon.so.0.0 +lib/librumpdev_ubt.a +lib/librumpdev_ubt_pic.a +lib/librumpdev_ubt.so +lib/librumpdev_ubt.so.0 +lib/librumpdev_ubt.so.0.0 +lib/librumpdev_ucom.a +lib/librumpdev_ucom_pic.a +lib/librumpdev_ucom.so +lib/librumpdev_ucom.so.0 +lib/librumpdev_ucom.so.0.0 +lib/librumpdev_ugenhc.a +lib/librumpdev_ugenhc_pic.a +lib/librumpdev_ugenhc.so +lib/librumpdev_ugenhc.so.0 +lib/librumpdev_ugenhc.so.0.0 +lib/librumpdev_ulpt.a +lib/librumpdev_ulpt_pic.a +lib/librumpdev_ulpt.so +lib/librumpdev_ulpt.so.0 +lib/librumpdev_ulpt.so.0.0 +lib/librumpdev_umass.a +lib/librumpdev_umass_pic.a +lib/librumpdev_umass.so +lib/librumpdev_umass.so.0 +lib/librumpdev_umass.so.0.0 +lib/librumpdev_usb.a +lib/librumpdev_usb_pic.a +lib/librumpdev_usb.so +lib/librumpdev_usb.so.0 +lib/librumpdev_usb.so.0.0 +lib/librumpdev_wscons.a +lib/librumpdev_wscons_pic.a +lib/librumpdev_wscons.so +lib/librumpdev_wscons.so.0 +lib/librumpdev_wscons.so.0.0 +lib/librumpfs_cd9660.a +lib/librumpfs_cd9660_pic.a +lib/librumpfs_cd9660.so +lib/librumpfs_cd9660.so.0 +lib/librumpfs_cd9660.so.0.0 +lib/librumpfs_efs.a +lib/librumpfs_efs_pic.a +lib/librumpfs_efs.so +lib/librumpfs_efs.so.0 +lib/librumpfs_efs.so.0.0 +lib/librumpfs_ext2fs.a +lib/librumpfs_ext2fs_pic.a +lib/librumpfs_ext2fs.so +lib/librumpfs_ext2fs.so.0 +lib/librumpfs_ext2fs.so.0.0 +lib/librumpfs_fdesc.a +lib/librumpfs_fdesc_pic.a +lib/librumpfs_fdesc.so +lib/librumpfs_fdesc.so.0 +lib/librumpfs_fdesc.so.0.0 +lib/librumpfs_ffs.a +lib/librumpfs_ffs_pic.a +lib/librumpfs_ffs.so +lib/librumpfs_ffs.so.0 +lib/librumpfs_ffs.so.0.0 +lib/librumpfs_hfs.a +lib/librumpfs_hfs_pic.a +lib/librumpfs_hfs.so +lib/librumpfs_hfs.so.0 +lib/librumpfs_hfs.so.0.0 +lib/librumpfs_kernfs.a +lib/librumpfs_kernfs_pic.a +lib/librumpfs_kernfs.so +lib/librumpfs_kernfs.so.0 +lib/librumpfs_kernfs.so.0.0 +lib/librumpfs_lfs.a +lib/librumpfs_lfs_pic.a +lib/librumpfs_lfs.so +lib/librumpfs_lfs.so.0 +lib/librumpfs_lfs.so.0.0 +lib/librumpfs_mfs.a +lib/librumpfs_mfs_pic.a +lib/librumpfs_mfs.so +lib/librumpfs_mfs.so.0 +lib/librumpfs_mfs.so.0.0 +lib/librumpfs_msdos.a +lib/librumpfs_msdos_pic.a +lib/librumpfs_msdos.so +lib/librumpfs_msdos.so.0 +lib/librumpfs_msdos.so.0.0 +lib/librumpfs_nfs.a +lib/librumpfs_nfs_pic.a +lib/librumpfs_nfsserver.a +lib/librumpfs_nfsserver_pic.a +lib/librumpfs_nfsserver.so +lib/librumpfs_nfsserver.so.0 +lib/librumpfs_nfsserver.so.0.0 +lib/librumpfs_nfs.so +lib/librumpfs_nfs.so.0 +lib/librumpfs_nfs.so.0.0 +lib/librumpfs_nilfs.a +lib/librumpfs_nilfs_pic.a +lib/librumpfs_nilfs.so +lib/librumpfs_nilfs.so.0 +lib/librumpfs_nilfs.so.0.0 +lib/librumpfs_ntfs.a +lib/librumpfs_ntfs_pic.a +lib/librumpfs_ntfs.so +lib/librumpfs_ntfs.so.0 +lib/librumpfs_ntfs.so.0.0 +lib/librumpfs_null.a +lib/librumpfs_null_pic.a +lib/librumpfs_null.so +lib/librumpfs_null.so.0 +lib/librumpfs_null.so.0.0 +lib/librumpfs_ptyfs.a +lib/librumpfs_ptyfs_pic.a +lib/librumpfs_ptyfs.so +lib/librumpfs_ptyfs.so.0 +lib/librumpfs_ptyfs.so.0.0 +lib/librumpfs_smbfs.a +lib/librumpfs_smbfs_pic.a +lib/librumpfs_smbfs.so +lib/librumpfs_smbfs.so.0 +lib/librumpfs_smbfs.so.0.0 +lib/librumpfs_syspuffs.a +lib/librumpfs_syspuffs_pic.a +lib/librumpfs_syspuffs.so +lib/librumpfs_syspuffs.so.0 +lib/librumpfs_syspuffs.so.0.0 +lib/librumpfs_sysvbfs.a +lib/librumpfs_sysvbfs_pic.a +lib/librumpfs_sysvbfs.so +lib/librumpfs_sysvbfs.so.0 +lib/librumpfs_sysvbfs.so.0.0 +lib/librumpfs_tmpfs.a +lib/librumpfs_tmpfs_pic.a +lib/librumpfs_tmpfs.so +lib/librumpfs_tmpfs.so.0 +lib/librumpfs_tmpfs.so.0.0 +lib/librumpfs_udf.a +lib/librumpfs_udf_pic.a +lib/librumpfs_udf.so +lib/librumpfs_udf.so.0 +lib/librumpfs_udf.so.0.0 +lib/librumpfs_umap.a +lib/librumpfs_umap_pic.a +lib/librumpfs_umap.so +lib/librumpfs_umap.so.0 +lib/librumpfs_umap.so.0.0 +lib/librumpfs_union.a +lib/librumpfs_union_pic.a +lib/librumpfs_union.so +lib/librumpfs_union.so.0 +lib/librumpfs_union.so.0.0 +lib/librumpfs_v7fs.a +lib/librumpfs_v7fs_pic.a +lib/librumpfs_v7fs.so +lib/librumpfs_v7fs.so.0 +lib/librumpfs_v7fs.so.0.0 +lib/librumpfs_zfs.a +lib/librumpfs_zfs_pic.a +lib/librumpfs_zfs.so +lib/librumpfs_zfs.so.0 +lib/librumpfs_zfs.so.0.0 +lib/librump_justtesting.a +lib/librump_justtesting_pic.a +lib/librump_justtesting.so +lib/librump_justtesting.so.0 +lib/librump_justtesting.so.0.0 +lib/librumpkern_crypto.a +lib/librumpkern_crypto_pic.a +lib/librumpkern_crypto.so +lib/librumpkern_crypto.so.0 +lib/librumpkern_crypto.so.0.0 +lib/librumpkern_solaris.a +lib/librumpkern_solaris_pic.a +lib/librumpkern_solaris.so +lib/librumpkern_solaris.so.0 +lib/librumpkern_solaris.so.0.0 +lib/librumpkern_tty.a +lib/librumpkern_tty_pic.a +lib/librumpkern_tty.so +lib/librumpkern_tty.so.0 +lib/librumpkern_tty.so.0.0 +lib/librumpkern_z.a +lib/librumpkern_z_pic.a +lib/librumpkern_z.so +lib/librumpkern_z.so.0 +lib/librumpkern_z.so.0.0 +lib/librumpnet.a +lib/librumpnet_agr.a +lib/librumpnet_agr_pic.a +lib/librumpnet_agr.so +lib/librumpnet_agr.so.0 +lib/librumpnet_agr.so.0.0 +lib/librumpnet_bridge.a +lib/librumpnet_bridge_pic.a +lib/librumpnet_bridge.so +lib/librumpnet_bridge.so.0 +lib/librumpnet_bridge.so.0.0 +lib/librumpnet_config.a +lib/librumpnet_config_pic.a +lib/librumpnet_config.so +lib/librumpnet_config.so.0 +lib/librumpnet_config.so.0.0 +lib/librumpnet_local.a +lib/librumpnet_local_pic.a +lib/librumpnet_local.so +lib/librumpnet_local.so.0 +lib/librumpnet_local.so.0.0 +lib/librumpnet_net80211.a +lib/librumpnet_net80211_pic.a +lib/librumpnet_net80211.so +lib/librumpnet_net80211.so.0 +lib/librumpnet_net80211.so.0.0 +lib/librumpnet_net.a +lib/librumpnet_netbt.a +lib/librumpnet_netbt_pic.a +lib/librumpnet_netbt.so +lib/librumpnet_netbt.so.0 +lib/librumpnet_netbt.so.0.0 +lib/librumpnet_netinet.a +lib/librumpnet_netinet_pic.a +lib/librumpnet_netinet.so +lib/librumpnet_netinet.so.0 +lib/librumpnet_netinet.so.0.0 +lib/librumpnet_net_pic.a +lib/librumpnet_net.so +lib/librumpnet_net.so.0 +lib/librumpnet_net.so.0.0 +lib/librumpnet_npf.a +lib/librumpnet_npf_pic.a +lib/librumpnet_npf.so +lib/librumpnet_npf.so.0 +lib/librumpnet_npf.so.0.0 +lib/librumpnet_pic.a +lib/librumpnet_shmif.a +lib/librumpnet_shmif_pic.a +lib/librumpnet_shmif.so +lib/librumpnet_shmif.so.0 +lib/librumpnet_shmif.so.0.0 +lib/librumpnet.so +lib/librumpnet.so.0 +lib/librumpnet.so.0.0 +lib/librumpnet_sockin.a +lib/librumpnet_sockin_pic.a +lib/librumpnet_sockin.so +lib/librumpnet_sockin.so.0 +lib/librumpnet_sockin.so.0.0 +lib/librumpnet_virtif.a +lib/librumpnet_virtif_pic.a +lib/librumpnet_virtif.so +lib/librumpnet_virtif.so.0 +lib/librumpnet_virtif.so.0.0 +lib/librump_pic.a +lib/librump.so +lib/librump.so.0 +lib/librump.so.0.0 +lib/librumpuser.a +lib/librumpuser_pic.a +lib/librumpuser.so +lib/librumpuser.so.0 +lib/librumpuser.so.0.1 +lib/librumpvfs.a +lib/librumpvfs_fifofs.a +lib/librumpvfs_fifofs_pic.a +lib/librumpvfs_fifofs.so +lib/librumpvfs_fifofs.so.0 +lib/librumpvfs_fifofs.so.0.0 +lib/librumpvfs_layerfs.a +lib/librumpvfs_layerfs_pic.a +lib/librumpvfs_layerfs.so +lib/librumpvfs_layerfs.so.0 +lib/librumpvfs_layerfs.so.0.0 +lib/librumpvfs_pic.a +lib/librumpvfs.so +lib/librumpvfs.so.0 +lib/librumpvfs.so.0.0 +share/man/cat3/rump.0 +share/man/cat3/rumpclient.0 +share/man/cat3/rump_etfs.0 +share/man/cat3/rump_lwproc.0 +share/man/cat3/rumpuser.0 +share/man/cat7/rump_sp.0 +share/man/man3/rump.3 +share/man/man3/rumpclient.3 +share/man/man3/rump_etfs.3 +share/man/man3/rump_lwproc.3 +share/man/man3/rumpuser.3 +share/man/man7/rump_sp.7 +include/rump/netconfig.h +include/rump/rumpclient.h +include/rump/rumpdefs.h +include/rump/rump.h +include/rump/rumpkern_if_pub.h +include/rump/rump_namei.h +include/rump/rumpnet_if_pub.h +include/rump/rump_syscalls_compat.h +include/rump/rump_syscalls.h +include/rump/rumpuser_component.h +include/rump/rumpuser.h +include/rump/rumpvfs_if_pub.h +include/rump/rumpvnode_if.h +include/rump/scsitest.h +@pkgdir share/man/man9 +@pkgdir share/man/man8 +@pkgdir share/man/man6 +@pkgdir share/man/man5 +@pkgdir share/man/man4 +@pkgdir share/man/man2 +@pkgdir share/man/man1 +@pkgdir share/man/cat9 +@pkgdir share/man/cat8 +@pkgdir share/man/cat6 +@pkgdir share/man/cat5 +@pkgdir share/man/cat4 +@pkgdir share/man/cat2 +@pkgdir share/man/cat1 +@pkgdir include/rump diff --git a/misc/rump/buildlink3.mk b/misc/rump/buildlink3.mk index 8a77d0bf9fc..8d51edc8ecc 100644 --- a/misc/rump/buildlink3.mk +++ b/misc/rump/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/11/05 08:36:00 stacktic Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/11/16 15:29:57 stacktic Exp $ BUILDLINK_TREE+= rump .if !defined(RUMP_BUILDLINK3_MK) RUMP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.rump+= rump>=20091108nb3 +BUILDLINK_API_DEPENDS.rump+= rump>=20130430 BUILDLINK_PKGSRCDIR.rump?= ../../misc/rump .endif # RUMP_BUILDLINK3_MK diff --git a/misc/rump/distinfo b/misc/rump/distinfo index 836e0df764e..726d5f5cfca 100644 --- a/misc/rump/distinfo +++ b/misc/rump/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2009/11/08 20:13:27 stacktic Exp $ +$NetBSD$ -SHA1 (rump_20091108.tar.gz) = 8dec81da5d67e9d6257db8886e8f45c1786b1eea -RMD160 (rump_20091108.tar.gz) = bbbcace41dc4da3d647d5ab2093ce0b2f26a98fc -Size (rump_20091108.tar.gz) = 9721587 bytes +SHA1 (067df5.tar.gz) = 213445b3497f89653cbb35c1d1f3243e9df65e10 +RMD160 (067df5.tar.gz) = a3665b0434a57c9b256e406b471a26d20c5f4b92 +Size (067df5.tar.gz) = 38625 bytes diff --git a/security/openssh/Makefile b/security/openssh/Makefile index e37eddd0dac..bf1e8e21cf9 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.209 2012/12/16 01:52:33 obache Exp $ +# $NetBSD: Makefile,v 1.210 2013/02/06 23:23:40 jperkin Exp $ -DISTNAME= openssh-5.8p2 -PKGNAME= openssh-5.8.2 -PKGREVISION= 8 +DISTNAME= openssh-6.2p1 +PKGNAME= openssh-6.2.1 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ @@ -175,14 +174,6 @@ SUBST_MESSAGE.patch= More patch a file. .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" -.if !empty(PKG_OPTIONS:Mldap) -DOCDIR= ${PREFIX}/share/doc/openssh -INSTALLATION_DIRS+= ${DOCDIR} - -pre-configure: - cd ${WRKSRC} && autoconf -.endif - # # type of key "ecdsa" isn't always supported depends on OpenSSL. # @@ -205,12 +196,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.generic \ ${DESTDIR}${EGDIR}/sshd.pam .endif -.if !empty(PKG_OPTIONS:Mldap) - ${INSTALL_DATA} ${WRKSRC}/README.lpk \ - ${DESTDIR}${DOCDIR} - cd ${WRKSRC}; for file in ${LPK_CONFS}; do \ - ${INSTALL_DATA} $${file} ${DESTDIR}${EGDIR}/$${file}; \ - done -.endif .include "../../mk/bsd.pkg.mk" diff --git a/security/openssh/PLIST.ldap b/security/openssh/PLIST.ldap deleted file mode 100644 index 910dfea4040..00000000000 --- a/security/openssh/PLIST.ldap +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD$ -share/doc/openssh/README.lpk -share/examples/openssh/lpk-user-example.txt -share/examples/openssh/openssh-lpk_openldap.schema -share/examples/openssh/openssh-lpk_sun.schema diff --git a/security/openssh/distinfo b/security/openssh/distinfo dissimilarity index 99% index a29bad50902..aac09514f0c 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,34 +1,31 @@ -$NetBSD: distinfo,v 1.82 2012/05/31 11:58:37 imil Exp $ - -SHA1 (openssh-5.8p1-hpn13v11.diff.gz) = ea61ab71605ee867eebc1a92875a3ea5369e2d28 -RMD160 (openssh-5.8p1-hpn13v11.diff.gz) = 45fbb8e2db2f829f2749cd745ed6a0542adb1c45 -Size (openssh-5.8p1-hpn13v11.diff.gz) = 22993 bytes -SHA1 (openssh-5.8p2.tar.gz) = 64798328d310e4f06c9f01228107520adbc8b3e5 -RMD160 (openssh-5.8p2.tar.gz) = f70cdb10983c389b1d6e52da522b9ff8256f1aff -Size (openssh-5.8p2.tar.gz) = 1115475 bytes -SHA1 (openssh-lpk-5.8p2-0.3.14.patch.gz) = 9eab90211363e6ea74e250d072cf14b69516bc0e -RMD160 (openssh-lpk-5.8p2-0.3.14.patch.gz) = ca008e5c8c1f43be334f6e4e598d79d0153e94e5 -Size (openssh-lpk-5.8p2-0.3.14.patch.gz) = 18656 bytes -SHA1 (patch-aa) = 59a39e53367983145e11150018a7f6f185df7bd5 -SHA1 (patch-ab) = 45ae7e91a00fc6d3fdb6cd6b91950d7aae58a55f -SHA1 (patch-ac) = 7cd1129633649327f4f44cecc10b617c5cd34ec3 -SHA1 (patch-ad) = ce7c34a1810ad4f44be935c5479c53109a306d1d -SHA1 (patch-ae) = 4ec1007b03d4bf28ddd1dcfdf2ec7c5295a69df5 -SHA1 (patch-af) = ca3224af0b648803404776a8c12ed678db4f8ff6 -SHA1 (patch-ag) = 0cdcc0f235119fb0603bb112492dd5ba66e6ad04 -SHA1 (patch-ah) = 0dad388fe5204ee6ca5d90ba1e684e18df38ccf1 -SHA1 (patch-ai) = becad6262e5daeef2a6db14097a8971c40088403 -SHA1 (patch-aj) = 5c89b4a7da59f05c50c16083aa6dd6e465cd0305 -SHA1 (patch-ak) = 00b594fec3c366ed134b7ced5c3bc3fcf7b56357 -SHA1 (patch-al) = ffd15b2ef3cb6b57419c0f6f1f4f795e497382d7 -SHA1 (patch-am) = 416471d27aedd44dc56007da46805d90f3d9957f -SHA1 (patch-an) = 6a645978a04137fc104e863496a4d3a2ea1c6286 -SHA1 (patch-ao) = effe1720917a645452f1a7afd92588709355fb48 -SHA1 (patch-ap) = 48c92b26f64c682ed45cae3f8d20ec91815543ea -SHA1 (patch-aq) = 1a7d8a4c5e70a0c6211247ba583534ed8ce317d0 -SHA1 (patch-ar) = a1099e0175a2b14f3b19db04261891179b1e3299 -SHA1 (patch-atomicio.c) = ff4cfc78c9f37d53e3b3be94d92beaf176adfdfc -SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f -SHA1 (patch-av) = dd34ac767d08b989775add25c5c015a2f19fce5c -SHA1 (patch-aw) = 22d873bfe56464ce8a978082ebce73d441f81e5d -SHA1 (patch-platform.c) = fcbea87b04d07ef45af5380f9baa024fada9974f +$NetBSD: distinfo,v 1.83 2012/07/20 14:17:23 fhajny Exp $ + +SHA1 (openssh-6.2p1-hpn13v14.diff) = 71bbd99961b8b7665a481cf0a4bc9604e55d75b3 +RMD160 (openssh-6.2p1-hpn13v14.diff) = b859fbdf4395534621cc5ffae0cce39621582927 +Size (openssh-6.2p1-hpn13v14.diff) = 61437 bytes +SHA1 (openssh-6.2p1.tar.gz) = 8824708c617cc781b2bb29fa20bd905fd3d2a43d +RMD160 (openssh-6.2p1.tar.gz) = 3651a43c8d466646e760cb1cbc9097dbba5151ca +Size (openssh-6.2p1.tar.gz) = 1182181 bytes +SHA1 (patch-Makefile.in) = 514edd12500e89059d3bda7f5ac8c651001fd7c6 +SHA1 (patch-atomicio.c) = 6bb3c3ca1491693918ce1ac7481e0852c90e0b4e +SHA1 (patch-auth-passwd.c) = de9f5487fe1f5848cc702e549bce949fd75d70cd +SHA1 (patch-auth-rhosts.c) = ab8dd3e375accc5bed3e15b158a85a1b1f9a2e3e +SHA1 (patch-auth.c) = ee757e5c80a14398c4835a1c1502cdaa03ca8655 +SHA1 (patch-auth1.c) = 97693bbd970cf036892099493f0f64e59a252a35 +SHA1 (patch-auth2.c) = bb638fda90e80cd2f74702e01dc3320da01e4e80 +SHA1 (patch-config.h.in) = 805a5ba9be430a7123dc958d43c401d6f57d0bf5 +SHA1 (patch-configure) = d8977e444ffd2217229726161ebf0b5868d9f650 +SHA1 (patch-configure.ac) = b981b8b2e28edc4fa461c9c487f3f7e82412b826 +SHA1 (patch-defines.h) = e2aebe7dcf0927d8afcca7a96c4001a6e0130cc2 +SHA1 (patch-includes.h) = f7fad7b3599d677a5991b140c66e3a67bedbe13b +SHA1 (patch-loginrec.c) = 0305a5b552c88ac99d8f894d3cda9686e0b0ccdd +SHA1 (patch-openbsd-compat_bsd-openpty.c) = a1318cf691f0ad844a8761a77e3bb32a9e20c695 +SHA1 (patch-openbsd-compat_openbsd-compat.h) = 17690feb6962bd27fef96bd6fb1acfa60e9af9dc +SHA1 (patch-openbsd-compat_port-tun.c) = 8288e2b9336ea1fcc1129d8a2ab5e55816b2ccbf +SHA1 (patch-platform.c) = fcb85cca516d992ec50dfb259b9cc8ddbb032b5c +SHA1 (patch-scp.c) = 0460cee3ad2626c71ce0a6e484fb4ed9ae559d1f +SHA1 (patch-session.c) = aba585358f22db8b37b6673526af96765c65dc49 +SHA1 (patch-ssh.c) = eecce1698455567f9e48b498fe937d235890c315 +SHA1 (patch-sshd.c) = faf9ff468a0938e20f7cf18192c47dec46763e8c +SHA1 (patch-sshpty.c) = 9f08f899919d05567998087a060b90800c2c7b11 +SHA1 (patch-uidswap.c) = 4c7c4e1621dc54a180bcba9a81d58f114a819eb0 diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 0bd32c8c3ba..00ac71b1e5a 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.23 2012/05/31 11:58:37 imil Exp $ +# $NetBSD: options.mk,v 1.24 2013/01/11 12:41:16 jperkin Exp $ .include "../../mk/bsd.prefs.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.openssh -PKG_SUPPORTED_OPTIONS= kerberos hpn-patch ldap pam +PKG_SUPPORTED_OPTIONS= kerberos hpn-patch pam .include "../../mk/bsd.options.mk" @@ -16,8 +16,8 @@ CONFIGURE_ENV+= ac_cv_search_k_hasafs=no .endif .if !empty(PKG_OPTIONS:Mhpn-patch) -PATCHFILES= openssh-5.8p1-hpn13v11.diff.gz -PATCH_SITES= http://www.shatow.net/freebsd/ +PATCHFILES= openssh-6.2p1-hpn13v14.diff +PATCH_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/openssh/ PATCH_DIST_STRIP= -p1 .endif @@ -28,19 +28,3 @@ PLIST_SRC+= ${.CURDIR}/PLIST.pam MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam MESSAGE_SUBST+= EGDIR=${EGDIR} .endif - -.if !empty(PKG_OPTIONS:Mldap) -.include "../../databases/openldap-client/buildlink3.mk" -USE_TOOLS+= autoconf -CONFIGURE_ARGS+= --with-ldap -LPK_CONFS+= lpk-user-example.txt \ - openssh-lpk_openldap.schema \ - openssh-lpk_sun.schema -PLIST_SRC+= ${.CURDIR}/PLIST.ldap - -LPK_VERS= 0.3.14 -OPENSSH_VERS= ${DISTNAME:S/openssh-//} -PATCHFILES= openssh-lpk-${OPENSSH_VERS}-${LPK_VERS}.patch.gz -PATCH_SITES= http://gentoo.mirrors.tera-byte.com/distfiles/ -PATCH_DIST_STRIP= -p1 -.endif diff --git a/security/openssh/patches/patch-Makefile.in b/security/openssh/patches/patch-Makefile.in new file mode 100644 index 00000000000..b3caddc5614 --- /dev/null +++ b/security/openssh/patches/patch-Makefile.in @@ -0,0 +1,24 @@ +$NetBSD$ + +Removed install-sysconf as we handle that phase through post-install + +--- Makefile.in.orig 2013-03-07 15:37:13.000000000 +0000 ++++ Makefile.in +@@ -22,7 +22,7 @@ top_srcdir=@top_srcdir@ + DESTDIR= + VPATH=@srcdir@ + SSH_PROGRAM=@bindir@/ssh +-ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass ++#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass + SFTP_SERVER=$(libexecdir)/sftp-server + SSH_KEYSIGN=$(libexecdir)/ssh-keysign + SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper +@@ -242,7 +242,7 @@ distprep: catman-do + -rm -rf autom4te.cache + + install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config +-install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf ++install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files + install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files + + check-config: diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah deleted file mode 100644 index 55d6e210afc..00000000000 --- a/security/openssh/patches/patch-ah +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ah,v 1.28 2010/06/11 20:41:42 martti Exp $ - ---- Makefile.in.orig 2011-02-16 01:25:58.000000000 +0000 -+++ Makefile.in -@@ -22,7 +22,7 @@ top_srcdir=@top_srcdir@ - DESTDIR= - VPATH=@srcdir@ - SSH_PROGRAM=@bindir@/ssh --ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass -+#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass - SFTP_SERVER=$(libexecdir)/sftp-server - SSH_KEYSIGN=$(libexecdir)/ssh-keysign - SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper -@@ -243,7 +243,7 @@ distprep: catman-do - -rm -rf autom4te.cache - - install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config --install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf -+install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files - install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files - - check-config: diff --git a/security/openssh/patches/patch-ak b/security/openssh/patches/patch-ak deleted file mode 100644 index f18c6277109..00000000000 --- a/security/openssh/patches/patch-ak +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ak,v 1.10 2010/06/11 20:41:42 martti Exp $ - ---- auth.c.orig 2010-12-01 01:21:51.000000000 +0000 -+++ auth.c -@@ -391,7 +391,7 @@ check_key_in_hostfiles(struct passwd *pw - user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); - if (options.strict_modes && - (stat(user_hostfile, &st) == 0) && -- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || -+ ((st.st_uid != ROOTUID && st.st_uid != pw->pw_uid) || - (st.st_mode & 022) != 0)) { - logit("Authentication refused for %.100s: " - "bad owner or modes for %.200s", -@@ -453,7 +453,7 @@ secure_filename(FILE *f, const char *fil - - /* check the open file to avoid races */ - if (fstat(fileno(f), &st) < 0 || -- (st.st_uid != 0 && st.st_uid != uid) || -+ (st.st_uid != ROOTUID && st.st_uid != uid) || - (st.st_mode & 022) != 0) { - snprintf(err, errlen, "bad ownership or modes for file %s", - buf); -@@ -470,7 +470,7 @@ secure_filename(FILE *f, const char *fil - - debug3("secure_filename: checking '%s'", buf); - if (stat(buf, &st) < 0 || -- (st.st_uid != 0 && st.st_uid != uid) || -+ (st.st_uid != ROOTUID && st.st_uid != uid) || - (st.st_mode & 022) != 0) { - snprintf(err, errlen, - "bad ownership or modes for directory %s", buf); diff --git a/security/openssh/patches/patch-atomicio.c b/security/openssh/patches/patch-atomicio.c index d79654c90e7..4b72d0f7b36 100644 --- a/security/openssh/patches/patch-atomicio.c +++ b/security/openssh/patches/patch-atomicio.c @@ -1,7 +1,6 @@ $NetBSD$ -Avoid SSP side effect: -http://mail-index.netbsd.org/source-changes/2011/08/01/msg025290.html +Check for vwrite instead of read to avoid read being renamed by SSP issues --- atomicio.c.orig 2010-09-24 12:15:11.000000000 +0000 +++ atomicio.c diff --git a/security/openssh/patches/patch-af b/security/openssh/patches/patch-auth-passwd.c similarity index 85% rename from security/openssh/patches/patch-af rename to security/openssh/patches/patch-auth-passwd.c index f2a553d054f..b191b71de17 100644 --- a/security/openssh/patches/patch-af +++ b/security/openssh/patches/patch-auth-passwd.c @@ -1,6 +1,8 @@ -$NetBSD: patch-af,v 1.9 2005/11/07 19:35:23 tv Exp $ +$NetBSD$ ---- auth-passwd.c.orig 2006-08-05 11:39:39.000000000 +0900 +Replace uid 0 with ROOTUID macro + +--- auth-passwd.c.orig 2012-04-25 23:51:28.000000000 +0000 +++ auth-passwd.c @@ -87,7 +87,7 @@ auth_password(Authctxt *authctxt, const #endif diff --git a/security/openssh/patches/patch-aj b/security/openssh/patches/patch-auth-rhosts.c similarity index 91% rename from security/openssh/patches/patch-aj rename to security/openssh/patches/patch-auth-rhosts.c index b683b417438..67aec9b596d 100644 --- a/security/openssh/patches/patch-aj +++ b/security/openssh/patches/patch-auth-rhosts.c @@ -1,6 +1,8 @@ -$NetBSD: patch-aj,v 1.7 2006/10/31 03:31:20 taca Exp $ +$NetBSD$ ---- auth-rhosts.c.orig 2008-06-14 08:01:25.000000000 +0900 +Replace uid 0 with ROOTUID macro + +--- auth-rhosts.c.orig 2010-03-07 12:05:17.000000000 +0000 +++ auth-rhosts.c @@ -230,7 +230,7 @@ auth_rhosts2_raw(struct passwd *pw, cons return 0; diff --git a/security/openssh/patches/patch-auth.c b/security/openssh/patches/patch-auth.c new file mode 100644 index 00000000000..b2c7913158a --- /dev/null +++ b/security/openssh/patches/patch-auth.c @@ -0,0 +1,15 @@ +$NetBSD$ + +Replace uid 0 with ROOTUID macro + +--- auth.c.orig 2013-03-12 00:31:05.000000000 +0000 ++++ auth.c +@@ -385,7 +385,7 @@ check_key_in_hostfiles(struct passwd *pw + user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); + if (options.strict_modes && + (stat(user_hostfile, &st) == 0) && +- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || ++ ((st.st_uid != ROOTUID && st.st_uid != pw->pw_uid) || + (st.st_mode & 022) != 0)) { + logit("Authentication refused for %.100s: " + "bad owner or modes for %.200s", diff --git a/security/openssh/patches/patch-al b/security/openssh/patches/patch-auth1.c similarity index 75% rename from security/openssh/patches/patch-al rename to security/openssh/patches/patch-auth1.c index 60ab7e63018..e31836fde78 100644 --- a/security/openssh/patches/patch-al +++ b/security/openssh/patches/patch-auth1.c @@ -1,8 +1,10 @@ -$NetBSD: patch-al,v 1.8 2009/05/21 03:22:29 taca Exp $ +$NetBSD$ ---- auth1.c.orig 2008-07-09 19:54:05.000000000 +0900 +Replace uid 0 with ROOTUID macro + +--- auth1.c.orig 2012-12-02 22:53:20.000000000 +0000 +++ auth1.c -@@ -320,7 +320,7 @@ do_authloop(Authctxt *authctxt) +@@ -321,7 +321,7 @@ do_authloop(Authctxt *authctxt) #ifndef HAVE_CYGWIN /* Special handling for root */ @@ -11,7 +13,7 @@ $NetBSD: patch-al,v 1.8 2009/05/21 03:22:29 taca Exp $ !auth_root_allowed(meth->name)) { authenticated = 0; # ifdef SSH_AUDIT_EVENTS -@@ -418,8 +418,8 @@ do_authentication(Authctxt *authctxt) +@@ -425,8 +425,8 @@ do_authentication(Authctxt *authctxt) * If we are not running as root, the user must have the same uid as * the server. */ diff --git a/security/openssh/patches/patch-am b/security/openssh/patches/patch-auth2.c similarity index 66% rename from security/openssh/patches/patch-am rename to security/openssh/patches/patch-auth2.c index c241aeba9e5..1db72b41b67 100644 --- a/security/openssh/patches/patch-am +++ b/security/openssh/patches/patch-auth2.c @@ -1,9 +1,11 @@ -$NetBSD: patch-am,v 1.8 2009/05/21 03:22:29 taca Exp $ +$NetBSD$ ---- auth2.c.orig 2011-02-16 01:25:58.000000000 +0000 +Replace uid 0 with ROOTUID macro + +--- auth2.c.orig 2012-12-02 22:53:20.000000000 +0000 +++ auth2.c @@ -307,7 +307,7 @@ userauth_finish(Authctxt *authctxt, int - authctxt->user); + fatal("INTERNAL ERROR: authenticated and postponed"); /* Special handling for root */ - if (authenticated && authctxt->pw->pw_uid == 0 && diff --git a/security/openssh/patches/patch-ag b/security/openssh/patches/patch-config.h.in similarity index 75% rename from security/openssh/patches/patch-ag rename to security/openssh/patches/patch-config.h.in index 18d68ed0c51..721ca931ed5 100644 --- a/security/openssh/patches/patch-ag +++ b/security/openssh/patches/patch-config.h.in @@ -1,8 +1,10 @@ -$NetBSD: patch-ag,v 1.13 2010/06/11 20:41:42 martti Exp $ +$NetBSD$ ---- config.h.in.orig 2011-02-04 00:59:51.000000000 +0000 +Added Interix and define new path to if_tun.h + +--- config.h.in.orig 2013-03-21 23:38:18.000000000 +0000 +++ config.h.in -@@ -533,6 +533,9 @@ +@@ -561,6 +561,9 @@ /* define if you have int64_t data type */ #undef HAVE_INT64_T @@ -12,7 +14,7 @@ $NetBSD: patch-ag,v 1.13 2010/06/11 20:41:42 martti Exp $ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -@@ -659,6 +662,9 @@ +@@ -699,6 +702,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NET_IF_TUN_H diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-configure similarity index 74% rename from security/openssh/patches/patch-aa rename to security/openssh/patches/patch-configure index 6337403a265..e490585fe19 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-configure @@ -1,8 +1,10 @@ -$NetBSD: patch-aa,v 1.47 2011/02/06 11:31:18 obache Exp $ +$NetBSD$ ---- configure.orig 2010-04-16 03:17:11.000000000 +0300 -+++ configure 2010-06-09 21:30:29.000000000 +0300 -@@ -5665,6 +5665,9 @@ +Various fixes regarding portability + +--- configure.orig 2013-03-21 23:38:28.000000000 +0000 ++++ configure +@@ -5993,6 +5993,9 @@ if test "${with_rpath+set}" = set; then fi @@ -12,7 +14,7 @@ $NetBSD: patch-aa,v 1.47 2011/02/06 11:31:18 obache Exp $ # Allow user to specify flags # Check whether --with-cflags was given. -@@ -5810,6 +5813,7 @@ +@@ -6076,6 +6079,7 @@ for ac_header in \ maillock.h \ ndir.h \ net/if_tun.h \ @@ -20,7 +22,7 @@ $NetBSD: patch-aa,v 1.47 2011/02/06 11:31:18 obache Exp $ netdb.h \ netgroup.h \ pam/pam_appl.h \ -@@ -7660,6 +7664,36 @@ +@@ -6786,6 +6790,36 @@ $as_echo "#define HAVE_SECUREWARE 1" >>c ;; esac ;; @@ -57,30 +59,28 @@ $NetBSD: patch-aa,v 1.47 2011/02/06 11:31:18 obache Exp $ *-*-irix5*) PATH="$PATH:/usr/etc" -@@ -8226,7 +8260,7 @@ - _ACEOF +@@ -6987,7 +7021,7 @@ fi + $as_echo "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h ;; -*-*-freebsd*) +*-*-freebsd*|*-*-dragonfly*) check_for_libcrypt_later=1 - cat >>confdefs.h <<\_ACEOF -@@ -29573,14 +29607,20 @@ + $as_echo "#define LOCKED_PASSWD_PREFIX \"*LOCKED*\"" >>confdefs.h +@@ -17033,12 +17067,18 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test -z "$conf_wtmpx_location"; then if test x"$system_wtmpx_path" = x"no" ; then -- cat >>confdefs.h <<\_ACEOF +- $as_echo "#define DISABLE_WTMPX 1" >>confdefs.h +- + for f in /var/log/wtmpx; do + if test -f $f ; then + conf_wtmpx_location=$f + fi + done + if test -z "$conf_wtmpx_location"; then -+ cat >>confdefs.h <<\_ACEOF - #define DISABLE_WTMPX 1 - _ACEOF -- ++ $as_echo "#define DISABLE_WTMPX 1" >>confdefs.h + fi fi -else @@ -92,7 +92,7 @@ $NetBSD: patch-aa,v 1.47 2011/02/06 11:31:18 obache Exp $ #define CONF_WTMPX_FILE "$conf_wtmpx_location" _ACEOF -@@ -30888,7 +30930,7 @@ +@@ -18441,7 +18481,7 @@ echo "OpenSSH has been configured with t echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-configure.ac similarity index 72% rename from security/openssh/patches/patch-ab rename to security/openssh/patches/patch-configure.ac index 5da02fa2f8f..4dbaaeea87d 100644 --- a/security/openssh/patches/patch-ab +++ b/security/openssh/patches/patch-configure.ac @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.29 2011/02/06 11:31:18 obache Exp $ +$NetBSD$ ---- configure.ac.orig 2010-04-10 15:58:01.000000000 +0300 -+++ configure.ac 2010-06-09 21:32:22.000000000 +0300 -@@ -191,6 +191,9 @@ +Various fixes regarding portability + +--- configure.ac.orig 2013-03-20 01:55:15.000000000 +0000 ++++ configure.ac +@@ -241,6 +241,9 @@ AC_ARG_WITH([rpath], ] ) @@ -10,9 +12,9 @@ $NetBSD: patch-ab,v 1.29 2011/02/06 11:31:18 obache Exp $ +need_dash_r= + # Allow user to specify flags - AC_ARG_WITH(cflags, + AC_ARG_WITH([cflags], [ --with-cflags Specify additional flags to pass to compiler], -@@ -258,6 +261,7 @@ +@@ -309,6 +312,7 @@ AC_CHECK_HEADERS([ \ maillock.h \ ndir.h \ net/if_tun.h \ @@ -20,7 +22,7 @@ $NetBSD: patch-ab,v 1.29 2011/02/06 11:31:18 obache Exp $ netdb.h \ netgroup.h \ pam/pam_appl.h \ -@@ -541,6 +545,15 @@ +@@ -603,6 +607,15 @@ main() { if (NSVersionOfRunTimeLibrary(" ;; esac ;; @@ -35,12 +37,12 @@ $NetBSD: patch-ab,v 1.29 2011/02/06 11:31:18 obache Exp $ + ;; *-*-irix5*) PATH="$PATH:/usr/etc" - AC_DEFINE(BROKEN_INET_NTOA, 1, -@@ -4106,9 +4119,17 @@ - ) + AC_DEFINE([BROKEN_INET_NTOA], [1], +@@ -4460,9 +4473,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + ]) if test -z "$conf_wtmpx_location"; then if test x"$system_wtmpx_path" = x"no" ; then -- AC_DEFINE(DISABLE_WTMPX) +- AC_DEFINE([DISABLE_WTMPX]) + for f in /var/log/wtmpx; do + if test -f $f ; then + conf_wtmpx_location=$f @@ -53,10 +55,10 @@ $NetBSD: patch-ab,v 1.29 2011/02/06 11:31:18 obache Exp $ -else +fi +if test -n "$conf_wtmpx_location"; then - AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location", + AC_DEFINE_UNQUOTED([CONF_WTMPX_FILE], ["$conf_wtmpx_location"], [Define if you want to specify the path to your wtmpx file]) fi -@@ -4156,7 +4177,7 @@ +@@ -4547,7 +4568,7 @@ echo "OpenSSH has been configured with t echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" diff --git a/security/openssh/patches/patch-ac b/security/openssh/patches/patch-defines.h similarity index 84% rename from security/openssh/patches/patch-ac rename to security/openssh/patches/patch-defines.h index cdc5fa42df5..dd7c67d3dba 100644 --- a/security/openssh/patches/patch-ac +++ b/security/openssh/patches/patch-defines.h @@ -1,6 +1,8 @@ -$NetBSD: patch-ac,v 1.18 2010/02/19 10:17:33 martti Exp $ +$NetBSD$ ---- defines.h.orig 2011-01-17 10:15:31.000000000 +0000 +Define ROOTUID, UTMPX_FILE and WTMPX_FILE + +--- defines.h.orig 2013-03-07 09:06:13.000000000 +0000 +++ defines.h @@ -30,6 +30,15 @@ @@ -18,7 +20,7 @@ $NetBSD: patch-ac,v 1.18 2010/02/19 10:17:33 martti Exp $ #if defined(HAVE_DECL_SHUT_RD) && HAVE_DECL_SHUT_RD == 0 enum { -@@ -698,6 +707,24 @@ struct winsize { +@@ -695,6 +704,24 @@ struct winsize { # endif # endif #endif diff --git a/security/openssh/patches/patch-ae b/security/openssh/patches/patch-includes.h similarity index 56% rename from security/openssh/patches/patch-ae rename to security/openssh/patches/patch-includes.h index 8be892cf7da..7eceda69f77 100644 --- a/security/openssh/patches/patch-ae +++ b/security/openssh/patches/patch-includes.h @@ -1,7 +1,9 @@ -$NetBSD: patch-ae,v 1.12 2006/10/31 03:31:20 taca Exp $ +$NetBSD$ ---- includes.h.orig 2009-08-20 09:16:01.000000000 +0300 -+++ includes.h 2010-02-19 12:07:37.000000000 +0200 +Interix support + +--- includes.h.orig 2013-02-22 22:12:24.000000000 +0000 ++++ includes.h @@ -124,6 +124,10 @@ #ifdef HAVE_READPASSPHRASE_H # include diff --git a/security/openssh/patches/patch-ad b/security/openssh/patches/patch-loginrec.c similarity index 74% rename from security/openssh/patches/patch-ad rename to security/openssh/patches/patch-loginrec.c index e84b912e1b5..0b317bb32c3 100644 --- a/security/openssh/patches/patch-ad +++ b/security/openssh/patches/patch-loginrec.c @@ -1,8 +1,10 @@ -$NetBSD: patch-ad,v 1.14 2010/06/11 20:41:42 martti Exp $ +$NetBSD$ ---- loginrec.c.orig 2011-01-17 10:15:31.000000000 +0000 +Interix support and related fixes + +--- loginrec.c.orig 2013-02-22 22:12:24.000000000 +0000 +++ loginrec.c -@@ -433,8 +433,8 @@ login_set_addr(struct logininfo *li, con +@@ -429,8 +429,8 @@ login_set_addr(struct logininfo *li, con int login_write(struct logininfo *li) { @@ -13,7 +15,7 @@ $NetBSD: patch-ad,v 1.14 2010/06/11 20:41:42 martti Exp $ logit("Attempt to write login records by non-root user (aborting)"); return (1); } -@@ -442,7 +442,7 @@ login_write(struct logininfo *li) +@@ -438,7 +438,7 @@ login_write(struct logininfo *li) /* set the timestamp */ login_set_current_time(li); @@ -22,7 +24,7 @@ $NetBSD: patch-ad,v 1.14 2010/06/11 20:41:42 martti Exp $ syslogin_write_entry(li); #endif #ifdef USE_LASTLOG -@@ -626,7 +626,7 @@ line_abbrevname(char *dst, const char *s +@@ -622,7 +622,7 @@ line_abbrevname(char *dst, const char *s ** into account. **/ @@ -31,7 +33,7 @@ $NetBSD: patch-ad,v 1.14 2010/06/11 20:41:42 martti Exp $ /* build the utmp structure */ void -@@ -763,10 +763,6 @@ construct_utmpx(struct logininfo *li, st +@@ -759,10 +759,6 @@ construct_utmpx(struct logininfo *li, st set_utmpx_time(li, utx); utx->ut_pid = li->pid; @@ -42,7 +44,7 @@ $NetBSD: patch-ad,v 1.14 2010/06/11 20:41:42 martti Exp $ if (li->type == LTYPE_LOGOUT) return; -@@ -775,6 +771,8 @@ construct_utmpx(struct logininfo *li, st +@@ -771,6 +767,8 @@ construct_utmpx(struct logininfo *li, st * for logouts. */ @@ -51,7 +53,7 @@ $NetBSD: patch-ad,v 1.14 2010/06/11 20:41:42 martti Exp $ # ifdef HAVE_HOST_IN_UTMPX strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname)); -@@ -1410,7 +1408,7 @@ wtmpx_get_entry(struct logininfo *li) +@@ -1406,7 +1404,7 @@ wtmpx_get_entry(struct logininfo *li) ** Low-level libutil login() functions **/ diff --git a/security/openssh/patches/patch-au b/security/openssh/patches/patch-openbsd-compat_bsd-openpty.c similarity index 78% rename from security/openssh/patches/patch-au rename to security/openssh/patches/patch-openbsd-compat_bsd-openpty.c index 3d3d1d4f34e..ce4f294c39f 100644 --- a/security/openssh/patches/patch-au +++ b/security/openssh/patches/patch-openbsd-compat_bsd-openpty.c @@ -1,6 +1,8 @@ -$NetBSD: patch-au,v 1.2 2005/09/21 18:07:09 reed Exp $ +$NetBSD$ ---- openbsd-compat/bsd-openpty.c.orig 2006-08-24 18:52:30.000000000 +0900 +Interix support + +--- openbsd-compat/bsd-openpty.c.orig 2006-08-24 09:52:30.000000000 +0000 +++ openbsd-compat/bsd-openpty.c @@ -121,15 +121,17 @@ openpty(int *amaster, int *aslave, char return (-1); diff --git a/security/openssh/patches/patch-ai b/security/openssh/patches/patch-openbsd-compat_openbsd-compat.h similarity index 71% rename from security/openssh/patches/patch-ai rename to security/openssh/patches/patch-openbsd-compat_openbsd-compat.h index 1f5a3d9e237..1304470ea97 100644 --- a/security/openssh/patches/patch-ai +++ b/security/openssh/patches/patch-openbsd-compat_openbsd-compat.h @@ -1,6 +1,8 @@ -$NetBSD: patch-ai,v 1.9 2005/11/04 14:47:17 tv Exp $ +$NetBSD$ ---- openbsd-compat/openbsd-compat.h.orig 2006-09-03 21:44:50.000000000 +0900 +strtoll() declaration + +--- openbsd-compat/openbsd-compat.h.orig 2013-02-15 01:20:42.000000000 +0000 +++ openbsd-compat/openbsd-compat.h @@ -83,6 +83,10 @@ size_t strlcat(char *dst, const char *sr int setenv(register const char *name, register const char *value, int rewrite); diff --git a/security/openssh/patches/patch-aw b/security/openssh/patches/patch-openbsd-compat_port-tun.c similarity index 85% rename from security/openssh/patches/patch-aw rename to security/openssh/patches/patch-openbsd-compat_port-tun.c index 70a9fabd83b..3c53743a571 100644 --- a/security/openssh/patches/patch-aw +++ b/security/openssh/patches/patch-openbsd-compat_port-tun.c @@ -1,4 +1,6 @@ -$NetBSD: patch-aw,v 1.3 2009/05/21 03:22:29 taca Exp $ +$NetBSD$ + +if_tun.h can be found in net/tun --- openbsd-compat/port-tun.c.orig 2010-08-10 02:47:42.000000000 +0000 +++ openbsd-compat/port-tun.c diff --git a/security/openssh/patches/patch-platform.c b/security/openssh/patches/patch-platform.c index 267ae738213..edaf10858dc 100644 --- a/security/openssh/patches/patch-platform.c +++ b/security/openssh/patches/patch-platform.c @@ -1,8 +1,8 @@ $NetBSD$ -Fix for Interix. +Interix support ---- platform.c.orig 2011-01-11 06:02:25.000000000 +0000 +--- platform.c.orig 2013-03-12 00:31:05.000000000 +0000 +++ platform.c @@ -81,7 +81,9 @@ platform_privileged_uidswap(void) /* uid 0 is not special on Cygwin so always try */ diff --git a/security/openssh/patches/patch-an b/security/openssh/patches/patch-scp.c similarity index 77% rename from security/openssh/patches/patch-an rename to security/openssh/patches/patch-scp.c index 19922ec070a..9b2c31f0670 100644 --- a/security/openssh/patches/patch-an +++ b/security/openssh/patches/patch-scp.c @@ -1,6 +1,8 @@ -$NetBSD: patch-an,v 1.11 2010/06/11 20:41:42 martti Exp $ +$NetBSD$ ---- scp.c.orig 2011-02-16 01:25:58.000000000 +0000 +Interix support + +--- scp.c.orig 2013-03-20 01:55:15.000000000 +0000 +++ scp.c @@ -477,7 +477,11 @@ main(int argc, char **argv) argc -= optind; @@ -14,7 +16,7 @@ $NetBSD: patch-an,v 1.11 2010/06/11 20:41:42 martti Exp $ fatal("unknown user %u", (u_int) userid); if (!isatty(STDOUT_FILENO)) -@@ -877,8 +881,10 @@ rsource(char *name, struct stat *statp) +@@ -881,8 +885,10 @@ rsource(char *name, struct stat *statp) return; } while ((dp = readdir(dirp)) != NULL) { @@ -25,7 +27,7 @@ $NetBSD: patch-an,v 1.11 2010/06/11 20:41:42 martti Exp $ if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) continue; if (strlen(name) + 1 + strlen(dp->d_name) >= sizeof(path) - 1) { -@@ -1275,7 +1281,9 @@ okname(char *cp0) +@@ -1279,7 +1285,9 @@ okname(char *cp0) case '\'': case '"': case '`': diff --git a/security/openssh/patches/patch-ao b/security/openssh/patches/patch-session.c similarity index 68% rename from security/openssh/patches/patch-ao rename to security/openssh/patches/patch-session.c index e828729a867..d233c631f07 100644 --- a/security/openssh/patches/patch-ao +++ b/security/openssh/patches/patch-session.c @@ -1,12 +1,10 @@ -$NetBSD: patch-ao,v 1.16 2010/06/11 20:41:42 martti Exp $ +$NetBSD$ -One more replacing 0 with ROOTUID is handled by using SUBST framework -because patch can't handle it when hpn-patch option is enabled. -So, don't simply update this file with mkpatch command. +Interix support ---- session.c.orig 2011-02-16 01:25:58.000000000 +0000 +--- session.c.orig 2013-03-15 00:22:37.000000000 +0000 +++ session.c -@@ -1075,7 +1075,7 @@ read_etc_default_login(char ***env, u_in +@@ -1081,7 +1081,7 @@ read_etc_default_login(char ***env, u_in if (tmpenv == NULL) return; @@ -15,7 +13,7 @@ So, don't simply update this file with mkpatch command. var = child_get_env(tmpenv, "SUPATH"); else var = child_get_env(tmpenv, "PATH"); -@@ -1184,7 +1184,7 @@ do_setup_env(Session *s, const char *she +@@ -1190,7 +1190,7 @@ do_setup_env(Session *s, const char *she # endif /* HAVE_ETC_DEFAULT_LOGIN */ if (path == NULL || *path == '\0') { child_set_env(&env, &envsize, "PATH", @@ -24,7 +22,7 @@ So, don't simply update this file with mkpatch command. SUPERUSER_PATH : _PATH_STDPATH); } # endif /* HAVE_CYGWIN */ -@@ -1298,6 +1298,18 @@ do_setup_env(Session *s, const char *she +@@ -1304,6 +1304,18 @@ do_setup_env(Session *s, const char *she strcmp(pw->pw_dir, "/") ? pw->pw_dir : ""); read_environment_file(&env, &envsize, buf); } @@ -43,7 +41,7 @@ So, don't simply update this file with mkpatch command. if (debug_flag) { /* dump the environment */ fprintf(stderr, "Environment:\n"); -@@ -1488,11 +1500,13 @@ do_setusercontext(struct passwd *pw) +@@ -1494,11 +1506,13 @@ do_setusercontext(struct passwd *pw) perror("setgid"); exit(1); } @@ -57,7 +55,7 @@ So, don't simply update this file with mkpatch command. endgrent(); #endif -@@ -2305,7 +2319,7 @@ session_pty_cleanup2(Session *s) +@@ -2313,7 +2327,7 @@ session_pty_cleanup2(Session *s) record_logout(s->pid, s->tty, s->pw->pw_name); /* Release the pseudo-tty. */ diff --git a/security/openssh/patches/patch-ap b/security/openssh/patches/patch-ssh.c similarity index 69% rename from security/openssh/patches/patch-ap rename to security/openssh/patches/patch-ssh.c index 99fc64e8b2b..2b91a9e90b7 100644 --- a/security/openssh/patches/patch-ap +++ b/security/openssh/patches/patch-ssh.c @@ -1,8 +1,10 @@ -$NetBSD: patch-ap,v 1.11 2010/02/19 10:17:34 martti Exp $ +$NetBSD$ ---- ssh.c.orig 2011-02-16 01:25:58.000000000 +0000 +Interix support + +--- ssh.c.orig 2012-07-06 03:45:01.000000000 +0000 +++ ssh.c -@@ -761,7 +761,7 @@ main(int ac, char **av) +@@ -794,7 +794,7 @@ main(int ac, char **av) if (ssh_connect(host, &hostaddr, options.port, options.address_family, options.connection_attempts, &timeout_ms, options.tcp_keep_alive, diff --git a/security/openssh/patches/patch-av b/security/openssh/patches/patch-sshd.c similarity index 78% rename from security/openssh/patches/patch-av rename to security/openssh/patches/patch-sshd.c index 27d8e5d8f34..77f9920b81f 100644 --- a/security/openssh/patches/patch-av +++ b/security/openssh/patches/patch-sshd.c @@ -1,8 +1,10 @@ -$NetBSD: patch-av,v 1.9 2010/06/11 20:41:42 martti Exp $ +$NetBSD$ ---- sshd.c.orig 2011-02-16 01:25:58.000000000 +0000 +Interix support + +--- sshd.c.orig 2013-02-12 00:04:48.000000000 +0000 +++ sshd.c -@@ -239,7 +239,11 @@ int *startup_pipes = NULL; +@@ -237,7 +237,11 @@ int *startup_pipes = NULL; int startup_pipe; /* in child */ /* variables used for privilege separation */ @@ -12,9 +14,9 @@ $NetBSD: patch-av,v 1.9 2010/06/11 20:41:42 martti Exp $ +int use_privsep = 0; +#endif struct monitor *pmonitor = NULL; + int privsep_is_preauth = 1; - /* global authentication context */ -@@ -618,10 +622,15 @@ privsep_preauth_child(void) +@@ -625,10 +629,15 @@ privsep_preauth_child(void) /* XXX not ready, too heavy after chroot */ do_setusercontext(privsep_pw); #else @@ -30,16 +32,16 @@ $NetBSD: patch-av,v 1.9 2010/06/11 20:41:42 martti Exp $ #endif } -@@ -661,7 +670,7 @@ privsep_preauth(Authctxt *authctxt) - close(pmonitor->m_sendfd); +@@ -688,7 +697,7 @@ privsep_preauth(Authctxt *authctxt) + set_log_handler(mm_log_handler, pmonitor); /* Demote the child */ - if (getuid() == 0 || geteuid() == 0) + if (getuid() == ROOTUID || geteuid() == ROOTUID) privsep_preauth_child(); setproctitle("%s", "[net]"); - } -@@ -676,7 +685,7 @@ privsep_postauth(Authctxt *authctxt) + if (box != NULL) +@@ -706,7 +715,7 @@ privsep_postauth(Authctxt *authctxt) #ifdef DISABLE_FD_PASSING if (1) { #else @@ -48,7 +50,7 @@ $NetBSD: patch-av,v 1.9 2010/06/11 20:41:42 martti Exp $ #endif /* File descriptor passing is broken or root login */ use_privsep = 0; -@@ -1335,8 +1344,10 @@ main(int ac, char **av) +@@ -1363,8 +1372,10 @@ main(int ac, char **av) av = saved_argv; #endif @@ -60,7 +62,7 @@ $NetBSD: patch-av,v 1.9 2010/06/11 20:41:42 martti Exp $ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); -@@ -1690,7 +1701,7 @@ main(int ac, char **av) +@@ -1732,7 +1743,7 @@ main(int ac, char **av) (st.st_uid != getuid () || (st.st_mode & (S_IWGRP|S_IWOTH)) != 0)) #else @@ -69,7 +71,7 @@ $NetBSD: patch-av,v 1.9 2010/06/11 20:41:42 martti Exp $ #endif fatal("%s must be owned by root and not group or " "world-writable.", _PATH_PRIVSEP_CHROOT_DIR); -@@ -1714,8 +1725,10 @@ main(int ac, char **av) +@@ -1755,8 +1766,10 @@ main(int ac, char **av) * to create a file, and we can't control the code in every * module which might be used). */ diff --git a/security/openssh/patches/patch-aq b/security/openssh/patches/patch-sshpty.c similarity index 87% rename from security/openssh/patches/patch-aq rename to security/openssh/patches/patch-sshpty.c index 8d57c393296..3735370b8a7 100644 --- a/security/openssh/patches/patch-aq +++ b/security/openssh/patches/patch-sshpty.c @@ -1,6 +1,8 @@ -$NetBSD: patch-aq,v 1.6 2006/10/31 03:31:20 taca Exp $ +$NetBSD$ ---- sshpty.c.orig 2009-02-12 10:19:21.000000000 +0900 +Replace uid 0 with ROOTUID macro + +--- sshpty.c.orig 2009-02-12 01:19:21.000000000 +0000 +++ sshpty.c @@ -86,7 +86,7 @@ void pty_release(const char *tty) diff --git a/security/openssh/patches/patch-ar b/security/openssh/patches/patch-uidswap.c similarity index 85% rename from security/openssh/patches/patch-ar rename to security/openssh/patches/patch-uidswap.c index 5cbc38a4560..3bd02568f4d 100644 --- a/security/openssh/patches/patch-ar +++ b/security/openssh/patches/patch-uidswap.c @@ -1,6 +1,8 @@ -$NetBSD: patch-ar,v 1.7 2006/10/31 03:31:20 taca Exp $ +$NetBSD$ ---- uidswap.c.orig 2009-01-21 14:04:24.000000000 +0900 +Interix support + +--- uidswap.c.orig 2012-11-05 06:04:37.000000000 +0000 +++ uidswap.c @@ -66,13 +66,13 @@ temporarily_use_uid(struct passwd *pw) (u_int)pw->pw_uid, (u_int)pw->pw_gid, @@ -42,7 +44,7 @@ $NetBSD: patch-ar,v 1.7 2006/10/31 03:31:20 taca Exp $ #ifndef SAVED_IDS_WORK_WITH_SETEUID /* Propagate the privileged gid to all of our gids. */ if (setgid(getegid()) < 0) -@@ -198,8 +202,10 @@ restore_uid(void) +@@ -186,8 +190,10 @@ restore_uid(void) setgid(getgid()); #endif /* SAVED_IDS_WORK_WITH_SETEUID */ @@ -53,7 +55,7 @@ $NetBSD: patch-ar,v 1.7 2006/10/31 03:31:20 taca Exp $ temporarily_use_uid_effective = 0; } -@@ -220,6 +226,10 @@ permanently_set_uid(struct passwd *pw) +@@ -208,6 +214,10 @@ permanently_set_uid(struct passwd *pw) debug("permanently_set_uid: %u/%u", (u_int)pw->pw_uid, (u_int)pw->pw_gid); @@ -61,10 +63,10 @@ $NetBSD: patch-ar,v 1.7 2006/10/31 03:31:20 taca Exp $ + if (setuser(pw->pw_name, NULL, SU_COMPLETE)) + fatal("setuser %u: %.100s", (u_int)pw->pw_gid, strerror(errno)); +#else - #if defined(HAVE_SETRESGID) && !defined(BROKEN_SETRESGID) if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) < 0) fatal("setresgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno)); -@@ -278,6 +288,7 @@ permanently_set_uid(struct passwd *pw) + +@@ -244,6 +254,7 @@ permanently_set_uid(struct passwd *pw) (setuid(old_uid) != -1 || seteuid(old_uid) != -1)) fatal("%s: was able to restore old [e]uid", __func__); #endif -- 2.11.4.GIT