Index: stable/9/lib/libpam/modules/pam_ssh/Makefile =================================================================== --- stable/9/lib/libpam/modules/pam_ssh/Makefile (revision 293399) +++ stable/9/lib/libpam/modules/pam_ssh/Makefile (revision 293400) @@ -1,24 +1,23 @@ # PAM module for SSH # $FreeBSD$ SSHDIR= ${.CURDIR}/../../../../crypto/openssh LIB= pam_ssh MAN= pam_ssh.8 SRCS= pam_ssh.c # required when linking with a dynamic libssh SRCS+= roaming_dummy.c WARNS?= 3 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} LDADD= -lssh -lcrypto -lcrypt USEPRIVATELIB= ssh .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/lib/libpam =================================================================== --- stable/9/lib/libpam (revision 293399) +++ stable/9/lib/libpam (revision 293400) Property changes on: stable/9/lib/libpam ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libpam:r291941 Index: stable/9/secure/lib/libssh/Makefile =================================================================== --- stable/9/secure/lib/libssh/Makefile (revision 293399) +++ stable/9/secure/lib/libssh/Makefile (revision 293400) @@ -1,57 +1,54 @@ # $FreeBSD$ .include LIB= ssh PRIVATELIB= true SHLIB_MAJOR= 5 SRCS= authfd.c authfile.c bufaux.c bufbn.c buffer.c \ canohost.c channels.c cipher.c cipher-aes.c \ cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \ compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \ log.c match.c md-sha256.c moduli.c nchan.c packet.c \ readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \ atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \ monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \ kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \ msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \ ssh-pkcs11.c krl.c smult_curve25519_ref.c \ kexc25519.c kexc25519c.c poly1305.c chacha.c cipher-chachapoly.c \ ssh-ed25519.c digest-openssl.c hmac.c \ sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c # gss-genr.c should be in $SRCS but causes linking problems, so it is # compiled directly into sshd instead. # Portability layer SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \ glob.c openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \ vis.c xcrypt.c xmmap.c getrrsetbyname.c SRCS+= getrrsetbyname.c CFLAGS+= -I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif NO_LINT= DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ} LDADD+= -lcrypto -lcrypt -lz .include .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif Index: stable/9/secure/lib/libssh =================================================================== --- stable/9/secure/lib/libssh (revision 293399) +++ stable/9/secure/lib/libssh (revision 293400) Property changes on: stable/9/secure/lib/libssh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/secure/lib/libssh:r291941 Index: stable/9/secure/libexec/sftp-server/Makefile =================================================================== --- stable/9/secure/libexec/sftp-server/Makefile (revision 293399) +++ stable/9/secure/libexec/sftp-server/Makefile (revision 293400) @@ -1,26 +1,25 @@ # $FreeBSD$ .include PROG= sftp-server SRCS= sftp-server.c sftp-common.c sftp-server-main.c MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/libexec/sftp-server =================================================================== --- stable/9/secure/libexec/sftp-server (revision 293399) +++ stable/9/secure/libexec/sftp-server (revision 293400) Property changes on: stable/9/secure/libexec/sftp-server ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /user/ngie/more-tests/secure/libexec/sftp-server:r281589,281595 Merged /head/secure/libexec/sftp-server:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /projects/building-blocks/secure/libexec/sftp-server:r275142-275143,275306-275307,275556,275558,277670,277673 Merged /projects/largeSMP/secure/libexec/sftp-server:r221273-222812,222815-223757 Merged /stable/10/secure/libexec/sftp-server:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /projects/head_mfi/secure/libexec/sftp-server:r233621 Merged /user/ngie/more-tests2/secure/libexec/sftp-server:r289226-289227 Merged /vendor/resolver/dist/secure/libexec/sftp-server:r1540-186085 Merged /projects/clang380-import/secure/libexec/sftp-server:r293006,293013 Merged /projects/quota64/secure/libexec/sftp-server:r184125-207707 Index: stable/9/secure/libexec/ssh-keysign/Makefile =================================================================== --- stable/9/secure/libexec/ssh-keysign/Makefile (revision 293399) +++ stable/9/secure/libexec/ssh-keysign/Makefile (revision 293400) @@ -1,22 +1,21 @@ # $FreeBSD$ .include PROG= ssh-keysign SRCS= ssh-keysign.c roaming_dummy.c readconf.c MAN= ssh-keysign.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h BINMODE=4555 DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/libexec/ssh-keysign =================================================================== --- stable/9/secure/libexec/ssh-keysign (revision 293399) +++ stable/9/secure/libexec/ssh-keysign (revision 293400) Property changes on: stable/9/secure/libexec/ssh-keysign ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/secure/libexec/ssh-keysign:r291941 Index: stable/9/secure/libexec/ssh-pkcs11-helper/Makefile =================================================================== --- stable/9/secure/libexec/ssh-pkcs11-helper/Makefile (revision 293399) +++ stable/9/secure/libexec/ssh-pkcs11-helper/Makefile (revision 293400) @@ -1,26 +1,25 @@ # $FreeBSD$ .include PROG= ssh-pkcs11-helper SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c MAN= ssh-pkcs11-helper.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/libexec/ssh-pkcs11-helper =================================================================== --- stable/9/secure/libexec/ssh-pkcs11-helper (revision 293399) +++ stable/9/secure/libexec/ssh-pkcs11-helper (revision 293400) Property changes on: stable/9/secure/libexec/ssh-pkcs11-helper ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /vendor/resolver/dist/secure/libexec/ssh-pkcs11-helper:r1540-186085 Merged /projects/largeSMP/secure/libexec/ssh-pkcs11-helper:r221273-222812,222815-223757 Merged /projects/clang380-import/secure/libexec/ssh-pkcs11-helper:r293006,293013 Merged /projects/quota64/secure/libexec/ssh-pkcs11-helper:r184125-207707 Merged /stable/10/secure/libexec/ssh-pkcs11-helper:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /user/ngie/more-tests/secure/libexec/ssh-pkcs11-helper:r281589,281595 Merged /projects/head_mfi/secure/libexec/ssh-pkcs11-helper:r233621 Merged /head/secure/libexec/ssh-pkcs11-helper:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /user/ngie/more-tests2/secure/libexec/ssh-pkcs11-helper:r289226-289227 Merged /projects/building-blocks/secure/libexec/ssh-pkcs11-helper:r275142-275143,275306-275307,275556,275558,277670,277673 Index: stable/9/secure/usr.bin/scp/Makefile =================================================================== --- stable/9/secure/usr.bin/scp/Makefile (revision 293399) +++ stable/9/secure/usr.bin/scp/Makefile (revision 293400) @@ -1,25 +1,24 @@ # $FreeBSD$ .include PROG= scp SRCS= scp.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/usr.bin/scp =================================================================== --- stable/9/secure/usr.bin/scp (revision 293399) +++ stable/9/secure/usr.bin/scp (revision 293400) Property changes on: stable/9/secure/usr.bin/scp ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /projects/clang380-import/secure/usr.bin/scp:r293006,293013 Merged /projects/quota64/secure/usr.bin/scp:r184125-207707 Merged /user/ngie/more-tests/secure/usr.bin/scp:r281589,281595 Merged /user/ngie/more-tests2/secure/usr.bin/scp:r289226-289227 Merged /head/secure/usr.bin/scp:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /projects/building-blocks/secure/usr.bin/scp:r275142-275143,275306-275307,275556,275558,277670,277673 Merged /projects/largeSMP/secure/usr.bin/scp:r221273-222812,222815-223757 Merged /stable/10/secure/usr.bin/scp:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /vendor/resolver/dist/secure/usr.bin/scp:r1540-186085 Merged /projects/head_mfi/secure/usr.bin/scp:r233621 Index: stable/9/secure/usr.bin/sftp/Makefile =================================================================== --- stable/9/secure/usr.bin/sftp/Makefile (revision 293399) +++ stable/9/secure/usr.bin/sftp/Makefile (revision 293400) @@ -1,25 +1,24 @@ # $FreeBSD$ .include PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} ${LIBEDIT} ${LIBNCURSES} LDADD= -lssh -ledit -lncurses USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/usr.bin/sftp =================================================================== --- stable/9/secure/usr.bin/sftp (revision 293399) +++ stable/9/secure/usr.bin/sftp (revision 293400) Property changes on: stable/9/secure/usr.bin/sftp ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /projects/largeSMP/secure/usr.bin/sftp:r221273-222812,222815-223757 Merged /stable/10/secure/usr.bin/sftp:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /projects/clang380-import/secure/usr.bin/sftp:r293006,293013 Merged /projects/quota64/secure/usr.bin/sftp:r184125-207707 Merged /projects/head_mfi/secure/usr.bin/sftp:r233621 Merged /user/ngie/more-tests/secure/usr.bin/sftp:r281589,281595 Merged /user/ngie/more-tests2/secure/usr.bin/sftp:r289226-289227 Merged /head/secure/usr.bin/sftp:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /projects/building-blocks/secure/usr.bin/sftp:r275142-275143,275306-275307,275556,275558,277670,277673 Merged /vendor/resolver/dist/secure/usr.bin/sftp:r1540-186085 Index: stable/9/secure/usr.bin/ssh/Makefile =================================================================== --- stable/9/secure/usr.bin/ssh/Makefile (revision 293399) +++ stable/9/secure/usr.bin/ssh/Makefile (revision 293400) @@ -1,46 +1,44 @@ # $FreeBSD$ .include PROG= ssh -CFLAGS+=-I${SSHDIR} -include ssh_namespace.h LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 SRCS= ssh.c readconf.c clientloop.c sshtty.c \ sshconnect.c sshconnect1.c sshconnect2.c mux.c \ roaming_common.c roaming_client.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c +CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h + DPADD= ${LIBSSH} ${LIBUTIL} LDADD= -lssh -lutil USEPRIVATELIB= ssh .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif Index: stable/9/secure/usr.bin/ssh =================================================================== --- stable/9/secure/usr.bin/ssh (revision 293399) +++ stable/9/secure/usr.bin/ssh (revision 293400) Property changes on: stable/9/secure/usr.bin/ssh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/secure/usr.bin/ssh:r291941 Index: stable/9/secure/usr.bin/ssh-add/Makefile =================================================================== --- stable/9/secure/usr.bin/ssh-add/Makefile (revision 293399) +++ stable/9/secure/usr.bin/ssh-add/Makefile (revision 293400) @@ -1,25 +1,24 @@ # $FreeBSD$ .include PROG= ssh-add SRCS+= ssh-add.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/usr.bin/ssh-add =================================================================== --- stable/9/secure/usr.bin/ssh-add (revision 293399) +++ stable/9/secure/usr.bin/ssh-add (revision 293400) Property changes on: stable/9/secure/usr.bin/ssh-add ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /vendor/resolver/dist/secure/usr.bin/ssh-add:r1540-186085 Merged /projects/clang380-import/secure/usr.bin/ssh-add:r293006,293013 Merged /projects/quota64/secure/usr.bin/ssh-add:r184125-207707 Merged /projects/largeSMP/secure/usr.bin/ssh-add:r221273-222812,222815-223757 Merged /user/ngie/more-tests/secure/usr.bin/ssh-add:r281589,281595 Merged /stable/10/secure/usr.bin/ssh-add:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /head/secure/usr.bin/ssh-add:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /projects/head_mfi/secure/usr.bin/ssh-add:r233621 Merged /projects/building-blocks/secure/usr.bin/ssh-add:r275142-275143,275306-275307,275556,275558,277670,277673 Merged /user/ngie/more-tests2/secure/usr.bin/ssh-add:r289226-289227 Index: stable/9/secure/usr.bin/ssh-agent/Makefile =================================================================== --- stable/9/secure/usr.bin/ssh-agent/Makefile (revision 293399) +++ stable/9/secure/usr.bin/ssh-agent/Makefile (revision 293400) @@ -1,25 +1,24 @@ # $FreeBSD$ .include PROG= ssh-agent SRCS= ssh-agent.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/usr.bin/ssh-agent =================================================================== --- stable/9/secure/usr.bin/ssh-agent (revision 293399) +++ stable/9/secure/usr.bin/ssh-agent (revision 293400) Property changes on: stable/9/secure/usr.bin/ssh-agent ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /user/ngie/more-tests2/secure/usr.bin/ssh-agent:r289226-289227 Merged /vendor/resolver/dist/secure/usr.bin/ssh-agent:r1540-186085 Merged /projects/clang380-import/secure/usr.bin/ssh-agent:r293006,293013 Merged /projects/quota64/secure/usr.bin/ssh-agent:r184125-207707 Merged /projects/largeSMP/secure/usr.bin/ssh-agent:r221273-222812,222815-223757 Merged /user/ngie/more-tests/secure/usr.bin/ssh-agent:r281589,281595 Merged /stable/10/secure/usr.bin/ssh-agent:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /head/secure/usr.bin/ssh-agent:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /projects/head_mfi/secure/usr.bin/ssh-agent:r233621 Merged /projects/building-blocks/secure/usr.bin/ssh-agent:r275142-275143,275306-275307,275556,275558,277670,277673 Index: stable/9/secure/usr.bin/ssh-keygen/Makefile =================================================================== --- stable/9/secure/usr.bin/ssh-keygen/Makefile (revision 293399) +++ stable/9/secure/usr.bin/ssh-keygen/Makefile (revision 293400) @@ -1,25 +1,24 @@ # $FreeBSD$ .include PROG= ssh-keygen SRCS= ssh-keygen.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if !defined(NO_SHARED) # required when linking with a dynamic libssh SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/usr.bin/ssh-keygen =================================================================== --- stable/9/secure/usr.bin/ssh-keygen (revision 293399) +++ stable/9/secure/usr.bin/ssh-keygen (revision 293400) Property changes on: stable/9/secure/usr.bin/ssh-keygen ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /projects/clang380-import/secure/usr.bin/ssh-keygen:r293006,293013 Merged /projects/quota64/secure/usr.bin/ssh-keygen:r184125-207707 Merged /user/ngie/more-tests/secure/usr.bin/ssh-keygen:r281589,281595 Merged /projects/largeSMP/secure/usr.bin/ssh-keygen:r221273-222812,222815-223757 Merged /head/secure/usr.bin/ssh-keygen:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /stable/10/secure/usr.bin/ssh-keygen:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /projects/building-blocks/secure/usr.bin/ssh-keygen:r275142-275143,275306-275307,275556,275558,277670,277673 Merged /projects/head_mfi/secure/usr.bin/ssh-keygen:r233621 Merged /user/ngie/more-tests2/secure/usr.bin/ssh-keygen:r289226-289227 Merged /vendor/resolver/dist/secure/usr.bin/ssh-keygen:r1540-186085 Index: stable/9/secure/usr.bin/ssh-keyscan/Makefile =================================================================== --- stable/9/secure/usr.bin/ssh-keyscan/Makefile (revision 293399) +++ stable/9/secure/usr.bin/ssh-keyscan/Makefile (revision 293400) @@ -1,20 +1,19 @@ # $FreeBSD$ .include PROG= ssh-keyscan SRCS= ssh-keyscan.c roaming_dummy.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h DPADD= ${LIBSSH} LDADD= -lssh USEPRIVATELIB= ssh DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: stable/9/secure/usr.bin/ssh-keyscan =================================================================== --- stable/9/secure/usr.bin/ssh-keyscan (revision 293399) +++ stable/9/secure/usr.bin/ssh-keyscan (revision 293400) Property changes on: stable/9/secure/usr.bin/ssh-keyscan ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,10 ## Merged /projects/largeSMP/secure/usr.bin/ssh-keyscan:r221273-222812,222815-223757 Merged /stable/10/secure/usr.bin/ssh-keyscan:r265922,275213,275501,275508-275509,276311,276991,278052,278067,278190-278191,278202,278244,278554,278556,278569,278574-278575,278710,278713,278717,279495,279505-279506,280340-280341,280356,280419-280420,280422,280427,281951,281954,281968-281969,282851,283016,283054,286033-286034,286636-286637,289949,289954,289956,289963,289970,289972,289974,289976,289986,289989,290246,290385,290576,290580,290582,290587,290589,290591,290595,290597,290599,290877,290879,290882,290884-290885,290890,290899,291042,291185,291294,291336,291572-291573,291602,291754,291758-291759,291761,291871,291980-291981,292136,292138,292140,292142,292144,292150,292170,292251,292280,292395,292430,292481,292652,292769,292795,292799,292845,292855,292879,292975,292998,293003,293025,293138,293141,293246,293257 Merged /projects/head_mfi/secure/usr.bin/ssh-keyscan:r233621 Merged /user/ngie/more-tests2/secure/usr.bin/ssh-keyscan:r289226-289227 Merged /vendor/resolver/dist/secure/usr.bin/ssh-keyscan:r1540-186085 Merged /projects/clang380-import/secure/usr.bin/ssh-keyscan:r293006,293013 Merged /projects/quota64/secure/usr.bin/ssh-keyscan:r184125-207707 Merged /user/ngie/more-tests/secure/usr.bin/ssh-keyscan:r281589,281595 Merged /head/secure/usr.bin/ssh-keyscan:r226343,226347-226349,226353,226377,226388,226602,226702,226785,227006,227518,227524,227526,228099,228191,228193,228199,228371,228475,228487,228761,228879,228993,229067,229437,229809,229997,230127,230587,230804,231544,231564,232274,233422,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237528,237531,237568,237574,237625,237794,238051,238741,238896-238897,238933,239133,239347-239348,240295-240296,240336,241002,241149,241167-241168,241182,241241-241243,241565,241972,241974,242137-242138,242202,242998,243147,243346,243617,243798,243800,244008,244015,244039,244058,244673,245171,245848,245952,246256,246546,247285,247527,248370,248388,248690,248706,248708,248752,248983,249373,249526,249563,249600,249658,249701,249807,249893,250243,250423,250487,250550,250566,250574,250667,250812,250823,250883,251053,251212,251223,251314,251368,251382,251480,251561-251562,251612,251810,252348,252363,252397,252503,252797-252800,252987,253325,253333,253564,253725-253726,253814,253992,254252,254265,254407,254941,254960,254970,255043,255048,255107,255206,255307,255369,255371,255376,255384-255386,255393,255413,255422,255460,255590,255765-255767,255774,255829,255908,256126,256181,256321-256323,256325,256330-256331,256333,256335,256338,256343,256345,256347-256348,256391,256448,256489,256540-256541,256544,256547,256549,256551,256553,256603,256606-256607,256610,256642,256710,256836,256895,256995,257029,257054,257077,257650,257755-257756,257780-257785,257787-257793,257821,257824,257826-257830,257842-257845,257872,257939,257946,257954,258017,258021,258029,258081,258115,258132,258137-258138,258143,258157,258168,258170,258179,258204-258207,258245,258263,258266,258269-258270,258311,258321,258355,258360,258400-258401,258406-258407,258411,258418,258428-258430,258439,258445,258458,258501,258507,258530,258573,258578,258580-258581,258588-258590,258592,258651,258683,258712,258727-258728,258731,258748,258785,258817,258826,258871,258904,258927,258943,259005,259022,259054,259092,259108,259115,259143-259144,259148,259168,259197,259240,259247,259276,259339,259468-259470,259472,259474,259476-259478,259480-259481,259525,259529,259544-259547,259555,259558,259570,259572,259597-259598,259632,259649,259655,259659,259662,259666,259686,259696,259765,259780,259812,259828,259841,259873,259877,259920,259939,259944,260014,260031,260036,260097,260099,260219,260229,260236,260258,260260-260262,260267,260310,260332,260361,260367,260390,260407,260459,260486,260509,260542,260545,260648,260830,260844,260866,260874,260883,260894,260899-260900,260913,260949,260996,261042,261068,261118,261124,261175,261283,261320,261330,261449,261499,261538,261604,261608-261609,261719,261801,261832-261834,261960,262142,262277,262334,262465,262488,262530,262553,262575,262623,262667,262678,262741,262782,262867,262886,262895-262902,262904,262908-262910,262912,262982,262984,263062,263107,263118,263133-263137,263139,263141,263144-263150,263160,263249,263312-263313,263320,263429,263691,263712,263779,263811,263892,263979,263998,264020,264040,264191,264243,264313,264318,264341,264350,264406,264448,264460,264488,264581,264610,264691,264744,264826-264828,264834,264840-264841,264887,264905,265054,265092,265097,265150,265159,265201-265202,265232,265236-265237,265260,265329,265411,265477,265534,265555,265593,265703,265829,265842,265926,266120-266121,266297,266538,266547,266587,266630,266675,266860,266895,266930,266959,267148,267221,267223,267228,267232,267239,267278,267351,267362,267392,267429,267441,267479,267986,268419-268420,268854,269228,269326,269387,269985,270028,270117,270145,270180,270391,270423,270433,270510,270519,270522,270844,271401,271407,271604,271616,271644,271726-271728,271796,271892-271893,271895,272043,272059,272756,273066,273328,273381-273382,273405,273434,273627-273628,274325,274364-274365,274411,274477,274744,274806,275098,275101,275368,275401,275475,275503,275557,275588-275589,275651,275687,275692,275747,275760,275772,275867,276052-276053,276417,276564,276654,276804,276806,276906,276983,277185,277217,277272,277419,277541,277663,277666,277674,277676-277678,277685-277687,277695,277725,277730-277734,277736-277740,277758,277939,277944,278010,278016,278053,278111,278135,278182,278192-278193,278202,278204,278249,278251,278282,278362,278364,278379,278466,278860,278891,278932,279197-279198,279393,279598,279642,279757-279758,279776,279963,279980,280090,280166,280172,280286,280347,280357,280475,280685-280687,280702,280756-280758,280822,280849,280864,280893-280895,280915-280916,281015-281016,281199,281698,281738,281765,281769,281789,281857,281875,281923-281924,281928,282062,282072,282075,282097,282115,282152,282201,282261,282408,282415,282747,282881,283018,283144,283245,283254,283542,283578,283870,284167,284335,284346,284470,284527-284528,284608,284732,284739,284741,284858,284864,285064,285140,285169-285170,285219,285340,285435,285973,286304,286515,286519,286699,286702,286719,286733,286798,286827,286981,287098,287541,287654,287747,287819,287821,288006,288031-288033,288099,288295,288298,288304-288305,288339,288910,288953,289203,289225,289229,289332,289450-289451,289601,289635,289687,289693,289764,289783,289896,289899,289913,289916,290163,290179-290180,290182,290190,290251,290253,290259-290260,290262,290264,290268,290601,290645,290659-290660,290855,291047,291061,291166-291167,291296,291358-291359,291362-291363,291753,291832-291838,291941,291979,291982-291984,292004,292013,292048,292153,292250,292316,292491-292493,292495-292496,292530-292533,292545-292546,292569,292585,292640-292641,292647,292650-292651,292710,292815,292884,293014-293015 Merged /projects/building-blocks/secure/usr.bin/ssh-keyscan:r275142-275143,275306-275307,275556,275558,277670,277673 Index: stable/9/secure/usr.sbin/sshd/Makefile =================================================================== --- stable/9/secure/usr.sbin/sshd/Makefile (revision 293399) +++ stable/9/secure/usr.sbin/sshd/Makefile (revision 293400) @@ -1,74 +1,71 @@ # $FreeBSD$ .include PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ audit.c audit-bsm.c audit-linux.c platform.c \ sshpty.c sshlogin.c servconf.c serverloop.c \ auth.c auth1.c auth2.c auth-options.c session.c \ auth-chall.c auth2-chall.c groupaccess.c \ auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ auth2-none.c auth2-passwd.c auth2-pubkey.c \ monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c kexecdhs.c \ kexc25519s.c auth-krb5.c \ auth2-gss.c gss-serv.c gss-serv-krb5.c \ loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \ sftp-server.c sftp-common.c \ roaming_common.c roaming_serv.c \ sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \ sandbox-seccomp-filter.c sandbox-capsicum.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} LDADD= -lssh -lutil -lwrap ${MINUSLPAM} USEPRIVATELIB= ssh .if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR DPADD+= ${LIBBSM} LDADD+= -lbsm .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +SRCS+= krb5_config.h DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBROKEN} LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ -lcom_err -lroken .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz # Fix the order of NEEDED entries for libthr and libc. The libthr # needs to interpose libc symbols, leaving the libthr loading as # dependency of krb causes reversed order and broken interposing. Put # the threading library last on the linker command line, just before # the -lc added by a compiler driver. .if ${MK_KERBEROS_SUPPORT} != "no" DPADD+= ${LIBPTHREAD} LDADD+= -lpthread .endif .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif .include .PATH: ${SSHDIR} - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif Index: stable/9/secure/usr.sbin/sshd =================================================================== --- stable/9/secure/usr.sbin/sshd (revision 293399) +++ stable/9/secure/usr.sbin/sshd (revision 293400) Property changes on: stable/9/secure/usr.sbin/sshd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/secure/usr.sbin/sshd:r291941