- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Show a warning if .SRCINFO is unchanged
by Lukas Fleischer 29 Sep '15

29 Sep '15

Warn users when a remote ref update does not change the content of .SRCINFO such that users are reminded of updating package meta data. Implements FS#46130. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 4698382..b418525 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -169,6 +169,9 @@ def die(msg): sys.stderr.write("error: {:s}\n".format(msg)) exit(1) +def warn(msg): + sys.stderr.write("warning: {:s}\n".format(msg)) + def die_commit(msg, commit): sys.stderr.write("error: The following error " + "occurred when parsing commit\n") @@ -282,6 +285,13 @@ for commit in walker: if not fname in commit.tree: die_commit('missing source file: {:s}'.format(fname), str(commit.id)) +# Display a warning if .SRCINFO is unchanged. +if sha1_old != "0000000000000000000000000000000000000000": + srcinfo_id_old = repo[sha1_old].tree['.SRCINFO'].id + srcinfo_id_new = repo[sha1_new].tree['.SRCINFO'].id + if srcinfo_id_old == srcinfo_id_new: + warn(".SRCINFO unchanged. The package database will not be updated!") + # Read .SRCINFO from the HEAD commit. srcinfo_raw = repo[repo[sha1_new].tree['.SRCINFO'].id].data.decode() srcinfo_raw = srcinfo_raw.split('\n') -- 2.6.0

1 0

[aur-dev] [PATCH] Remove empty package bases after 24 hours
by Lukas Fleischer 29 Sep '15

29 Sep '15

By using the setup-repo command, it is currently possible to create empty package bases, which can be used to make package base reservations. Add a maintenance script to remove such empty package bases after 24 hours. Fixes FS#46279. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/pkgmaint.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 scripts/pkgmaint.py diff --git a/scripts/pkgmaint.py b/scripts/pkgmaint.py new file mode 100755 index 0000000..0eb9422 --- /dev/null +++ b/scripts/pkgmaint.py @@ -0,0 +1,25 @@ +#!/usr/bin/python3 + +import configparser +import mysql.connector +import os + +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 = 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("DELETE FROM PackageBases WHERE " + + "UNIX_TIMESTAMP() - SubmittedTS > 86400 AND PackagerUID IS NULL") + +db.commit() +db.close() -- 2.6.0

1 0

[aur-dev] [PATCH] AUTHORS: Add date ranges to current maintainers
by Lukas Fleischer 29 Sep '15

29 Sep '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- AUTHORS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 4462cab..18c1337 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,8 @@ Current Maintainers ------------------- -* Lukas Fleischer <lfleischer(a)archlinux.org> -* Johannes Löthberg <johannes(a)kyriasis.com> +* Lukas Fleischer <lfleischer(a)archlinux.org> (2011-present) +* Johannes Löthberg <johannes(a)kyriasis.com> (2015-present) Past Maintainers ---------------- -- 2.6.0

1 0

[aur-dev] 4.1.0 string freeze
by Lukas Fleischer 26 Sep '15

26 Sep '15

Dear translators, I just submitted the final message catalog for 4.1.0. There are 26 new strings to translate. The release is scheduled for Saturday, October 3rd. Thank you for your continued contributions! Regards, Lukas

1 0

[aur-dev] Translation-String cleanup
by Christoph Seitz 26 Sep '15

26 Sep '15

Hello there, I just translated the new strings. I found some String pairs having the same meaning but different wording. Example: " You are not allowed to edit this comment." and "You do not have the right to edit this comment." Maybe we should do some clean up in order to keep the string base handy. Would you accept some patches in this direction? Maybe there are only a few. Regards, Chris

2 2

[aur-dev] [PATCH] aurjson.class.php: Sync error message with front-end
by Lukas Fleischer 26 Sep '15

26 Sep '15

Instead of introducing a new message "You do not have the right to edit this comment." for the RPC interface, use "You are not allowed to edit this comment." which we already show in the front-end. Reported-by: Christoph Seitz <seitz.christoph(a)gmail.com> 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 304a50a..db9cc54 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -532,7 +532,7 @@ class AurJSON { if (!has_credential(CRED_COMMENT_EDIT, array($user_id))) { $output = array( 'success' => 0, - 'error' => __('You do not have the right to edit this comment.') + 'error' => __('You are not allowed to edit this comment.') ); return json_encode($output); } elseif (is_null($comment)) { -- 2.5.3

1 0

[aur-dev] [PATCH v2 1/2] aurjson.class.php: Fix "Undefined index" notices
by Lukas Fleischer 26 Sep '15

26 Sep '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- Use isset() instead of array_key_exists() as suggested by Florian. web/lib/aurjson.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index e646c63..304a50a 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -110,8 +110,8 @@ class AurJSON { return; } - $callback = $http_data['callback']; - if (isset($callback)) { + if (isset($http_data['callback'])) { + $callback = $http_data['callback']; if (!preg_match('/^[a-zA-Z0-9().]{1,128}$/D', $callback)) { return $this->json_error('Invalid callback name.'); } @@ -281,11 +281,15 @@ class AurJSON { * proper data types in the JSON response. */ foreach (self::$numeric_fields as $field) { - $row[$field] = intval($row[$field]); + if (isset($row[$field])) { + $row[$field] = intval($row[$field]); + } } foreach (self::$decimal_fields as $field) { - $row[$field] = floatval($row[$field]); + if (isset($row[$field])) { + $row[$field] = floatval($row[$field]); + } } if ($this->version >= 2 && ($type == 'info' || $type == 'multiinfo')) { -- 2.5.3

1 1

[aur-dev] [PATCH 1/2] aurjson.class.php: Fix "Undefined index" notices
by Lukas Fleischer 24 Sep '15

24 Sep '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index e646c63..dd3c0f0 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -110,8 +110,8 @@ class AurJSON { return; } - $callback = $http_data['callback']; - if (isset($callback)) { + if (array_key_exists('callback', $http_data)) { + $callback = $http_data['callback']; if (!preg_match('/^[a-zA-Z0-9().]{1,128}$/D', $callback)) { return $this->json_error('Invalid callback name.'); } @@ -281,11 +281,15 @@ class AurJSON { * proper data types in the JSON response. */ foreach (self::$numeric_fields as $field) { - $row[$field] = intval($row[$field]); + if (array_key_exists($field, $row)) { + $row[$field] = intval($row[$field]); + } } foreach (self::$decimal_fields as $field) { - $row[$field] = floatval($row[$field]); + if (array_key_exists($field, $row)) { + $row[$field] = floatval($row[$field]); + } } if ($this->version >= 2 && ($type == 'info' || $type == 'multiinfo')) { -- 2.5.3

1 1

[aur-dev] [PATCH] Make it more clear that the bug tracker is for aurweb only
by Marcel Korpel 24 Sep '15

24 Sep '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/home.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/home.php b/web/html/home.php index 7e9a00f..475370b 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -112,7 +112,7 @@ html_header( __("Home") ); <p> <?php echo __( - 'If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.', + 'If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.', '<a href="https://bugs.archlinux.org/index.php?project=2">', '</a>', '<strong>', -- 2.5.3

2 1

[aur-dev] [PATCH v2] Add search for keywords only
by Marcel Korpel 23 Sep '15

23 Sep '15

Implements FS#45619. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- Changes since v1: * refactor sophiticated keyword search functionality to function * use this function to search for package keywords * update PHPDoc web/lib/pkgfuncs.inc.php | 103 ++++++++++++++++++++++++--------------- web/template/pkg_search_form.php | 1 + 2 files changed, 65 insertions(+), 39 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index d760429..67cd10c 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -516,7 +516,10 @@ function pkg_display_details($id=0, $row, $SID="") { * SeB- property that search string (K) represents * values: n - package name * nd - package name & description - * x - package name (exact match) + * b - package base name + * N - package name (exact match) + * B - package base name (exact match) + * k - package keyword(s) * m - package maintainer's username * s - package submitter's username * do_Orphans - boolean. whether to search packages @@ -608,6 +611,10 @@ function pkg_search_page($SID="") { $K = "%" . addcslashes($_GET['K'], '%_') . "%"; $q_where .= "AND (PackageBases.Name LIKE " . $dbh->quote($K) . ") "; } + elseif (isset($_GET["SeB"]) && $_GET["SeB"] == "k") { + /* Search by keywords. */ + $q_where .= construct_keyword_search($dbh, false); + } elseif (isset($_GET["SeB"]) && $_GET["SeB"] == "N") { /* Search by name (exact match). */ $q_where .= "AND (Packages.Name = " . $dbh->quote($_GET['K']) . ") "; @@ -618,44 +625,7 @@ function pkg_search_page($SID="") { } else { /* Keyword search (default). */ - $count = 0; - $q_keywords = ""; - $op = ""; - - foreach (str_getcsv($_GET['K'], ' ') as $term) { - if ($term == "") { - continue; - } - if ($count > 0 && strtolower($term) == "and") { - $op = "AND "; - continue; - } - if ($count > 0 && strtolower($term) == "or") { - $op = "OR "; - continue; - } - if ($count > 0 && strtolower($term) == "not") { - $op .= "NOT "; - continue; - } - - $term = "%" . addcslashes($term, '%_') . "%"; - $q_keywords .= $op . " (Packages.Name LIKE " . $dbh->quote($term) . " OR "; - $q_keywords .= "Description LIKE " . $dbh->quote($term) . " OR "; - $q_keywords .= "EXISTS (SELECT * FROM PackageKeywords WHERE "; - $q_keywords .= "PackageKeywords.PackageBaseID = Packages.PackageBaseID AND "; - $q_keywords .= "PackageKeywords.Keyword LIKE " . $dbh->quote($term) . ")) "; - - $count++; - if ($count >= 20) { - break; - } - $op = "AND "; - } - - if (!empty($q_keywords)) { - $q_where .= "AND (" . $q_keywords . ") "; - } + $q_where .= construct_keyword_search($dbh, true); } } @@ -771,6 +741,61 @@ function pkg_search_page($SID="") { } /** + * Construct a WHERE part of sophiticated keyword search + * + * @param handle $dbh Database handle + * @param boolean $namedesc Search name and description fields? + * + * @return string WHERE part of SQL clause + */ +function construct_keyword_search($dbh, $namedesc) { + $count = 0; + $where_part = ""; + $q_keywords = ""; + $op = ""; + + foreach (str_getcsv($_GET['K'], ' ') as $term) { + if ($term == "") { + continue; + } + if ($count > 0 && strtolower($term) == "and") { + $op = "AND "; + continue; + } + if ($count > 0 && strtolower($term) == "or") { + $op = "OR "; + continue; + } + if ($count > 0 && strtolower($term) == "not") { + $op .= "NOT "; + continue; + } + + $term = "%" . addcslashes($term, '%_') . "%"; + $q_keywords .= $op . " ("; + if ($namedesc) { + $q_keywords .= "Packages.Name LIKE " . $dbh->quote($term) . " OR "; + $q_keywords .= "Description LIKE " . $dbh->quote($term) . " OR "; + } + $q_keywords .= "EXISTS (SELECT * FROM PackageKeywords WHERE "; + $q_keywords .= "PackageKeywords.PackageBaseID = Packages.PackageBaseID AND "; + $q_keywords .= "PackageKeywords.Keyword LIKE " . $dbh->quote($term) . ")) "; + + $count++; + if ($count >= 20) { + break; + } + $op = "AND "; + } + + if (!empty($q_keywords)) { + $where_part = "AND (" . $q_keywords . ") "; + } + + return $where_part; +} + +/** * Determine if a POST string has been sent by a visitor * * @param string $action String to check has been sent via POST diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 404d16e..cce3b6a 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -7,6 +7,7 @@ $searchby = array( 'b' => __('Package Base'), 'N' => __('Exact Name'), 'B' => __('Exact Package Base'), + 'k' => __('Keywords'), 'm' => __('Maintainer'), 's' => __('Submitter') ); -- 2.5.3

2 3