- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Autofocus searchbox at package search
by Gordian Edenhofer 27 May '15

27 May '15

At the package search page, the user is requested to enter some keyword for the search. Until now it was neccessary to click the field in which the input should be placed. This can be easily simplified with HTML5 using the autofocus attribute of the input element. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> --- web/template/pkg_search_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 7428250..aafd3bf 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -70,7 +70,7 @@ $per_page = array(50, 100, 250); </div> <div> <label for="id_q"><?= __("Keywords"); ?></label> - <input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' /> + <input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' autofocus /> </div> <div> <label for="id_out_of_date"><?= __('Out of Date'); ?></label> -- 2.4.1

2 2

[aur-dev] [PATCH] Autofocus username input field at login screen
by Gordian Edenhofer 27 May '15

27 May '15

At the login page, the user is promted for the username and the corresponding password. At this point the user is required to click the field in which he should place the input. This can be easily simplified with HTML5 using the autofocus attribute of the input element. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> --- web/html/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/login.php b/web/html/login.php index 94da559..a4ce8c8 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -29,7 +29,7 @@ html_header('AUR ' . __("Login")); <?php endif; ?> <p> <label for="id_username"><?= __('Username') . ':'; ?></label> - <input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" /> + <input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus /> </p> <p> <label for="id_password"><?= __('Password') . ':'; ?></label> -- 2.4.1

2 4

[aur-dev] Some notes on AUR 4.0.0
by Lukas Fleischer 27 May '15

27 May '15

Hi, As Florian already mentioned in another email, I am away until June 1st. I am on a roaming data plan, so I won't be able to reply to all the feedback and questions on the new AUR until then. I hope that I am going to address at least some of the concerns and questions here, though. For the granularity of the Git repositories, having one repository per package (i.e. package base) is a natural choice. The other possibility is to use one single large repository with branches for each package. Florian told me about gitnamespaces, which allows for combining the advantages from both approaches, and I am going to check whether we can easily use it for the AUR when I am back home. Using one repository per maintainer, however, is extremely inconvenient and leads to unnecessary clutter when changing ownership. One of our main objectives is to have full history of all packages and this means that we would need to perform quite cumbersome history import/export operations whenever a package is disowned or adopted. Also, I am not aware of any disadvantages of the "one repository per package" approach apart from merges being inconvenient (which happen much less frequent than package adoptions, however) and the spurious "I don't like many Git repositories." argument. As Florian said, using gitnamespaces will probably lead to better storage efficiency and I am fine with increasing the blob size limit to 250kiB. As described in the notification draft I sent to aur-dev and aur-general on Saturday, packages can only be resubmitted to aur4.archlinux.org by their current AUR maintainer (on aur.archlinux.org) for 4 weeks. That means that it is *not* possible for user2 to submit the package foobar to aur4.archlinux.org if it is maintained by user1 on aur.archlinux.org for that period of time. It *is* possible however, to submit that package if user1 chose not to resubmit foobar until July 8th. The period of 4 + 4 weeks is a tradeoff: Making that period shorter means that users might not have enough time to resubmit their packages, making that period longer means that the maintenance burden of having to update all packages twice is higher. Please also keep in mind that the AUR should be thought of as a place where the community shares packages on a voluntary basis. You maintain AUR packages because you want to share them, not because you want to own them. "Losing" a package to another maintainer isn't the same thing as losing property. If you have any useful tools or scripts to help with the migration process, please feel free to add them to the aur4.archlinux.org section on the wiki. Regards, Lukas

1 1

[aur-dev] [RFC] Draft of the AUR 4.0.0 migration notification
by Lukas Fleischer 23 May '15

23 May '15

Hi, I just added a section to the AUR article in the Arch wiki that describes how to submit packages to the new AUR. Here is a draft of the notification that I plan to send to all AUR package maintainers on June 1st: Hello, This is an automated email to all AUR package maintainers. Starting from June 8th, 2015, the official AUR web interface at aur.archlinux.org becomes a read-only archive for two months. During that period of time, you will not be able to submit package updates, comments or package requests. If you want to continue maintaining your AUR packages, please submit them to aur4.archlinux.org until July 7th, 2015. We reserved all packages you are currently maintaining on aur.archlinux.org, such that nobody else can overwrite them. However, if choose not to resubmit your package, we will cancel that reservation on July 8th. This allows anybody to take over the package. On August 8th, the read-only archive at aur.archlinux.org will be replaced by aur4.archlinux.org and the former aur.archlinux.org source tarballs will be made available on some archive. For instructions on the new package submission process, please check the Arch wiki [1]. If you encounter any bugs, please report them to the aurweb bug tracker [2]. Happy packaging! [1] https://wiki.archlinux.org/index.php/Arch_User_Repository#Submitting_packag… [2] https://bugs.archlinux.org/index.php?project=2 Note that aur4.archlinux.org does not work yet but will updated to point to the same IP address as aur-dev.archlinux.org soon. Comments welcome. Regards, Lukas

1 1

[aur-dev] [PATCH] config.proto: Fix default value of ssh-cmdline
by Lukas Fleischer 23 May '15

23 May '15

We no longer use port 2222 for SSH. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.proto b/conf/config.proto index 623d044..88f046d 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -39,7 +39,7 @@ repo-regex = [a-z0-9][a-z0-9.+_-]*$ template-path = /srv/http/aurweb/scripts/git-integration/templates/ git-update-hook = /srv/http/aurweb/scripts/git-integration/git-update.py git-shell-cmd = /usr/bin/git-shell -ssh-cmdline = ssh -p 2222 aur(a)aur.archlinux.org +ssh-cmdline = ssh aur(a)aur.archlinux.org [aurblup] db-path = /srv/http/aurweb/scripts/aurblup/ -- 2.4.1

1 0

[aur-dev] [PATCH] Use keyword search by default
by Lukas Fleischer 23 May '15

23 May '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c71358a..8fd629f 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -601,9 +601,11 @@ function pkg_search_page($SID="") { } else { /* Search by name and description (default). */ - $K = "%" . addcslashes($_GET['K'], '%_') . "%"; - $q_where .= "AND (Packages.Name LIKE " . $dbh->quote($K) . " OR "; - $q_where .= "Description LIKE " . $dbh->quote($K) . ") "; + foreach (str_getcsv($_GET['K'], ' ') as $term) { + $term = "%" . addcslashes($term, '%_') . "%"; + $q_where .= "AND (Packages.Name LIKE " . $dbh->quote($term) . " OR "; + $q_where .= "Description LIKE " . $dbh->quote($term) . ") "; + } } } -- 2.4.1

2 5

[aur-dev] [PATCH] Include user name in password reset emails
by Lukas Fleischer 22 May '15

22 May '15

Fixes FS#44320. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/passreset.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/html/passreset.php b/web/html/passreset.php index fca3d10..29f2c64 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -41,15 +41,17 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir } } elseif (isset($_POST['email'])) { $email = $_POST['email']; + $username = username_from_id(uid_from_email($email)); if (empty($email)) { $error = __('Missing a required field.'); } else { $subject = 'AUR Password Reset'; - $body = __('A password reset request was submitted for the account '. - 'associated with your e-mail address. If you wish to reset '. - 'your password follow the link below, otherwise ignore '. - 'this message and nothing will happen.'); + $body = __('A password reset request was submitted for the ' . + 'account %s associated with your e-mail address. ' . + 'If you wish to reset your password follow the ' . + 'link below, otherwise ignore this message and ' . + 'nothing will happen.', $username); send_resetkey($email, $subject, $body); header('Location: ' . get_uri('/passreset/') . '?step=confirm'); -- 2.4.1

1 0

[aur-dev] [PATCH 1/3] Fix the permission check in pkgbase_adopt()
by Lukas Fleischer 22 May '15

22 May '15

Filter the affected package bases before closing any package requests. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 50cb47e..d10b5ad 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -579,7 +579,25 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { } } + /* Verify package ownership. */ $base_ids = sanitize_ids($base_ids); + + $q = "SELECT ID FROM PackageBases "; + $q.= "WHERE ID IN (" . implode(",", $base_ids) . ") "; + + if ($action && !has_credential(CRED_PKGBASE_ADOPT)) { + /* Regular users may only adopt orphan packages. */ + $q.= "AND MaintainerUID IS NULL"; + } + if (!$action && !has_credential(CRED_PKGBASE_DISOWN)) { + /* Regular users may only disown their own packages. */ + $q.= "AND MaintainerUID = " . $uid; + } + + $result = $dbh->query($q); + $base_ids = $result->fetchAll(PDO::FETCH_COLUMN, 0); + + /* Error out if the list of remaining packages is empty. */ if (empty($base_ids)) { if ($action) { return array(false, __("You did not select any packages to adopt.")); @@ -618,16 +636,6 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { $q.= "SET MaintainerUID = NULL "; } $q.= "WHERE ID IN (" . implode(",", $base_ids) . ") "; - - if ($action && !has_credential(CRED_PKGBASE_ADOPT)) { - /* Regular users may only adopt orphan packages. */ - $q.= "AND MaintainerUID IS NULL"; - } - if (!$action && !has_credential(CRED_PKGBASE_DISOWN)) { - /* Regular users may only disown their own packages. */ - $q.= "AND MaintainerUID = " . $uid; - } - $dbh->exec($q); if ($action) { -- 2.4.1

1 4

[aur-dev] [PATCH 1/2] Fix processing of pkgbase_get_comaintainers()
by Lukas Fleischer 22 May '15

22 May '15

pkgbase_get_comaintainers() returns an array of user names, not an array of user IDs. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgdisown.php | 6 +++--- web/lib/pkgbasefuncs.inc.php | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php index 071a76c..fa182dc 100644 --- a/web/html/pkgdisown.php +++ b/web/html/pkgdisown.php @@ -11,7 +11,7 @@ check_sid(); html_header(__("Disown Package")); $maintainer_uids = array(pkgbase_maintainer_uid($base_id)); -$comaintainer_uids = pkgbase_get_comaintainers($base_id); +$comaintainers = pkgbase_get_comaintainers($base_id); if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <div class="box"> @@ -26,9 +26,9 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?php endforeach; ?> </ul> <p> - <?php if (count($comaintainer_uids) > 0): ?> + <?php if (count($comaintainers) > 0): ?> <?= __('By selecting the checkbox, you confirm that you want to disown the package and transfer ownership to %s%s%s.', - '<strong>', $comaintainer_uids[0], '</strong>'); ?> + '<strong>', $comaintainers[0], '</strong>'); ?> <?php else: ?> <?= __('By selecting the checkbox, you confirm that you want to disown the package.') ?> <?php endif; ?> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index b8da23c..5b8b52f 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -646,12 +646,15 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { } } else { foreach ($base_ids as $base_id) { - $uids = pkgbase_get_comaintainers($base_id); - - $q = "UPDATE PackageBases "; - $q.= "SET MaintainerUID = " . $uids[0] . " "; - $q.= "WHERE ID = " . $base_id; - $dbh->exec($q); + $comaintainers = pkgbase_get_comaintainers($base_id); + + if (count($comaintainers) > 0) { + $uid = uid_from_username($comaintainers[0]); + $q = "UPDATE PackageBases "; + $q.= "SET MaintainerUID = " . $uid . " "; + $q.= "WHERE ID = " . $base_id; + $dbh->exec($q); + } } } } -- 2.4.1

1 1

[aur-dev] [PATCH] Store co-maintainer priorities
by Lukas Fleischer 22 May '15

22 May '15

In addition to saving the list of package co-maintainers, also save their order. This makes it possible to define a "primary" co-maintainer. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 1 + upgrading/4.0.0.txt | 1 + web/lib/pkgbasefuncs.inc.php | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 9c647d8..5641d0d 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -281,6 +281,7 @@ CREATE TABLE PackageComments ( CREATE TABLE PackageComaintainers ( UsersID INTEGER UNSIGNED NOT NULL, PackageBaseID INTEGER UNSIGNED NOT NULL, + Priority INTEGER UNSIGNED NOT NULL, INDEX (UsersID), INDEX (PackageBaseID), FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, diff --git a/upgrading/4.0.0.txt b/upgrading/4.0.0.txt index 023dec0..9a4a807 100644 --- a/upgrading/4.0.0.txt +++ b/upgrading/4.0.0.txt @@ -26,6 +26,7 @@ UPDATE PackageBases SET PackagerUID = NULL; CREATE TABLE PackageComaintainers ( UsersID INTEGER UNSIGNED NOT NULL, PackageBaseID INTEGER UNSIGNED NOT NULL, + Priority INTEGER UNSIGNED NOT NULL, INDEX (UsersID), INDEX (PackageBaseID), FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 3e4b572..50cb47e 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -967,7 +967,8 @@ function pkgbase_get_comaintainers($base_id) { $dbh = DB::connect(); $q = "SELECT UserName FROM PackageComaintainers "; $q .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID "; - $q .= "WHERE PackageComaintainers.PackageBaseID = " . intval($base_id); + $q .= "WHERE PackageComaintainers.PackageBaseID = " . intval($base_id) . " "; + $q .= "ORDER BY Priority ASC"; $result = $dbh->query($q); if ($result) { @@ -1012,9 +1013,11 @@ function pkgbase_set_comaintainers($base_id, $users) { $q = sprintf("DELETE FROM PackageComaintainers WHERE PackageBaseID = %d", $base_id); $dbh->exec($q); + $i = 1; foreach ($uids as $uid) { - $q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID) VALUES (%d, %d)", $base_id, $uid); + $q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (%d, %d, %d)", $base_id, $uid, $i); $dbh->exec($q); + $i++; } return array(true, __("The package base co-maintainers have been updated.")); -- 2.4.1

1 0