From a21eb37b7b707e80363208f1bdc9af206ed78973 Mon Sep 17 00:00:00 2001 From: Sofia Boldyreva Date: Tue, 21 Jan 2025 21:54:24 +0100 Subject: [PATCH] Initial commit --- config.yaml | 18 +++++++++++ ...hplip-3.18.4-gpgdir-rules-gpg-server.patch | 32 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 config.yaml create mode 100644 files/hplip-3.18.4-gpgdir-rules-gpg-server.patch diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..cb89d53 --- /dev/null +++ b/config.yaml @@ -0,0 +1,18 @@ +actions: + + - modify_release: + - suffix: ".alma.1" + enabled: true + + - changelog_entry: + - name: "Sergey Fokin" + email: "sfokin@cloudlinux.com" + line: + - "Аdd AlmaLinux support" + - "Fix permission for custom created gpg dir" + - "Change gpg server to pgp.mit.edu" + + - add_files: + - type: "patch" + name: "hplip-3.18.4-gpgdir-rules-gpg-server.patch" + number: 100 diff --git a/files/hplip-3.18.4-gpgdir-rules-gpg-server.patch b/files/hplip-3.18.4-gpgdir-rules-gpg-server.patch new file mode 100644 index 0000000..813baec --- /dev/null +++ b/files/hplip-3.18.4-gpgdir-rules-gpg-server.patch @@ -0,0 +1,32 @@ +diff -uprN a/base/password.py b/base/password.py +--- a/base/password.py 2021-07-16 11:19:07.363594142 +0300 ++++ b/base/password.py 2021-07-16 11:19:52.441320237 +0300 +@@ -56,6 +56,7 @@ AUTH_TYPES = {'mepis': 'su', + 'boss': 'su', + 'lfs': 'su', + 'manjarolinux': 'sudo', ++ 'almalinux': 'su', + } + + +diff -uprN a/base/validation.py b/base/validation.py +--- a/base/validation.py 2021-07-16 11:19:07.364594092 +0300 ++++ b/base/validation.py 2021-07-16 11:22:50.609324314 +0300 +@@ -42,7 +42,7 @@ class DigiSign_Verification(object): + + + class GPG_Verification(DigiSign_Verification): +- def __init__(self, pgp_site = 'pool.sks-keyservers.net', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): ++ def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): + self.__pgp_site = pgp_site + self.__key = key + self.__gpg = utils.which('gpg',True) +@@ -55,7 +55,7 @@ class GPG_Verification(DigiSign_Verifica + + if not os.path.exists(self.__gpg_dir): + try: +- os.mkdir(self.__gpg_dir, 0o755) ++ os.mkdir(self.__gpg_dir, 0o700) + except OSError: + log.error("Failed to create %s" % self.__gpg_dir) + self.__change_owner()