diff options
| author | Joffrey Darcq | 2020-03-27 15:12:49 +0100 |
|---|---|---|
| committer | Joffrey Darcq | 2020-03-27 15:12:49 +0100 |
| commit | 1aa553c9a0e1ab6dbb165d0b6f1efb2cb04534b9 (patch) | |
| tree | bf8dc5e516d71515bcadd330d1fecfa3943c99c3 | |
| parent | 74969cac0fc0c69cba0f216147692fc62a8974ea (diff) | |
| download | aur-1aa553c9a0e1ab6dbb165d0b6f1efb2cb04534b9.tar.gz | |
Remove old patches
| -rw-r--r-- | fix_mysql_support.diff | 45 | ||||
| -rw-r--r-- | fix_seafile-admin.diff | 59 |
2 files changed, 0 insertions, 104 deletions
diff --git a/fix_mysql_support.diff b/fix_mysql_support.diff deleted file mode 100644 index 4544a351ff35..000000000000 --- a/fix_mysql_support.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py -index 596687c..39ed520 100644 ---- a/scripts/setup-seafile-mysql.py -+++ b/scripts/setup-seafile-mysql.py -@@ -301,9 +301,9 @@ class EnvManager(object): - def __init__(self): - self.install_path = os.path.dirname(os.path.abspath(__file__)) - self.top_dir = os.path.dirname(self.install_path) -- self.bin_dir = os.path.join(self.install_path, 'seafile', 'bin') -+ self.bin_dir = '/usr/bin' - self.central_config_dir = os.path.join(self.top_dir, 'conf') - self.central_pids_dir = os.path.join(self.top_dir, 'pids') - self.central_logs_dir = os.path.join(self.top_dir, 'logs') - Utils.must_mkdir(self.central_config_dir) - -@@ -313,7 +313,6 @@ class EnvManager(object): - Utils.error('"%s" not found' % path) - - paths = [ -- os.path.join(self.install_path, 'seafile'), - os.path.join(self.install_path, 'seahub'), - os.path.join(self.install_path, 'runtime'), - ] -diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py -index c5a7f1f..5cdb858 100644 ---- a/scripts/setup-seafile-mysql.py -+++ b/scripts/setup-seafile-mysql.py -@@ -896,7 +896,7 @@ class CcnetConfigurator(AbstractConfigurator): - - cursor = conn.cursor() - -- sql_file = os.path.join(env_mgr.install_path, 'sql', 'mysql', 'ccnet.sql') -+ sql_file = '/usr/share/seafile-server/scripts/sql/mysql/ccnet.sql' - with open(sql_file, 'r') as fp: - content = fp.read() - -@@ -1033,7 +1033,7 @@ class SeafileConfigurator(AbstractConfigurator): - - cursor = conn.cursor() - -- sql_file = os.path.join(env_mgr.install_path, 'sql', 'mysql', 'seafile.sql') -+ sql_file = '/usr/share/seafile-server/scripts/sql/mysql/seafile.sql' - with open(sql_file, 'r') as fp: - content = fp.read() - diff --git a/fix_seafile-admin.diff b/fix_seafile-admin.diff deleted file mode 100644 index 1f9ed05d3a76..000000000000 --- a/fix_seafile-admin.diff +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/tools/seafile-admin b/tools/seafile-admin -index 5e3658b..90c68a8 100755 ---- a/tools/seafile-admin -+++ b/tools/seafile-admin -@@ -44,7 +44,7 @@ SEAHUB_DOWNLOAD_URL = 'https://seafile.com.cn/downloads/seahub-latest.tar.gz' - cwd = os.getcwd() - SCRIPT_NAME = os.path.basename(sys.argv[0]) - --PYTHON = sys.executable -+PYTHON = '/usr/bin/python2.7' - - conf = {} - CONF_SERVER_NAME = 'server_name' -@@ -499,7 +499,7 @@ def init_seahub(): - # create seahub_settings.py - create_seahub_settings_py() - -- argv = [PYTHON, 'manage.py', 'syncdb'] -+ argv = [PYTHON, 'manage.py', 'migrate'] - # Set proper PYTHONPATH before run django syncdb command - env = get_seahub_env() - -@@ -518,10 +518,10 @@ def init_seahub(): - - - def check_django_version(): -- '''Requires django 1.8''' -+ '''Requires django 1.11''' - import django -- if django.VERSION[0] != 1 or django.VERSION[1] != 8: -- error('Django 1.8 is required') -+ if django.VERSION[0] != 1 or django.VERSION[1] != 11: -+ error('Django 1.11 is required') - del django - - -@@ -683,7 +683,7 @@ def start_controller(): - - def start_seahub_gunicorn(): - argv = [ -- 'gunicorn', -+ 'gunicorn-python2', - 'seahub.wsgi:application', - '-c', - conf[CONF_SEAHUB_CONF], -@@ -861,6 +861,13 @@ def check_necessary_files(): - os.path.join(cwd, 'conf', 'seahub_settings.py'), - ] - -+ # seahub.db isn't create with a MySQL installation and crash the startup -+ with open(files[3], 'r') as f: -+ for line in f: -+ if 'DATABASES' in line: -+ del(files[2]) -+ break -+ - for fpath in files: - if not os.path.exists(fpath): - error('%s not found' % fpath) |