June 2016 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] notify: Fix check for 0 when sending req close notification
by Johannes Löthberg 30 Jun '16

30 Jun '16

528bf84 (Distinguish auto-accepted requests, 2016-06-30) reimplemented sending the message saying that the request was automatically accepted, but checks if the uid argument is false. The argument passed from PHP when a user didn't manually accept the request is '0' though, causing the request to not be sent properly. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- scripts/notify.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/notify.py b/scripts/notify.py index ac02a01..2819728 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -385,15 +385,15 @@ def request_close(cur, uid, reqid, reason): text = get_request_closure_comment(cur, reqid) subject = '[PRQ#%d] Request %s' % (int(reqid), reason.title()) - if uid: + if uid == '0': + body = 'Request #%d has been %s automatically by the Arch User ' \ + 'Repository package request system' % (int(reqid), reason) + refs = None + else: user = username_from_id(cur, uid) user_uri = aur_location + '/account/' + user + '/' body = 'Request #%d has been %s by %s [1]' % (int(reqid), reason, user) refs = '[1] ' + user_uri - else: - body = 'Request #%d has been %s automatically by the Arch User ' \ - 'Repository package request system' % (int(reqid), reason) - refs = None if text.strip() == '': body += '.' else: -- 2.9.0

2 1

[aur-dev] [PATCH] Make request type hints translatable
by Lukas Fleischer 25 Jun '16

25 Jun '16

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgreq_form.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php index 639326e..35dbef5 100644 --- a/web/template/pkgreq_form.php +++ b/web/template/pkgreq_form.php @@ -68,13 +68,13 @@ <textarea name="comments" id="id_comments" rows="5" cols="50"></textarea> </p> <p id="deletion_hint"> - <?= 'By submitting a deletion request, you ask a Trusted User to delete the package base. This type of request should be used for duplicates, software abandoned by upstream, as well as illegal and irreparably broken packages.' ?> + <?= __('By submitting a deletion request, you ask a Trusted User to delete the package base. This type of request should be used for duplicates, software abandoned by upstream, as well as illegal and irreparably broken packages.') ?> </p> <p id="merge_hint"> - <?= 'By submitting a merge request, you ask a Trusted User to delete the package base and transfer its votes and comments to another package base. Merging a package does not affect the corresponding Git repositories. Make sure you update the Git history of the target package yourself.' ?> + <?= __('By submitting a merge request, you ask a Trusted User to delete the package base and transfer its votes and comments to another package base. Merging a package does not affect the corresponding Git repositories. Make sure you update the Git history of the target package yourself.') ?> </p> <p id="orphan_hint"> - <?= 'By submitting an orphan request, you ask a Trusted User to disown the package base. Please only do this if the package needs maintainer action, the maintainer is MIA and you already tried to contact the maintainer previously.' ?> + <?= __('By submitting an orphan request, you ask a Trusted User to disown the package base. Please only do this if the package needs maintainer action, the maintainer is MIA and you already tried to contact the maintainer previously.') ?> </p> <p> <input type="submit" class="button" name="do_FileRequest" value="<?= __("Submit Request") ?>" /> -- 2.9.0

1 0

[aur-dev] [PATCH] Fixup for missing changes in 6ec4a3589
by Johannes Löthberg 25 Jun '16

25 Jun '16

Commit 6ec4a3589 forgot to change the usages of the display_account_form and process_account_form function to account for the new parameter, and forgot to add the new column to aur-schema.sql. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Accidentally broke editing account details. It took me way too long to figure this out.. schema/aur-schema.sql | 1 + web/html/account.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 0804ac3..4c495ea 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -40,6 +40,7 @@ CREATE TABLE Users ( RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, CommentNotify TINYINT(1) NOT NULL DEFAULT 1, UpdateNotify TINYINT(1) NOT NULL DEFAULT 0, + OwnershipNotify TINYINT(1) NOT NULL DEFAULT 1, PRIMARY KEY (ID), UNIQUE (Username), UNIQUE (Email), diff --git a/web/html/account.php b/web/html/account.php index 9007ace..c77aedb 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -36,7 +36,7 @@ if ($action == "UpdateAccount") { in_request("C"), in_request("R"), in_request("L"), in_request("I"), in_request("K"), in_request("PK"), in_request("J"), in_request("CN"), in_request("UN"), - in_request("ID"), $row["Username"]); + in_request("ON"), in_request("ID"), $row["Username"]); } } @@ -83,7 +83,8 @@ if (isset($_COOKIE["AURSID"])) { $row["HideEmail"], "", "", $row["RealName"], $row["LangPreference"], $row["IRCNick"], $row["PGPKey"], $PK, $row["InactivityTS"] ? 1 : 0, $row["CommentNotify"], - $row["UpdateNotify"], $row["ID"], $row["Username"]); + $row["UpdateNotify"], $row["OwnershipNotify"], + $row["ID"], $row["Username"]); } else { print __("You do not have permission to edit this account."); } @@ -124,7 +125,8 @@ if (isset($_COOKIE["AURSID"])) { in_request("I"), in_request("K"), in_request("PK"), in_request("J"), in_request("CN"), in_request("UN"), - in_request("ID"), $row["Username"]); + in_request("ON"), in_request("ID"), + $row["Username"]); } } else { -- 2.9.0

2 5

[aur-dev] [PATCH] Linkify user homepage URLs
by Johannes Löthberg 25 Jun '16

25 Jun '16

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/template/account_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/account_details.php b/web/template/account_details.php index 0ac85a5..8b76382 100644 --- a/web/template/account_details.php +++ b/web/template/account_details.php @@ -43,7 +43,7 @@ </tr> <tr> <th><?= __("Homepage") . ":" ?></th> - <td><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></td> + <td><a href="<?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?>" rel="nofollow"><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></a></td> </tr> <tr> <th><?= __("IRC Nick") . ":" ?></th> -- 2.9.0

2 1

Re: [aur-dev] [aur-general] Perl-Moose dependency failure.
by Florian Pritz 10 Jun '16

10 Jun '16

On 10.06.2016 21:59, John D Jones III via aur-general wrote: > On 06/10/16 13:45, Florian Pritz via aur-general wrote: >> On 10.06.2016 21:08, John D Jones III via aur-general wrote: >> Any reason you don't just call it perl-list-utils? That way it could be >> used to always get the most recent version of that distribution and not >> just 1.45. >> >> Florian >> > Well, that's because the parent module, Scalar::List::Utils is marked as > a provides in the core repo perl pkgbuild, so it will error out saying > that the module is 'blacklisted' from AUR otherwise I'd be all over it. Alright. For perl I'd actually prefer this solution given that core perl has a dedicated directory (core_perl) vs. CPAN modules that go into vendor_perl. @Lukas: Could we have exceptions to the blacklist for any provides by perl? Florian

1 0

[aur-dev] [PATCH] Update README
by Lukas Fleischer 09 Jun '16

09 Jun '16

Reword most parts of the README file, add information on new features and update the directory layout. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- README | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/README b/README index 1988186..5ab84ab 100644 --- a/README +++ b/README @@ -1,40 +1,42 @@ aurweb ====== -aurweb is a framework for hosting the Arch User Repository (AUR), a collection +aurweb is a hosting platform for the Arch User Repository (AUR), a collection of packaging scripts that are created and submitted by the Arch Linux -community. The scripts contained in the repository (PKGBUILDs) can be built -using makepkg and installed via the Arch Linux package manager pacman. The -aurweb project aims to provide the necessary web interface, database schema, -and scripts for a multi-lingual community-driven repository. - -Functionality -------------- - -* Users may submit source packages that contain a PKGBUILD. -* User accounts with varying permission levels (User, Trusted User, Developer). -* Ability to search for specific submitted packages. -* Display package information by parsing meta-data provided with the packages. -* Users can make comments on package information page. -* Mark packages as out-of-date. -* Vote for well-done and popular user submitted packages. -* Trusted User and Developer can search for and modify accounts. +community. The scripts contained in the repository can be built using `makepkg` +and installed using the Arch Linux package manager `pacman`. + +The aurweb project includes + +* A web interface to search for packaging scripts and display package details. +* A SSH/Git interface to submit and update packages and package meta data. +* Community features such as comments, votes, package flagging and requests. +* Editing/deletion of packages and accounts by Trusted Users and Developers. * Area for Trusted Users to post AUR-related proposals and vote on them. Directory Layout ---------------- +conf:: + Configuration and configuration templates. + doc:: - aurweb documentation. + Project documentation. + +git-interface:: + Scripts that make up the Git and SSH interface. po:: Translation files for strings in the aurweb interface. +schema:: + Schema for the SQL database. Script for dummy data generation. + scripts:: - aurblup package blacklist tool. Scripts for AUR maintenance. + Scripts for AUR maintenance. -support:: - Schema for SQL database. Script for dummy data generation. +upgrading:: + Instructions for upgrading setups from one release to another. web:: Web interface for the AUR. @@ -43,9 +45,9 @@ Links ----- * The repository is hosted at git://git.archlinux.org/aurweb.git -- see - doc/CodingGuidelines for information on submitting patches. + doc/CodingGuidelines for information on the patch submission process. -* Discovered bugs can be submitted to the aurweb bug tracker: +* Bugs can (and should) be submitted to the aurweb bug tracker: https://bugs.archlinux.org/index.php?project=2 * Questions, comments, and patches related to aurweb can be sent to the AUR -- 2.8.3

1 0

[aur-dev] [PATCH] Update Arch Linux projects subdomain
by Lukas Fleischer 09 Jun '16

09 Jun '16

The projects.archlinux.org subdomain was moved to git.archlinux.org. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 2 +- README | 2 +- doc/i18n.txt | 2 +- web/template/footer.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index 8b0cd29..dab48cc 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Setup on Arch Linux 1) Clone the AUR project: $ cd /srv/http/ - $ git clone git://projects.archlinux.org/aurweb.git + $ git clone git://git.archlinux.org/aurweb.git 2) Setup a web server with PHP and MySQL. Configure the web server to redirect all URLs to /index.php/foo/bar/. The following block can be used with nginx: diff --git a/README b/README index 71e8481..1988186 100644 --- a/README +++ b/README @@ -42,7 +42,7 @@ web:: Links ----- -* The repository is hosted at git://projects.archlinux.org/aurweb.git -- see +* The repository is hosted at git://git.archlinux.org/aurweb.git -- see doc/CodingGuidelines for information on submitting patches. * Discovered bugs can be submitted to the aurweb bug tracker: diff --git a/doc/i18n.txt b/doc/i18n.txt index d5b6764..a1c21fe 100644 --- a/doc/i18n.txt +++ b/doc/i18n.txt @@ -21,7 +21,7 @@ strings for the translation to be usable, and it may have to be disabled. 1. Check out the aurweb source using git: -$ git clone git://projects.archlinux.org/aurweb.git aurweb-git +$ git clone git://git.archlinux.org/aurweb.git aurweb-git 2. Go into the "po/" directory in the aurweb source and run msginit(1) to create a initial translation file from our translation catalog: diff --git a/web/template/footer.php b/web/template/footer.php index f5dc2d0..572dbb2 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -3,7 +3,7 @@ <div id="footer"> <?php if ($ver): ?> - <p>aurweb <a href="https://projects.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p> + <p>aurweb <a href="https://git.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><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p> -- 2.8.3

1 0

[aur-dev] [PATCH] pkgbasefuncs.inc.php: Remove debug statement
by Lukas Fleischer 09 Jun '16

09 Jun '16

Remove a leftover var_dump() invocation that was introduced in commit 5fb7a74 (Replace categories with keywords, 2015-06-13). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 5d10cce..b082784 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -1062,7 +1062,6 @@ function pkgbase_set_keywords($base_id, $keywords) { $i = 0; foreach ($keywords as $keyword) { $q = sprintf("INSERT INTO PackageKeywords (PackageBaseID, Keyword) VALUES (%d, %s)", $base_id, $dbh->quote($keyword)); - var_dump($q); $dbh->exec($q); $i++; -- 2.8.3

1 0