Browse Source

Fix broken pyopenssl and debian references

servefile used to hint to install pyssl when ssl support was missing.
This is utterly wrong, because the package is named pyopenssl - as
stated in setup.py. Installing pyssl will not only not lead to ssl
support, but also install a random package that we do not want.

Also, since python2 has genereally been deprecated (though it is still
support by servefile for now) we hint for the python3 package of
pyopenssl instead of the python2 version. I thought about building a
version detection and print the right package, depending if the user is
using python2 or 3, but I deemed it not being worth it.

Fixes #7 (GitHub)
Sebastian Lohff 8 months ago
parent
commit
e31c8fb016
3 changed files with 5 additions and 4 deletions
  1. 1
    0
      ChangeLog
  2. 2
    2
      servefile.1
  3. 2
    2
      servefile/servefile.py

+ 1
- 0
ChangeLog View File

@@ -6,6 +6,7 @@ Unreleased
6 6
 ----------
7 7
 
8 8
 	* fixed bug where exception was shown on transmission abort with python3
9
+	* fixed wrong/outdated pyopenssl package names
9 10
 
10 11
 
11 12
 2020-10-30 v0.5.1

+ 2
- 2
servefile.1 View File

@@ -28,8 +28,8 @@ In upload mode with \fB\-u\fR servefile creates a directory and saves all
28 28
 uploaded files into that directory. When uploading with curl or wget the
29 29
 filename is extracted from the path part of the url used for the upload.
30 30
 
31
-For SSL support python-openssl (pyssl) needs to be installed. If no key and
32
-cert is given, servefile will generate a key pair for you and display its
31
+For SSL support pyopenssl (python3-openssl) needs to be installed. If no key
32
+and cert is given, servefile will generate a key pair for you and display its
33 33
 fingerprint.
34 34
 
35 35
 In \fB--tar\fR mode the given file or directory will be packed on (each)

+ 2
- 2
servefile/servefile.py View File

@@ -858,7 +858,7 @@ class ServeFile():
858 858
 		return None
859 859
 
860 860
 	def setSSLKeys(self, cert, key):
861
-		""" Set SSL cert/key. Can be either path to file or pyssl X509/PKey object. """
861
+		""" Set SSL cert/key. Can be either path to file or pyopenssl X509/PKey object. """
862 862
 		self.cert = cert
863 863
 		self.key = key
864 864
 
@@ -1167,7 +1167,7 @@ def main():
1167 1167
 			sys.exit(1)
1168 1168
 
1169 1169
 	if args.ssl and not HAVE_SSL:
1170
-		print("Error: SSL is not available, please install pyssl (python-openssl).")
1170
+		print("Error: SSL is not available, please install pyopenssl (python3-openssl).")
1171 1171
 		sys.exit(1)
1172 1172
 
1173 1173
 	if args.cert and not args.key:

Loading…
Cancel
Save