View | Details | Raw Unified | Return to bug 250559
Collapse All | Expand All

(-)../openssh-portable-moduli-patch/Makefile (-2 / +6 lines)
Lines 3-9 Link Here
3 

          3
          

        

        

          4
          
PORTNAME=	openssh

          4
          
PORTNAME=	openssh

        

        

          5
          
DISTVERSION=	8.2p1

          5
          
DISTVERSION=	8.2p1

        

          
            

              6
              
PORTREVISION=	1


              6
              
PORTREVISION=	2

            

        

          7
          
PORTEPOCH=	1

          7
          
PORTEPOCH=	1

        

        

          8
          
CATEGORIES=	security

          8
          
CATEGORIES=	security

        

        

          9
          
MASTER_SITES=	OPENBSD/OpenSSH/portable

          9
          
MASTER_SITES=	OPENBSD/OpenSSH/portable

        

  

    
      
            Lines 191-198
          
      
      
        Link Here
      
    
  

        

          191
          
	@${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h

          191
          
	@${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h

        

        

          192
          

          192
          

        

        

          193
          
post-install:

          193
          
post-install:

        

            

              
              
              194
              
	${MV} ${STAGEDIR}${ETCDIR}/moduli \

            

            

              195
              
	    ${STAGEDIR}${ETCDIR}/moduli.sample

            

            

              196
              
	${RLN} ${STAGEDIR}${ETCDIR}/moduli.sample \

            

            

              197
              
	    ${STAGEDIR}${ETCDIR}/moduli

            

        

          194
          
	${MV} ${STAGEDIR}${ETCDIR}/ssh_config \

          198
          
	${MV} ${STAGEDIR}${ETCDIR}/ssh_config \

        

          
            

              195
              
	    ${STAGEDIR}${ETCDIR}//ssh_config.sample


              199
              
	    ${STAGEDIR}${ETCDIR}/ssh_config.sample

            

        

          196
          
	${MV} ${STAGEDIR}${ETCDIR}/sshd_config \

          200
          
	${MV} ${STAGEDIR}${ETCDIR}/sshd_config \

        

        

          197
          
	    ${STAGEDIR}${ETCDIR}/sshd_config.sample

          201
          
	    ${STAGEDIR}${ETCDIR}/sshd_config.sample

        

        

          198
          
.if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}

          202
          
.if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}

        



(-)../openssh-portable-moduli-patch/pkg-plist
      (-1 / +1 lines)




  

    
      
            Lines 5-11
          
      
      
        Link Here
      
    
  

        

          5
          
bin/ssh-agent

          5
          
bin/ssh-agent

        

        

          6
          
bin/ssh-keygen

          6
          
bin/ssh-keygen

        

        

          7
          
bin/ssh-keyscan

          7
          
bin/ssh-keyscan

        

          
            

              8
              
%%ETCDIR%%/moduli


              8
              
@sample %%ETCDIR%%/moduli.sample

            

        

          9
          
@sample %%ETCDIR%%/ssh_config.sample

          9
          
@sample %%ETCDIR%%/ssh_config.sample

        

        

          10
          
@sample %%ETCDIR%%/sshd_config.sample

          10
          
@sample %%ETCDIR%%/sshd_config.sample

        

        

          11
          
@postexec if [ -f %D/%%ETCDIR%%/ssh_host_ecdsa_key ] && grep -q DSA %D/%%ETCDIR%%/ssh_host_ecdsa_key; then echo; echo "\!/ Warning \!/"; echo; echo "Your %D/%%ETCDIR%%/ssh_host_ecdsa_key is not a valid ECDSA key. It is incorrectly"; echo "a DSA key due to a bug fixed in 2012 in the security/openssh-portable port."; echo; echo "Regenerate a proper one with: rm -f %D/%%ETCDIR%%/ssh_host_ecdsa_key*; service openssh restart"; echo; echo "Clients should not see any key change warning since the ECDSA was not valid and was not actually"; echo "used by the server."; echo; echo "\!/ Warning \!/"; fi

          11
          
@postexec if [ -f %D/%%ETCDIR%%/ssh_host_ecdsa_key ] && grep -q DSA %D/%%ETCDIR%%/ssh_host_ecdsa_key; then echo; echo "\!/ Warning \!/"; echo; echo "Your %D/%%ETCDIR%%/ssh_host_ecdsa_key is not a valid ECDSA key. It is incorrectly"; echo "a DSA key due to a bug fixed in 2012 in the security/openssh-portable port."; echo; echo "Regenerate a proper one with: rm -f %D/%%ETCDIR%%/ssh_host_ecdsa_key*; service openssh restart"; echo; echo "Clients should not see any key change warning since the ECDSA was not valid and was not actually"; echo "used by the server."; echo; echo "\!/ Warning \!/"; fi

        






  

  Return to bug 250559