diff --git a/pkgs/build.sh b/pkgs/build.sh index 31ce7fa5..107ebf98 100755 --- a/pkgs/build.sh +++ b/pkgs/build.sh @@ -41,7 +41,7 @@ description: | Fully featured and highly configurable SFTP server SFTPGo has optional FTP/S and WebDAV support. It can serve local filesystem, S3 (Compatible) Object Storage, - Google Cloud Storage and Azure Blob Storage. + Google Cloud Storage, Azure Blob Storage, SFTP. vendor: "SFTPGo" homepage: "https://github.com/drakkan/sftpgo" license: "GPL-3.0" diff --git a/pkgs/debian/changelog b/pkgs/debian/changelog index c4333800..56cd0573 100644 --- a/pkgs/debian/changelog +++ b/pkgs/debian/changelog @@ -1,3 +1,9 @@ +sftpgo (2.0.0-1ppa1) bionic; urgency=medium + + * New upstream release. + + -- Nicola Murino Sat, 06 Feb 2021 11:05:48 +0100 + sftpgo (1.2.2-1ppa1) bionic; urgency=medium * New upstream release. diff --git a/pkgs/debian/control b/pkgs/debian/control index b75dc5f9..2302d6be 100644 --- a/pkgs/debian/control +++ b/pkgs/debian/control @@ -11,8 +11,7 @@ Package: sftpgo Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: bash-completion, mime-support -Suggests: python3-requests, python3-pygments Description: Fully featured and highly configurable SFTP server SFTPGo has optional FTP/S and WebDAV support. It can serve local filesystem, S3 (Compatible) Object Storage, - Google Cloud Storage and Azure Blob Storage. + Google Cloud Storage, Azure Blob Storage, SFTP. diff --git a/pkgs/debian/patches/config.diff b/pkgs/debian/patches/config.diff index ebad4172..c8037ff4 100644 --- a/pkgs/debian/patches/config.diff +++ b/pkgs/debian/patches/config.diff @@ -2,17 +2,17 @@ Index: sftpgo/sftpgo.json =================================================================== --- sftpgo.orig/sftpgo.json +++ sftpgo/sftpgo.json -@@ -74,7 +74,7 @@ +@@ -113,7 +113,7 @@ }, "data_provider": { "driver": "sqlite", - "name": "sftpgo.db", + "name": "/var/lib/sftpgo/sftpgo.db", "host": "", - "port": 5432, + "port": 0, "username": "", -@@ -85,14 +85,14 @@ - "manage_users": 1, +@@ -123,14 +123,14 @@ + "sql_tables_prefix": "", "track_quota": 2, "pool_size": 0, - "users_base_dir": "", @@ -28,16 +28,16 @@ Index: sftpgo/sftpgo.json "prefer_database_credentials": false, "pre_login_hook": "", "post_login_hook": "", -@@ -111,9 +111,9 @@ - "httpd": { - "bind_port": 8080, - "bind_address": "127.0.0.1", +@@ -156,9 +156,9 @@ + "client_auth_type": 0 + } + ], - "templates_path": "templates", - "static_files_path": "static", - "backups_path": "backups", + "templates_path": "/usr/share/sftpgo/templates", + "static_files_path": "/usr/share/sftpgo/static", + "backups_path": "/srv/sftpgo/backups", - "auth_user_file": "", "certificate_file": "", - "certificate_key_file": "" + "certificate_key_file": "", + "ca_certificates": [], diff --git a/pkgs/debian/patches/python3.diff b/pkgs/debian/patches/python3.diff deleted file mode 100644 index c3eca933..00000000 --- a/pkgs/debian/patches/python3.diff +++ /dev/null @@ -1,10 +0,0 @@ -Index: sftpgo/examples/rest-api-cli/sftpgo_api_cli -=================================================================== ---- sftpgo.orig/examples/rest-api-cli/sftpgo_api_cli -+++ sftpgo/examples/rest-api-cli/sftpgo_api_cli -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import argparse - import base64 - from datetime import datetime diff --git a/pkgs/debian/patches/series b/pkgs/debian/patches/series index 7f85e75b..8d319f27 100644 --- a/pkgs/debian/patches/series +++ b/pkgs/debian/patches/series @@ -1,2 +1 @@ config.diff -python3.diff diff --git a/pkgs/debian/postinst b/pkgs/debian/postinst index 5f2a4f48..84f16902 100644 --- a/pkgs/debian/postinst +++ b/pkgs/debian/postinst @@ -26,7 +26,6 @@ if [ "$1" = "configure" ]; then chown -R sftpgo:sftpgo /etc/sftpgo /var/lib/sftpgo /srv/sftpgo chmod 750 /etc/sftpgo /var/lib/sftpgo /srv/sftpgo chmod 640 /etc/sftpgo/sftpgo.json - echo "Please be sure to have the python3-requests package installed if you want to use the REST API CLI" fi # we added /srv/sftpgo after 1.1.0, we should check if we are upgrading diff --git a/pkgs/scripts/deb/postinstall.sh b/pkgs/scripts/deb/postinstall.sh index 6d42cbd9..0deb8a5f 100644 --- a/pkgs/scripts/deb/postinstall.sh +++ b/pkgs/scripts/deb/postinstall.sh @@ -26,7 +26,6 @@ if [ "$1" = "configure" ]; then chown -R sftpgo:sftpgo /etc/sftpgo /var/lib/sftpgo /srv/sftpgo chmod 750 /etc/sftpgo /var/lib/sftpgo /srv/sftpgo chmod 640 /etc/sftpgo/sftpgo.json - echo "Please be sure to have the python3-requests package installed if you want to use the REST API CLI" fi # we added /srv/sftpgo after 1.1.0, we should check if we are upgrading diff --git a/pkgs/scripts/rpm/postinstall b/pkgs/scripts/rpm/postinstall index 06592de5..74872e4a 100644 --- a/pkgs/scripts/rpm/postinstall +++ b/pkgs/scripts/rpm/postinstall @@ -19,7 +19,6 @@ if [ $1 -eq 1 ]; then /usr/bin/chown -R sftpgo:sftpgo /etc/sftpgo /var/lib/sftpgo /srv/sftpgo /usr/bin/chmod 750 /etc/sftpgo /var/lib/sftpgo /srv/sftpgo /usr/bin/chmod 640 /etc/sftpgo/sftpgo.json - /bin/echo "Please be sure to have the python requests library installed if you want to use the REST API CLI" fi # adjust permissions for /srv/sftpgo and /var/lib/sftpgo diff --git a/version/version.go b/version/version.go index d59050b5..401b0dd5 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version import "strings" -const version = "2.0.0" +const version = "2.0.0-dev" var ( commit = ""