Windows: Remove old ssl fix
This commit is contained in:
		
							parent
							
								
									ac5bfe2d7c
								
							
						
					
					
						commit
						5ecdfbee5c
					
				
					 2 changed files with 0 additions and 15 deletions
				
			
		
							
								
								
									
										13
									
								
								win/_base.sh
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								win/_base.sh
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -302,19 +302,6 @@ function cleanup_install {
 | 
			
		|||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function download_ssl_libs {
 | 
			
		||||
    # Python needs these ssl libs but msys does not provide them
 | 
			
		||||
    curl -o "${BUILD_ROOT}"/ssl.zip https://gajim.org/downloads/snap/win/build/ssl.zip
 | 
			
		||||
    7z x -o"${MINGW_ROOT}"/bin "${BUILD_ROOT}"/ssl.zip
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function move_ssl_libs {
 | 
			
		||||
    # Pythons ssl module searches in that path for these dlls, if they are not there
 | 
			
		||||
    # C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there
 | 
			
		||||
    cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/libeay32.dll
 | 
			
		||||
    cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/ssleay32.dll
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function build_installer {
 | 
			
		||||
    (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi)
 | 
			
		||||
    (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,8 +17,6 @@ function main {
 | 
			
		|||
    install_deps
 | 
			
		||||
    install_gajim
 | 
			
		||||
    cleanup_install
 | 
			
		||||
    download_ssl_libs
 | 
			
		||||
    move_ssl_libs
 | 
			
		||||
    build_installer
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue