- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] AUTHORS: Add past maintainers
by Lukas Fleischer 19 Jan '15

19 Jan '15

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- AUTHORS | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 6581e81..1958ca0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,9 +1,19 @@ Current Maintainers ------------------- -* canyonknight <canyonknight(a)gmail.com> * Lukas Fleischer (cryptocrack) <archlinux(a)cryptocrack.de> +Past Maintainers +---------------- + +* canyonknight <canyonknight(a)gmail.com> (2013-2014) +* Loui Chang <louipc.ist(a)gmail.com> (2008-2011) +* Callan Barrett <wizzomafizzo(a)gmail.com> (2008-2009) +* eliott <eliott(a)cactuswax.net> (2007-2009) +* Paul Mattal <paul(a)mattal.com> (2007) +* Simo Leone <simo(a)archlinux.org> (2005-2008) +* Eric (2004-2005) + Contributors ------------ -- 2.2.2

1 1

[aur-dev] [PATCH] git-update.py: Check for mandatory fields
by Lukas Fleischer 15 Jan '15

15 Jan '15

Check explicitly whether pkgver, pkgrel, pkgname, pkgdesc and url are available in each package. If any of these is missing, an exception might occur when parsing the meta data later. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-update.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index 3d2742a..161d42f 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -212,6 +212,10 @@ for commit in walker: for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) + for field in ('pkgver', 'pkgrel', 'pkgname', 'pkgdesc', 'url'): + if not field in pkginfo: + die_commit('missing mandatory field: %s' % (field), commit.id) + if 'epoch' in pkginfo and not pkginfo['epoch'].isdigit(): die_commit('invalid epoch: %s' % (pkginfo['epoch']), commit.id) -- 2.2.2

1 0

[aur-dev] AUR 4.0.0 version tags
by Yaron de Leeuw 13 Jan '15

13 Jan '15

Hi. I have a suggestion for AUR 4.0.0: git tags with version information. The idea is that each and every commit will be tagged with the version extracted from .SRCINFO. Only the server will be allowed to apply tags (maybe a simple chmod on `.git/ref/tags` would do). They must never be overwritten, so `git-serve.py` should check if a tag exists before accepting a new commit. This will allow the user to check what happened to the AUR package he wants to install with`git diff` and `git log`, relative to his installed version. It will totally replace the need of aurifere, and can help other AUR helpers [1] as well. What do you think? If there is interest, I will work on a patch. Yaron [1] https://github.com/rmarquis/pacaur/issues/231

3 3

[aur-dev] [PATCH] Use custom templates for Git repositories
by Lukas Fleischer 12 Jan '15

12 Jan '15

Do not waste disk space by copying dozens of unneeded sample hooks. Use a custom template directory that only includes the git-update hook. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- INSTALL | 12 ++++++++---- conf/config.proto | 1 + scripts/git-integration/gen-templates.py | 29 +++++++++++++++++++++++++++++ scripts/git-integration/git-serve.py | 5 ++--- scripts/git-integration/init-repos.py | 5 ++--- 5 files changed, 42 insertions(+), 10 deletions(-) create mode 100755 scripts/git-integration/gen-templates.py diff --git a/INSTALL b/INSTALL index 2368db1..7b90ffd 100644 --- a/INSTALL +++ b/INSTALL @@ -19,7 +19,11 @@ Setup on Arch Linux $ mysql -uaur -p AUR </srv/http/aur/schema/aur-schema.sql -5) Clone the OpenSSH project, apply the AUR sshd patch and run `make`: +5) Generate templates for new Git repositories: + + $ /srv/http/aur/scripts/git-integration/gen-templates.py + +6) Clone the OpenSSH project, apply the AUR sshd patch and run `make`: $ cd /srv/http/aur/ $ git clone git://anongit.mindrot.org/openssh.git @@ -30,7 +34,7 @@ Setup on Arch Linux $ ./configure $ make -6) Create and edit the sshd configuration: +7) Create and edit the sshd configuration: $ cd /srv/http/aur/ $ umask 077 @@ -38,12 +42,12 @@ Setup on Arch Linux $ ssh-keygen -f .ssh/ssh_host_rsa_key -N '' -t rsa $ cp scripts/git-integration/sshd_config .ssh/ -7) Create a new user and change ownership of the .ssh directory: +8) Create a new user and change ownership of the .ssh directory: # useradd -U -d /srv/http/aur -c 'AUR user' aur # chown aur:aur /srv/http/aur/.ssh/ -8) Add, enable and start systemd unit files for the new sshd: +9) Add, enable and start systemd unit files for the new sshd: # cp /srv/http/aur/conf/aur-sshd.socket /etc/systemd/system/ # cp /srv/http/aur/conf/aur-sshd@.service /etc/systemd/system/ diff --git a/conf/config.proto b/conf/config.proto index a3b1640..ac79bd6 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -35,6 +35,7 @@ ssh-options = no-port-forwarding,no-X11-forwarding,no-pty [serve] repo-base = /srv/http/aur/repos/ repo-regex = [a-z0-9][a-z0-9.+_-]*$ +template-path = /srv/http/aur/scripts/git-integration/templates/ git-update-hook = /srv/http/aur/scripts/git-integration/git-update.py git-shell-cmd = /usr/bin/git-shell ssh-cmdline = ssh -p 2222 aur(a)aur.archlinux.org diff --git a/scripts/git-integration/gen-templates.py b/scripts/git-integration/gen-templates.py new file mode 100755 index 0000000..e451b53 --- /dev/null +++ b/scripts/git-integration/gen-templates.py @@ -0,0 +1,29 @@ +#!/usr/bin/python3 + +import configparser +import os +import shutil +import sys + +config = configparser.RawConfigParser() +config.read(os.path.dirname(os.path.realpath(__file__)) + "/../../conf/config") + +template_path = config.get('serve', 'template-path') +git_update_hook = config.get('serve', 'git-update-hook') + +def die(msg): + sys.stderr.write("%s\n" % (msg)) + exit(1) + +if os.path.exists(template_path): + shutil.rmtree(template_path) + +os.mkdir(template_path) +os.chdir(template_path) +os.mkdir("branches") +os.mkdir("hooks") +os.mkdir("info") +os.symlink(git_update_hook, template_path + 'hooks/update') + +with open("description", 'w') as f: + f.write("Unnamed repository; push to update the description.\n") diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 6f4d4f9..de9cb59 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -19,9 +19,9 @@ aur_db_socket = config.get('database', 'socket') repo_base_path = config.get('serve', 'repo-base') repo_regex = config.get('serve', 'repo-regex') -git_update_hook = config.get('serve', 'git-update-hook') git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') +template_path = config.get('serve', 'template-path') def repo_path_validate(path): if not path.startswith(repo_base_path): @@ -87,8 +87,7 @@ def setup_repo(repo, user): db.close() repo_path = repo_base_path + '/' + repo + '.git/' - pygit2.init_repository(repo_path, True) - os.symlink(git_update_hook, repo_path + 'hooks/update') + pygit2.init_repository(repo_path, True, 48, template_path=template_path) def check_permissions(pkgbase, user): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, diff --git a/scripts/git-integration/init-repos.py b/scripts/git-integration/init-repos.py index 62c51b1..5c4fcfe 100755 --- a/scripts/git-integration/init-repos.py +++ b/scripts/git-integration/init-repos.py @@ -19,7 +19,7 @@ aur_db_socket = config.get('database', 'socket') repo_base_path = config.get('serve', 'repo-base') repo_regex = config.get('serve', 'repo-regex') -git_update_hook = config.get('serve', 'git-update-hook') +template_path = config.get('serve', 'template-path') def die(msg): sys.stderr.write("%s\n" % (msg)) @@ -45,7 +45,6 @@ for repo in repos: print("[%s/%d] %s" % (str(i).rjust(len(str(n))), n, repo)) repo_path = repo_base_path + '/' + repo + '.git/' - pygit2.init_repository(repo_path, True) - os.symlink(git_update_hook, repo_path + 'hooks/update') + pygit2.init_repository(repo_path, True, 48, template_path=template_path) i += 1 -- 2.2.1

1 0

[aur-dev] [PATCH] Add to notification list on repository creation
by Lukas Fleischer 11 Jan '15

11 Jan '15

Since commit bf7717a (git-serve.py: Adopt repositories on creation, 2015-01-06), newly created package bases are no longer orphan and therefore, they are not adopted when pushing the first commit which also means that the initial submitter is not added to the notification list automatically. To remedy this, add the owner to the notification list when setting up a new repository. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-serve.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 227e37b..6f4d4f9 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -78,6 +78,10 @@ def setup_repo(repo, user): cur.execute("INSERT INTO PackageBases (Name, SubmittedTS, ModifiedTS, " + "SubmitterUID, MaintainerUID) VALUES (%s, UNIX_TIMESTAMP(), " + "UNIX_TIMESTAMP(), %s, %s)", [repo, userid, userid]) + pkgbase_id = cur.lastrowid + + cur.execute("INSERT INTO CommentNotify (PackageBaseID, UserID) " + + "VALUES (%s, %s)", [pkgbase_id, userid]) db.commit() db.close() -- 2.2.1

1 0

[aur-dev] [PATCH] Link to the cgit log from package details
by Lukas Fleischer 09 Jan '15

09 Jan '15

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 5 ++++- web/template/pkgbase_details.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 52afba2..c1c07ba 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -81,7 +81,10 @@ $sources = pkg_sources($row["ID"]); <div id="actionlist"> <h4><?= __('Package Actions') ?></h4> <ul class="small"> - <li><a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a></li> + <li> + <a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/log/"><?= __('View Changes') ?></a> + </li> <li><a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/snapshot/master.tar.gz"><?= __('Download snapshot') ?></a></li> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index ae363fd..98a7219 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -32,7 +32,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <div id="actionlist"> <h4><?= __('Package Actions') ?></h4> <ul class="small"> - <li><a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a></li> + <li> + <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/log/"><?= __('View Changes') ?></a> + </li> <li><a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/snapshot/master.tar.gz"><?= __('Download snapshot') ?></a></li> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> -- 2.2.1

1 0

[aur-dev] [PATCH] config.proto: Add prototype for ssh-cmdline
by Lukas Fleischer 09 Jan '15

09 Jan '15

This should have been added in 1b627a3 (git-serve.py: Improve error messages, 2015-01-01). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- conf/config.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/config.proto b/conf/config.proto index 28ac761..a3b1640 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -37,6 +37,7 @@ repo-base = /srv/http/aur/repos/ repo-regex = [a-z0-9][a-z0-9.+_-]*$ git-update-hook = /srv/http/aur/scripts/git-integration/git-update.py git-shell-cmd = /usr/bin/git-shell +ssh-cmdline = ssh -p 2222 aur(a)aur.archlinux.org [aurblup] db-path = /srv/http/aur/scripts/aurblup/ -- 2.2.1

1 0

[aur-dev] [PATCH] Rewrite aurblup in Python
by Lukas Fleischer 09 Jan '15

09 Jan '15

The AUR backend already uses several Python scripts, rewrite the aurblup helper as well. This has several advantages: * We can easily use the main configuration file without using any shell script wrappers. * aurblup does not need to be recompiled on libalpm soname bumps. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- conf/config.proto | 5 + scripts/aurblup/.gitignore | 3 - scripts/aurblup/Makefile | 26 ---- scripts/aurblup/README | 28 ---- scripts/aurblup/aurblup-wrapper | 21 --- scripts/aurblup/aurblup.c | 287 ---------------------------------------- scripts/aurblup/aurblup.py | 48 +++++++ scripts/aurblup/config.h.proto | 12 -- scripts/aurblup/config.mk | 6 - 9 files changed, 53 insertions(+), 383 deletions(-) delete mode 100644 scripts/aurblup/.gitignore delete mode 100644 scripts/aurblup/Makefile delete mode 100644 scripts/aurblup/README delete mode 100755 scripts/aurblup/aurblup-wrapper delete mode 100644 scripts/aurblup/aurblup.c create mode 100755 scripts/aurblup/aurblup.py delete mode 100644 scripts/aurblup/config.h.proto delete mode 100644 scripts/aurblup/config.mk diff --git a/conf/config.proto b/conf/config.proto index f1d226c..703aeea 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -38,3 +38,8 @@ repo-regex = [a-z0-9][a-z0-9.+_-]*$ template-path = /srv/http/aur/scripts/git-integration/templates/ git-update-hook = /srv/http/aur/scripts/git-integration/git-update.py git-shell-cmd = /usr/bin/git-shell + +[aurblup] +db-path = /srv/http/aur/scripts/aurblup/ +sync-dbs = core extra community multilib testing community-testing +servers = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64 diff --git a/scripts/aurblup/.gitignore b/scripts/aurblup/.gitignore deleted file mode 100644 index ae50736..0000000 --- a/scripts/aurblup/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -config.h -*.o -aurblup diff --git a/scripts/aurblup/Makefile b/scripts/aurblup/Makefile deleted file mode 100644 index 2d57470..0000000 --- a/scripts/aurblup/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -include config.mk - -SRC = aurblup.c -OBJ = ${SRC:.c=.o} - -all: aurblup - -config.h: - cp config.h.proto config.h - -${OBJ}: config.h - -aurblup: ${OBJ} - -install: aurblup - install -Dm0755 aurblup "${DESTDIR}${PREFIX}/bin/aurblup" - install -dm0755 "${DESTDIR}/var/lib/aurblup/" - -uninstall: - rm -f "${DESTDIR}${PREFIX}/bin/aurblup" - rm -f "${DESTDIR}/var/lib/aurblup/" - -clean: - rm -f aurblup ${OBJ} - -.PHONY: all install uninstall clean diff --git a/scripts/aurblup/README b/scripts/aurblup/README deleted file mode 100644 index 0cc811c..0000000 --- a/scripts/aurblup/README +++ /dev/null @@ -1,28 +0,0 @@ -aurblup -======= - -aurblup is a small and lightweight tool that updates the package blacklist of -an AUR MySQL database using one (or more) package databases. It does the -following things: - -- Sync a bunch of local package databases with a remote server. - -- Get a list of packages in those databases. - -- Update the MySQL blacklist table to match those packages, including those - packages' provides and replaces. - -Requirements ------------- - -You need the libalpm and libmysqlclient header files to build aurblup. - -Installation ------------- - -Edit the "config.h" (copy from "config.h.proto" if doesn't exist) and -"config.mk" configuration files to match your setup and enter the following -command to build and install aurblup: - - make install - diff --git a/scripts/aurblup/aurblup-wrapper b/scripts/aurblup/aurblup-wrapper deleted file mode 100755 index c7b20af..0000000 --- a/scripts/aurblup/aurblup-wrapper +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/php -<?php -$dir = $argv[1]; - -if (empty($dir)) { - echo "Please specify AUR directory.\n"; - exit; -} - -set_include_path(get_include_path() . PATH_SEPARATOR . "$dir/lib"); -include("confparser.inc.php"); - -$user = config_get('database', 'user'); -$password = config_get('database', 'password'); -$name = config_get('database', 'name'); - -exec($dir . "/../scripts/aurblup/aurblup " . - "-S /var/run/mysqld/mysqld.sock " . - "-u " . escapeshellarg($user) . " " . - "-p " . escapeshellarg($password) . " " . - "-D " . escapeshellarg($name)); diff --git a/scripts/aurblup/aurblup.c b/scripts/aurblup/aurblup.c deleted file mode 100644 index 971dc06..0000000 --- a/scripts/aurblup/aurblup.c +++ /dev/null @@ -1,287 +0,0 @@ -/* aurblup - AUR blacklist updater - * - * Small utility to update the AUR package blacklist. Can be used in a cronjob. - * Check the "README" file for details. - */ - -#include <alpm.h> -#include <getopt.h> -#include <mysql.h> -#include <stdio.h> -#include <string.h> - -#include "config.h" - -#define alpm_die(...) die(__VA_ARGS__, alpm_strerror(alpm_errno(handle))); -#define mysql_die(...) die(__VA_ARGS__, mysql_error(c)); - -static void die(const char *, ...); -static alpm_list_t *pkglist_append(alpm_list_t *, const char *); -static alpm_list_t *blacklist_get_pkglist(); -static void blacklist_add(const char *); -static void blacklist_remove(const char *); -static void blacklist_sync(alpm_list_t *, alpm_list_t *); -static alpm_list_t *dblist_get_pkglist(alpm_list_t *); -static alpm_list_t *dblist_create(void); -static int parse_options(int, char **); -static void init(void); -static void cleanup(void); - -static char *mysql_host = "localhost"; -static char *mysql_socket = NULL; -static char *mysql_user = "aur"; -static char *mysql_passwd = "aur"; -static char *mysql_db = "AUR"; - -static MYSQL *c; - -static alpm_handle_t *handle; - -static void -die(const char *format, ...) -{ - va_list arg; - - va_start(arg, format); - fprintf(stderr, "aurblup: "); - vfprintf(stderr, format, arg); - va_end(arg); - - cleanup(); - exit(1); -} - -static alpm_list_t * -pkglist_append(alpm_list_t *pkglist, const char *pkgname) -{ - int len = strcspn(pkgname, "<=>"); - if (!len) - len = strlen(pkgname); - - char *s = malloc(len + 1); - - strncpy(s, pkgname, len); - s[len] = '\0'; - - if (alpm_list_find_str(pkglist, s)) - free(s); - else - pkglist = alpm_list_add(pkglist, s); - - return pkglist; -} - -static alpm_list_t * -blacklist_get_pkglist() -{ - MYSQL_RES *res; - MYSQL_ROW row; - alpm_list_t *pkglist = NULL; - - if (mysql_query(c, "SELECT Name FROM PackageBlacklist")) - mysql_die("failed to read blacklist from MySQL database: %s\n"); - - if (!(res = mysql_store_result(c))) - mysql_die("failed to store MySQL result: %s\n"); - - while ((row = mysql_fetch_row(res))) - pkglist = pkglist_append(pkglist, row[0]); - - mysql_free_result(res); - - return pkglist; -} - -static void -blacklist_add(const char *name) -{ - char *esc = malloc(strlen(name) * 2 + 1); - char query[1024]; - - mysql_real_escape_string(c, esc, name, strlen(name)); - snprintf(query, 1024, "INSERT INTO PackageBlacklist (Name) " - "VALUES ('%s')", esc); - free(esc); - - if (mysql_query(c, query)) - mysql_die("failed to query MySQL database (\"%s\"): %s\n", query); -} - -static void -blacklist_remove(const char *name) -{ - char *esc = malloc(strlen(name) * 2 + 1); - char query[1024]; - - mysql_real_escape_string(c, esc, name, strlen(name)); - snprintf(query, 1024, "DELETE FROM PackageBlacklist WHERE Name = '%s'", esc); - free(esc); - - if (mysql_query(c, query)) - mysql_die("failed to query MySQL database (\"%s\"): %s\n", query); -} - -static void -blacklist_sync(alpm_list_t *pkgs_cur, alpm_list_t *pkgs_new) -{ - alpm_list_t *pkgs_add, *pkgs_rem, *p; - - pkgs_add = alpm_list_diff(pkgs_new, pkgs_cur, (alpm_list_fn_cmp)strcmp); - pkgs_rem = alpm_list_diff(pkgs_cur, pkgs_new, (alpm_list_fn_cmp)strcmp); - - if (mysql_query(c, "START TRANSACTION")) - mysql_die("failed to start MySQL transaction: %s\n"); - - for (p = pkgs_add; p; p = alpm_list_next(p)) - blacklist_add(p->data); - - for (p = pkgs_rem; p; p = alpm_list_next(p)) - blacklist_remove(p->data); - - if (mysql_query(c, "COMMIT")) - mysql_die("failed to commit MySQL transaction: %s\n"); - - alpm_list_free(pkgs_add); - alpm_list_free(pkgs_rem); -} - -static alpm_list_t * -dblist_get_pkglist(alpm_list_t *dblist) -{ - alpm_list_t *d, *p, *q; - alpm_list_t *pkglist = NULL; - - for (d = dblist; d; d = alpm_list_next(d)) { - alpm_db_t *db = d->data; - - if (alpm_trans_init(handle, 0)) - alpm_die("failed to initialize ALPM transaction: %s\n"); - if (alpm_db_update(0, db) < 0) - alpm_die("failed to update ALPM database: %s\n"); - if (alpm_trans_release(handle)) - alpm_die("failed to release ALPM transaction: %s\n"); - - for (p = alpm_db_get_pkgcache(db); p; p = alpm_list_next(p)) { - alpm_pkg_t *pkg = p->data; - - pkglist = pkglist_append(pkglist, alpm_pkg_get_name(pkg)); - - for (q = alpm_pkg_get_replaces(pkg); q; q = alpm_list_next(q)) { - alpm_depend_t *replace = q->data; - pkglist = pkglist_append(pkglist, replace->name); - } - } - } - - return pkglist; -} - -static alpm_list_t * -dblist_create(void) -{ - alpm_list_t *d; - alpm_list_t *dblist = NULL; - int i; - - for (i = 0; i < sizeof(alpm_repos) / sizeof(char *); i++) { - if (!alpm_register_syncdb(handle, alpm_repos[i], 0)) - alpm_die("failed to register sync db \"%s\": %s\n", alpm_repos[i]); - } - - if (!(dblist = alpm_get_syncdbs(handle))) - alpm_die("failed to get sync DBs: %s\n"); - - for (d = dblist; d; d = alpm_list_next(d)) { - alpm_db_t *db = d->data; - - char server[1024]; - snprintf(server, 1024, ALPM_MIRROR, alpm_db_get_name(db)); - - if (alpm_db_add_server(db, server)) - alpm_die("failed to set server \"%s\": %s\n", server); - } - - return dblist; -} - -static int parse_options(int argc, char **argv) -{ - int opt; - - static const struct option opts[] = { - { "mysql-host", required_argument, 0, 'h' }, - { "mysql-socket", required_argument, 0, 'S' }, - { "mysql-user", required_argument, 0, 'u' }, - { "mysql-passwd", required_argument, 0, 'p' }, - { "mysql-db", required_argument, 0, 'D' }, - { 0, 0, 0, 0 } - }; - - while((opt = getopt_long(argc, argv, "h:S:u:p:D:", opts, NULL)) != -1) { - switch(opt) { - case 'h': - mysql_host = optarg; - break;; - case 'S': - mysql_socket = optarg; - break;; - case 'u': - mysql_user = optarg; - break;; - case 'p': - mysql_passwd = optarg; - break;; - case 'D': - mysql_db = optarg; - break;; - default: - return 0; - } - } - - return 1; -} - -static void -init(void) -{ - enum _alpm_errno_t alpm_err; - if (mysql_library_init(0, NULL, NULL)) - mysql_die("could not initialize MySQL library: %s\n"); - if (!(c = mysql_init(NULL))) - mysql_die("failed to setup MySQL client: %s\n"); - if (!mysql_real_connect(c, mysql_host, mysql_user, mysql_passwd, - mysql_db, 0, mysql_socket, 0)) - mysql_die("failed to initiate MySQL connection to %s: %s\n", mysql_host); - - if ((handle = alpm_initialize("/", ALPM_DBPATH, &alpm_err)) == NULL) - die("failed to initialize ALPM: %s\n", alpm_strerror(alpm_err)); -} - -static void -cleanup(void) -{ - alpm_release(handle); - mysql_close(c); - mysql_library_end(); -} - -int main(int argc, char *argv[]) -{ - alpm_list_t *pkgs_cur, *pkgs_new; - - if (!parse_options(argc, argv)) - return 1; - - init(); - - pkgs_cur = blacklist_get_pkglist(); - pkgs_new = dblist_get_pkglist(dblist_create()); - blacklist_sync(pkgs_cur, pkgs_new); - FREELIST(pkgs_new); - FREELIST(pkgs_cur); - - cleanup(); - - return 0; -} diff --git a/scripts/aurblup/aurblup.py b/scripts/aurblup/aurblup.py new file mode 100755 index 0000000..e678fee --- /dev/null +++ b/scripts/aurblup/aurblup.py @@ -0,0 +1,48 @@ +#!/usr/bin/python3 + +import configparser +import mysql.connector +import os +import pyalpm + +config = configparser.RawConfigParser() +config.read(os.path.dirname(os.path.realpath(__file__)) + "/../../conf/config") + +aur_db_host = config.get('database', 'host') +aur_db_name = config.get('database', 'name') +aur_db_user = config.get('database', 'user') +aur_db_pass = config.get('database', 'password') +aur_db_socket = config.get('database', 'socket') +db_path = config.get('aurblup', 'db-path') +sync_dbs = config.get('aurblup', 'sync-dbs').split(' ') +servers = config.get('aurblup', 'servers').split(' ') + +blacklist = set() + +h = pyalpm.Handle("/", db_path) +for sync_db in sync_dbs: + repo = h.register_syncdb(sync_db, pyalpm.SIG_DATABASE_OPTIONAL) + repo.servers = [server.replace("%s", sync_db) for server in servers] + t = h.init_transaction() + repo.update(False) + t.release() + + for pkg in repo.pkgcache: + blacklist.add(pkg.name) + [blacklist.add(x) for x in pkg.replaces] + +db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, + passwd=aur_db_pass, db=aur_db_name, + unix_socket=aur_db_socket, buffered=True) +cur = db.cursor() + +cur.execute("SELECT Name FROM PackageBlacklist") +oldblacklist = set([row[0] for row in cur.fetchall()]) + +for pkg in blacklist.difference(oldblacklist): + cur.execute("INSERT INTO PackageBlacklist (Name) VALUES (%s)", [pkg]) +for pkg in oldblacklist.difference(blacklist): + cur.execute("DELETE FROM PackageBlacklist WHERE Name = %s", [pkg]) + +db.commit() +db.close() diff --git a/scripts/aurblup/config.h.proto b/scripts/aurblup/config.h.proto deleted file mode 100644 index 45acb87..0000000 --- a/scripts/aurblup/config.h.proto +++ /dev/null @@ -1,12 +0,0 @@ -/* libalpm options */ -#define ALPM_DBPATH "/var/lib/aurblup/" -#define ALPM_MIRROR "ftp://mirrors.kernel.org/archlinux/%s/os/x86_64" - -static const char *alpm_repos[] = { - "core", - "community", - "community-testing", - "extra", - "multilib", - "testing" -}; diff --git a/scripts/aurblup/config.mk b/scripts/aurblup/config.mk deleted file mode 100644 index f8e12a8..0000000 --- a/scripts/aurblup/config.mk +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX = /usr/local - -CFLAGS = -g -O2 -std=c99 -pedantic -Wall -I/usr/include/mysql -LDFLAGS = -g -lalpm -lmysqlclient - -CC = cc -- 2.2.1

1 0

[aur-dev] [PATCH] aurblup: Do not blacklist provides
by Lukas Fleischer 09 Jan '15

09 Jan '15

This partly reverts commit ddc5435 (Add packages' provides and replaces to the blacklist in aurblup., 2011-02-08). While adding replaces is fine, blacklisting provides prevents from uploading alternative implementations of a program which is not what we want. Fixes FS#43381. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/aurblup/aurblup.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/aurblup/aurblup.c b/scripts/aurblup/aurblup.c index f072669..971dc06 100644 --- a/scripts/aurblup/aurblup.c +++ b/scripts/aurblup/aurblup.c @@ -166,11 +166,6 @@ dblist_get_pkglist(alpm_list_t *dblist) pkglist = pkglist_append(pkglist, alpm_pkg_get_name(pkg)); - for (q = alpm_pkg_get_provides(pkg); q; q = alpm_list_next(q)) { - alpm_depend_t *provide = q->data; - pkglist = pkglist_append(pkglist, provide->name); - } - for (q = alpm_pkg_get_replaces(pkg); q; q = alpm_list_next(q)) { alpm_depend_t *replace = q->data; pkglist = pkglist_append(pkglist, replace->name); -- 2.2.1

1 0

[aur-dev] [PATCH] git-update.py: Do not wipe repository descriptions
by Lukas Fleischer 08 Jan '15

08 Jan '15

Only update repository descriptions if there is at least one package in the package base meta data. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-update.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index 15a731c..3d2742a 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -239,6 +239,8 @@ save_srcinfo(srcinfo, db, cur, user) db.close() -with open(git_dir + '/description', 'w') as f: - pkginfo = srcinfo.GetMergedPackage(list(srcinfo.GetPackageNames())[0]) - f.write(pkginfo['pkgdesc']) +pkglist = list(srcinfo.GetPackageNames()) +if len(pkglist) > 0: + with open(git_dir + '/description', 'w') as f: + pkginfo = srcinfo.GetMergedPackage(pkglist[0]) + f.write(pkginfo['pkgdesc']) -- 2.2.1

1 0