- Aur-dev - lists.archlinux.org

kodi-devel-bin
by Паша 09 Aug '19

09 Aug '19

Hey guys! Am I wrong or package kodi-devel-bin really breaks guidelines? It looks like it compiles kodi from scratch every time Pasha

2 1

Re: [PATCH] notify.py: Use a/an correctly when sending request notifications
by Eli Schwartz 09 Aug '19

09 Aug '19

On 8/9/19 2:08 PM, Lars Rustand wrote: > Argh, gmail replies to the wrong address. > > On Fri, Aug 9, 2019, 20:06 Lars Rustand <rustand.lars(a)gmail.com> wrote: > >> Thank you for the feedback, I totally agree with your remarks. I might be >> a little too fond of codegolfing, that's where I got the idea to use True >> as an index. >> I posted an updated patch where I added your changes. No problem. ;) Thanks. As an aside, I have now seen int(True)-indexed lists used "in the wild"! A clever fox saw what I wrote and PM'ed me a Fizzbuzz implementation which relied on that. -- Eli Schwartz Bug Wrangler and Trusted User

2 1

[PATCH] pkgreqfuncs: Don't leave out non-default ClosureComment column
by Johannes Löthberg 30 Jul '19

30 Jul '19

Since 09cb61a (schema: Remove invalid default values for TEXT columns, 2017-04-15) the PackageRequests.ClosureComment field no longer has a default value. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/pkgreqfuncs.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index b8be7e5..079df38 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -165,10 +165,10 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $q = "INSERT INTO PackageRequests "; $q.= "(ReqTypeID, PackageBaseID, PackageBaseName, MergeBaseName, "; - $q.= "UsersID, Comments, RequestTS) VALUES (" . $type_id . ", "; + $q.= "UsersID, Comments, ClosureComment, RequestTS) VALUES (" . $type_id . ", "; $q.= $base_id . ", " . $dbh->quote($pkgbase_name) . ", "; $q.= $dbh->quote($merge_into) . ", " . $uid . ", "; - $q.= $dbh->quote($comments) . ", " . strval(time()) . ")"; + $q.= $dbh->quote($comments) . ", '', " . strval(time()) . ")"; $dbh->exec($q); $request_id = $dbh->lastInsertId(); -- 2.22.0

2 1

[PATCH v2] Implement spamming mitigations for comments
by Jelle van der Waa 30 Jun '19

30 Jun '19

From: Jelle van der Waa <jelle(a)vdwaa.nl> Add a hidden input text field named 'website' which is hidden by CSS to not show up for normal users. Automated bots try to fill in all text fields, especially 'required' fields such as a 'website' when spamming a webform. When a comment is posted with the 'website' field filled in ignore it, so it seems that the submission is succesful. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- web/html/css/aurweb.css | 4 ++++ web/html/pkgbase.php | 3 ++- web/template/pkg_comment_form.php | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 81bf9ab..aa0a7b0 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -199,3 +199,7 @@ label.confirmation, .error { color: red; } + +#id_website { + display: none; +} diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index b716644..0241ae3 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -117,7 +117,8 @@ if (check_token()) { list($ret, $output) = pkgreq_close($_POST['reqid'], $_POST['reason'], $_POST['comments']); } elseif (current_action("do_EditComaintainers")) { list($ret, $output) = pkgbase_set_comaintainers($base_id, explode("\n", $_POST['users'])); - } elseif (current_action("do_AddComment")) { + } elseif (current_action("do_AddComment") && $_REQUEST['website'] === "") { + // website is a hidden field used to detect if a bot filled in all form elements $uid = uid_from_sid($_COOKIE["AURSID"]); list($ret, $output) = pkgbase_add_comment($base_id, $uid, $_REQUEST['comment']); if ($ret && isset($_REQUEST['enable_notifications'])) { diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 3feee8f..23322a7 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -11,6 +11,7 @@ <p> <textarea id="id_comment" name="comment" cols="80" rows="10"><?= (isset($comment_id)) ? htmlspecialchars($comment) : "" ?></textarea> </p> + <input id="id_website" type="text" name="website"/> <p> <input type="submit" value="<?= (isset($comment_id)) ? __("Save") : __("Add Comment") ?>" /> <?php if (!isset($comment_id) && !pkgbase_user_notify($uid, $base_id)): ?> -- 2.22.0

2 1

[PATCH] Update copyright year in the cgit footer template
by Michael Straube 30 Jun '19

30 Jun '19

Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- web/template/cgit/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/cgit/footer.html b/web/template/cgit/footer.html index 6ceec28..1c0bf6f 100644 --- a/web/template/cgit/footer.html +++ b/web/template/cgit/footer.html @@ -1,6 +1,6 @@ <div id="footer"> <p> - Copyright © 2004-2018 aurweb Development Team – + Copyright © 2004-2019 aurweb Development Team – <strong>AUR packages are user produced content. Any use of the provided files is at your own risk.</strong> </p> </div> -- 2.22.0

2 1

[PATCH] Implement spamming mitigations for comments
by Jelle van der Waa 30 Jun '19

30 Jun '19

This is an attempt to mitigate the spam flood which has targeted aur.archlinux.org in a simple and (hopefully) effective way. As described in the commit message it just adds a hidden field which these automated bots fill in to make the form submission look "valid" for normal users nothing changes. I also created a patch for account registration, but that patch is a bit bigger and I'm not sure if these automated bot setups are smart enough to report that registration fails although one can argue that they can detect if a comment was 'submitted'. Either way the comment patch has the smallest impact codewise and is an easy way to figure out if it works. Greetings, Jelle van der Waa

1 1

Re: [PATCH] Display warning when flagging VCS packages
by Bruno Pagani 26 May '19

26 May '19

Le 26/05/2019 à 00:04, Lukas Fleischer a écrit : > On Sat, 25 May 2019 at 13:46:45, Bruno Pagani wrote: >> Le 25/05/2019 à 19:07, Lukas Fleischer a écrit : >>> + This is a VCS package. Please do <strong>not</strong> flag this package out-of-date when the package version in the AUR does not match the most recent commit. >> Maybe we should also hint when it is appropriated to do so? E.g. missing >> new dependency or old one to be removed, moved upstream… > There already is a message stating that package flagging should not be > used to report such bugs. Is it not obvious/precise enough? Well I think it should instead be used for such bugs in the case of VCS packages, because those are the only cases where they can be OOD, and in contrary to normal packages those are valid OOD reasons. And that is the case for the linked package in the FS ticket. But I acknowledge this is not what we say currently, though I would use the opportunity of that addition to change the guidelines regarding this. And then I’m in favour of saying so in the message: “This is a VCS package. Please do not flag it out-of-date if the package version in the AUR does not match the most recent commit. Flagging this package should only be done if the sources moved or changes in the PKGBUILD are required because of recent upstream changes.” >>> +/** >>> + * Determine whether a package base is (or contains a) VCS package >>> + * >>> + * @param int $base_id The ID of the package base >>> + * >>> + * @return bool True if the package base is/contains a VCS package >>> + */ >>> +function pkgbase_is_vcs($base_id) { >>> + $suffixes = array("-cvs", "-svn", "-git", "-hg", "-bzr", "-darcs"); >> What about false positives and missing items like -nightly’s? I think it >> would be a good time to implement FS#56602, auto-seed the value >> depending on your above list and let maintainers override this. > Yes, there are false positives and false negatives. That is why we only > display a warning and do not automatically disable the feature for VCS > packages. Read the comments in FS#62733 for details. All I’ve read was the same thing as before regarding the impossibility to correctly detect all VCS packages and just them, but I did not see why manual override wouldn’t be an option. ;) Regarding false positives, without override possibility they will be misleading to users, so I don’t agree on “it’s OK because we are not plainly disabling the feature”. Also for me the strongest reason to not disable the feature for VCS packages is rather because it is still useful even for those, as stated by Eli. :) Regards, Bruno

3 3

[PATCH] Display warning when flagging VCS packages
by Lukas Fleischer 25 May '19

25 May '19

VCS packages should not be flagged out-of-date when the package version does not match the most recent commit. Implements FS#62733. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/aurweb.css | 4 ++++ web/html/pkgflag.php | 5 +++++ web/lib/pkgbasefuncs.inc.php | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index ef37bf5..81bf9ab 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -195,3 +195,7 @@ label.confirmation, .comments .more { font-weight: normal; } + +.error { + color: red; +} diff --git a/web/html/pkgflag.php b/web/html/pkgflag.php index 61346b9..2fba6bd 100644 --- a/web/html/pkgflag.php +++ b/web/html/pkgflag.php @@ -50,6 +50,11 @@ if (has_credential(CRED_PKGBASE_FLAG)): ?> <li><?= htmlspecialchars($pkgname) ?></li> <?php endforeach; ?> </ul> + <?php if (pkgbase_is_vcs($base_id)): ?> + <p class="error"> + This is a VCS package. Please do <strong>not</strong> flag this package out-of-date when the package version in the AUR does not match the most recent commit. + </p> + <?php endif; ?> <p> <?= __('Please do %snot%s use this form to report bugs. Use the package comments instead.', '<strong>', '</strong>'); ?> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 1df21a2..a492589 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -367,6 +367,27 @@ function pkgbase_get_pkgnames($base_id) { return $result->fetchAll(PDO::FETCH_COLUMN, 0); } +/** + * Determine whether a package base is (or contains a) VCS package + * + * @param int $base_id The ID of the package base + * + * @return bool True if the package base is/contains a VCS package + */ +function pkgbase_is_vcs($base_id) { + $suffixes = array("-cvs", "-svn", "-git", "-hg", "-bzr", "-darcs"); + $haystack = pkgbase_get_pkgnames($base_id); + array_push($haystack, pkgbase_name_from_id($base_id)); + foreach ($haystack as $pkgname) { + foreach ($suffixes as $suffix) { + if (substr_compare($pkgname, $suffix, -strlen($suffix)) === 0) { + return true; + } + } + } + return false; +} + /** * Delete all packages belonging to a package base * -- 2.21.0

2 3

[PATCH] Sync CSS with archweb
by Lukas Fleischer 25 May '19

25 May '19

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/archweb.css | 72 ++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index 209561f..2dc5be1 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -264,25 +264,6 @@ td { } /* table pretty styles */ -table.pretty1 { - width: auto; - margin-top: 0.25em; - margin-bottom: 0.5em; - border-collapse: collapse; - border: 1px solid #bcd; -} - - .pretty1 th { - padding: 0.35em; - background: #e4eeff; - border: 1px solid #bcd; - } - - .pretty1 td { - padding: 0.35em; - border: 1px dotted #bcd; - } - table.pretty2 { width: auto; margin-top: 0.25em; @@ -433,6 +414,10 @@ table thead th.sorter-false { cursor: default; } +.tablesorter-header:focus { + outline: none; +} + /** * PAGE SPECIFIC STYLES */ @@ -541,7 +526,7 @@ h3 span.arrow { padding: 0.15em 0.1em; margin: 0; min-width: 10em; - font-size: 0.812em; + font-size: 1em; text-align: left; list-style: none; background-color: #f6f9fc; @@ -552,6 +537,7 @@ h3 span.arrow { color: #000; } + .pkgsearch-typeahead li:hover a, .pkgsearch-typeahead li.active a { color: #07b; } @@ -652,6 +638,10 @@ div.news-article .article-info { width: 75%; } +#news-preview { + display: none; +} + /* todolists: list */ .todolist-nav { float: right; @@ -816,6 +806,10 @@ table.results { width: 45%; } +#flag-pkg-form #id_website { + display: none; +} + /* pkgdetails: deps, required by and file lists */ #pkgdetails #metadata { clear: both; @@ -983,33 +977,7 @@ table td.country { background: #ffd; } -/* dev dashboard: flagged packages */ -#dash-pkg-notify { - text-align: right; - padding: 1em 0 0; - margin-top: 1em; - font-size: 0.85em; - border-top: 1px dotted #bbb; -} - - #dash-pkg-notify label { - width: auto; - font-weight: normal; - } - - #dash-pkg-notify input { - vertical-align: middle; - margin: 0 0.25em; - } - - #dash-pkg-notify input[type=submit] { - margin-top: -0.25em; - } - - #dash-pkg-notify p { - margin: 0; - } - +/* dev dashboard: */ table.dash-stats .key { width: 50%; } @@ -1121,3 +1089,13 @@ ul.signoff-list { width: 100%; height: 100%; } + +/* releases */ +#release-table th:first-of-type { + width: 30px; +} + +/* itemprops */ +.itemprop { + display: none; +} -- 2.21.0

1 0

[PATCH] Use native language name for Finnish
by Lukas Fleischer 24 May '19

24 May '19

Addresses FS#61803. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/translator.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index 334d0e7..cbed127 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -30,7 +30,7 @@ $SUPPORTED_LANGS = array( "el" => "Ελληνικά", "es" => "Español", "es_419" => "Español (Latinoamérica)", - "fi" => "Finnish", + "fi" => "Suomi", "fr" => "Français", "he" => "עברית", "hr" => "Hrvatski", -- 2.21.0

1 0