- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] footer: Close short open tag
by Lukas Fleischer 26 Oct '15

26 Oct '15

Fixes a regression introduced in fd6ba76 (Make copyright notice translatable, 2015-10-17). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/footer.php b/web/template/footer.php index 7e505a3..f5dc2d0 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -5,7 +5,7 @@ <?php if ($ver): ?> <p>aurweb <a href="https://projects.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p> <?php endif; ?> - <p><?= __('Copyright %s 2004-%d aurweb Development Team.', '©', date('Y'))</p> + <p><?= __('Copyright %s 2004-%d aurweb Development Team.', '©', date('Y')) ?></p> <p><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> -- 2.6.2

1 0

[aur-dev] [PATCH 1/2] Fix user name length limit on the account edit form
by Lukas Fleischer 25 Oct '15

25 Oct '15

Change the maxlength attribute of the user name input field such that it corresponds to the username_max_len option. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/account_edit_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 16655c0..b25ff39 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -17,7 +17,7 @@ <fieldset> <p> <label for="id_username"><?= __("Username") ?>:</label> - <input type="text" size="30" maxlength="64" name="U" id="id_username" value="<?= htmlspecialchars($U,ENT_QUOTES) ?>" /> (<?= __("required") ?>) + <input type="text" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" name="U" id="id_username" value="<?= htmlspecialchars($U,ENT_QUOTES) ?>" /> (<?= __("required") ?>) </p> <?php # Only TUs or Devs can promote/demote/suspend a user -- 2.6.2

1 1

[aur-dev] [PATCH] aurblup: Strip version suffixes from provisions
by Lukas Fleischer 24 Oct '15

24 Oct '15

Since we cannot handle versioned provides, simply strip the version suffix and treat them as if they were not versioned. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/aurblup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/aurblup.py b/scripts/aurblup.py index 5397528..325ef3d 100755 --- a/scripts/aurblup.py +++ b/scripts/aurblup.py @@ -4,6 +4,7 @@ import configparser import mysql.connector import os import pyalpm +import re config = configparser.RawConfigParser() config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config") @@ -32,7 +33,9 @@ for sync_db in sync_dbs: blacklist.add(pkg.name) [blacklist.add(x) for x in pkg.replaces] providers.add((pkg.name, pkg.name)) - [providers.add((pkg.name, x)) for x in pkg.provides] + for provision in pkg.provides: + provisionname = re.sub(r'(<|=|>).*', '', provision) + providers.add((pkg.name, provisionname)) db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, -- 2.6.2

1 0

[aur-dev] [PATCH] Highlight broken dependencies
by Lukas Fleischer 24 Oct '15

24 Oct '15

If a dependency neither exists in the official repositories nor in the AUR, make it appear bold red. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/aurweb.css | 5 +++++ web/lib/pkgfuncs.inc.php | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 4fb256f..11af747 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -147,3 +147,8 @@ label.confirmation, #merge-into { width: auto; } + +#pkgdepslist .broken { + color: red; + font-weight: bold; +} diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 3108241..cedc360 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -336,6 +336,15 @@ function pkg_depend_link($name, $type, $cond, $arch, $pkg_id) { */ $providers = pkg_providers($name); + if (count($providers) == 0) { + $link = '<span class="broken">'; + $link .= htmlspecialchars($name); + $link .= '</span>'; + $link .= htmlspecialchars($cond) . ' '; + $link .= pkg_deplink_annotation($type, $arch, $desc); + return $link; + } + $link = htmlspecialchars($name); foreach ($providers as $provider) { if ($provider[1] == $name) { -- 2.6.2

1 0

[aur-dev] [PATCH] Hide optdepend description if not available
by Lukas Fleischer 24 Oct '15

24 Oct '15

Remove the "(unknown)" suffix that used to be shown for optional dependencies without a description. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index dab4315..3108241 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -324,7 +324,7 @@ function pkg_depend_link($name, $type, $cond, $arch, $pkg_id) { $name = $tokens[0]; $desc = $tokens[1]; } else { - $desc = '(unknown)'; + $desc = ''; } /* -- 2.6.2

1 0

[aur-dev] [PATCH] Include trivial AUR providers in pkg_providers()
by Lukas Fleischer 24 Oct '15

24 Oct '15

When obtaining provisions using pkg_providers(), we already include virtual providers from the official repositories, virtual providers from the AUR and trivial providers (i.e. packages having the given name) from the official repositories. Include trivial providers from the AUR as well. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 34ec2c5..dab4315 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -164,10 +164,11 @@ function pkg_groups($pkgid) { function pkg_providers($name) { $dbh = DB::connect(); $q = "SELECT p.ID, p.Name FROM Packages p "; - $q.= "INNER JOIN PackageRelations pr ON pr.PackageID = p.ID "; - $q.= "INNER JOIN RelationTypes rt ON rt.ID = pr.RelTypeID "; - $q.= "WHERE rt.Name = 'provides' "; - $q.= "AND pr.RelName = " . $dbh->quote($name); + $q.= "LEFT JOIN PackageRelations pr ON pr.PackageID = p.ID "; + $q.= "LEFT JOIN RelationTypes rt ON rt.ID = pr.RelTypeID "; + $q.= "WHERE p.Name = " . $dbh->quote($name) . " "; + $q.= "OR (rt.Name = 'provides' "; + $q.= "AND pr.RelName = " . $dbh->quote($name) . ")"; $q.= "UNION "; $q.= "SELECT 0, Name FROM OfficialProviders "; $q.= "WHERE Provides = " . $dbh->quote($name); -- 2.6.2

1 0

[aur-dev] [PATCH] Fix spacing of versioned dependencies
by Lukas Fleischer 24 Oct '15

24 Oct '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 717085d..82408fc 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -347,7 +347,7 @@ function pkg_depend_link($name, $type, $cond, $arch, $pkg_id) { break; } } - $link .= ' ' . htmlspecialchars($cond); + $link .= htmlspecialchars($cond) . ' '; foreach ($providers as $key => $provider) { if ($provider[1] == $name) { -- 2.6.2

1 0

[aur-dev] [PATCH] Disable mass unflagging
by Lukas Fleischer 24 Oct '15

24 Oct '15

This currently does not work. Disable it until we have proper support for flagging multiple packages on the flag page. Fixes FS#46780. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_search_results.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index cce533c..3046c25 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -109,7 +109,6 @@ if (!$result): ?> <p> <select name="action"> <option><?= __("Actions") ?></option> - <option value="do_Flag"><?= __("Flag Out-of-date") ?></option> <option value="do_UnFlag"><?= __("Unflag Out-of-date") ?></option> <option value="do_Adopt"><?= __("Adopt Packages") ?></option> <option value="do_Disown"><?= __("Disown Packages") ?></option> -- 2.6.2

1 0

[aur-dev] [PATCH] aurjson: Allow underscores in JSONP callback names
by Lukas Fleischer 24 Oct '15

24 Oct '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 1548232..9097035 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -119,7 +119,7 @@ class AurJSON { if (isset($http_data['callback'])) { $callback = $http_data['callback']; - if (!preg_match('/^[a-zA-Z0-9().]{1,128}$/D', $callback)) { + if (!preg_match('/^[a-zA-Z0-9()_.]{1,128}$/D', $callback)) { return $this->json_error('Invalid callback name.'); } header('content-type: text/javascript'); -- 2.6.2

1 0

[aur-dev] [PATCH] git-serve: Add support for setting keywords
by Lukas Fleischer 24 Oct '15

24 Oct '15

This allows for setting keywords using the SSH interface. The syntax is `config <pkgbase> keywords <keyword1> <keyword2>...`. Implements FS#45627. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 55 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 45c9a01..8bd6aa8 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -25,17 +25,19 @@ ssh_cmdline = config.get('serve', 'ssh-cmdline') enable_maintenance = config.getboolean('options', 'enable-maintenance') maintenance_exc = config.get('options', 'maintenance-exceptions').split() -def pkgbase_exists(pkgbase): +def pkgbase_from_name(pkgbase): 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) cur = db.cursor() + cur.execute("SELECT ID FROM PackageBases WHERE Name = %s", [pkgbase]) + db.close() - cur.execute("SELECT COUNT(*) FROM PackageBases WHERE Name = %s ", - [pkgbase]) + row = cur.fetchone() + return row[0] if row else None - db.close() - return (cur.fetchone()[0] > 0) +def pkgbase_exists(pkgbase): + return (pkgbase_from_name(pkgbase) > 0) def list_repos(user): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, @@ -81,6 +83,25 @@ def create_pkgbase(pkgbase, user): db.commit() db.close() +def pkgbase_config_keywords(pkgbase, keywords): + pkgbase_id = pkgbase_from_name(pkgbase) + if not pkgbase_id: + die('{:s}: package base not found: {:s}'.format(action, pkgbase)) + + 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) + cur = db.cursor() + + cur.execute("DELETE FROM PackageKeywords WHERE PackageBaseID = %s", + [pkgbase_id]) + for keyword in keywords: + cur.execute("INSERT INTO PackageKeywords (PackageBaseID, Keyword) " + "VALUES (%s, %s)", [pkgbase_id, keyword]) + + db.commit() + db.close() + def check_permissions(pkgbase, user): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, @@ -143,6 +164,17 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': os.environ["GIT_NAMESPACE"] = pkgbase cmd = action + " '" + repo_path + "'" os.execl(git_shell_cmd, git_shell_cmd, '-c', cmd) +elif action == 'config': + if len(cmdargv) < 2: + die_with_help("{:s}: missing repository name".format(action)) + if len(cmdargv) < 3: + die_with_help("{:s}: missing option name".format(action)) + pkgbase = cmdargv[1] + option = cmdargv[2] + + if option == 'keywords': + pkgbase_config_keywords(pkgbase, cmdargv[3:]) + elif action == 'list-repos': if len(cmdargv) > 1: die_with_help("{:s}: too many arguments".format(action)) @@ -172,11 +204,12 @@ elif action == 'restore': os.execl(git_update_cmd, git_update_cmd, 'restore') elif action == 'help': die("Commands:\n" + - " help Show this help message and exit.\n" + - " list-repos List all your repositories.\n" + - " restore <name> Restore a deleted package base.\n" + - " setup-repo <name> Create an empty repository.\n" + - " git-receive-pack Internal command used with Git.\n" + - " git-upload-pack Internal command used with Git.") + " config <name> <param>... Change package base settings.\n" + + " help Show this help message and exit.\n" + + " list-repos List all your repositories.\n" + + " restore <name> Restore a deleted package base.\n" + + " setup-repo <name> Create an empty repository.\n" + + " git-receive-pack Internal command used with Git.\n" + + " git-upload-pack Internal command used with Git.") else: die_with_help("invalid command: {:s}".format(action)) -- 2.6.2

1 0