- Aur-dev - lists.archlinux.org

Re: [aur-dev] [aur-general] [PRQ#4382] Deletion Request for b43-firmware
by Xavion 21 Nov '15

21 Nov '15

> > As a native English speaker, I have never misinterpreted the meaning of > that link. There are plenty of words in the English language that have > multiple meanings and it doesn't prevent me or others from confusing > the intent. > Actually, that second sentence of yours seems pretty confusing to me. It looks like you've used a double negative, which gives the opposite meaning than the one you intended. I just hope you're never tasked with contributing to any of the Arch Wiki articles. > Lodge also has a noun and verb meaning. As a noun, it is a temporary > home and as a verb, it can also mean to live in a temporary home. By > your logic, this makes the word even worse of a choice. > I'm starting to wonder whether you might have Asperger syndrome. Just because the dictionary says something doesn't mean it fits all contexts. The word "file" has a double meaning with respect to the AUR, while "lodge" does not. This is because the AUR's central topic is "files", but it has nothing to do with "lodges". > Furthermore, I am a firm believer of reading documentation and the Arch > Wiki has a spot on the Arch User Repository page that explains how to > file requests [1] and how to grab the PKGBUILDs then how to install > them [2]. If the link is changed, I think Jiachen Yang has a better > solution. > My view is that leaving the AUR in a confusing state and forcing Archers to go to the Wiki for answers is a pretty stupid idea. Several people have already said that they were nearly tricked by "File Request". How many more will need to speak up before you'll finally admit that it's necessary to make a change?

1 0

Re: [aur-dev] [aur-general] [PRQ#4382] Deletion Request for b43-firmware
by Xavion 21 Nov '15

21 Nov '15

If we wish to continue using the word "file" in this context, "File Request" should be changed to "File a Request". This would prevent native English speakers from misinterpreting our use of "file" as a noun. Having said that, I still feel that "lodge" is a more appropriate term in this situation. The main reason, and I hope you're concentrating this time Mark, is that there's no double meaning (i.e. noun vs verb). For people who don't like "Lodge a Request", there's always "Make a Request". In fact, I imagine most similar websites would use the latter term in preference to either of the two mentioned alternatives. Regardless, clinging to the textbook and saying that nothing needs to be changed is too rigid and impractical. We're not doing a maths test here! This is all about practicality and cutting down on confusion.

1 0

Re: [aur-dev] [PRQ#4382] Deletion Request for b43-firmware
by Xavion 20 Nov '15

20 Nov '15

On 20 November 2015 at 13:22, <notify(a)aur.archlinux.org> wrote: > fckinshitag [1] filed a deletion request for b43-firmware [2]: > > i want this file > > [1] https://aur.archlinux.org/account/fckinshitag/ > [2] https://aur.archlinux.org/pkgbase/b43-firmware/ Okay, I see what's going on here. This guy has interpreted the "File Request" link (i.e. in the "Package Actions" section of each package 's AUR webpage ) as being a way of requesting a file (i.e. the package in this case). To prevent this kind of mixup in future, I would recommend that said link be renamed to "Lodge Request". I don't think anyone would be dumb enough to interpret this as a way of requesting lodging at the maintainer's residence.

2 2

[aur-dev] [PATCH] Describe how to omit "have" lines
by Lukas Fleischer 14 Nov '15

14 Nov '15

A new feature in Git allows for omitting "have" lines corresponding to refs outside the current Git namespace. Explain how to enable this feature in the INSTALL instructions and in the Git interface documentation. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 2 ++ doc/git-interface.txt | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/INSTALL b/INSTALL index d68fa26..d956911 100644 --- a/INSTALL +++ b/INSTALL @@ -46,6 +46,8 @@ Setup on Arch Linux # mkdir /srv/http/aurweb/aur.git/ # cd /srv/http/aurweb/aur.git/ # git init --bare + # git config --local transfer.hideRefs '^refs/' + # git config --local transfer.hideRefs '!refs/' # ln -s ../../git-interface/git-update.py hooks/update # chown -R aur . diff --git a/doc/git-interface.txt b/doc/git-interface.txt index 9ded20f..4a24eef 100644 --- a/doc/git-interface.txt +++ b/doc/git-interface.txt @@ -80,3 +80,16 @@ request. An example configuration for nginx and fcgiwrap can be found in the INSTALL instructions in the top-level directory. + +Further Configuration +--------------------- + +When using Git namespaces, Git advertises refs outside the current namespace as +so-called "have" lines. This is normally used to reduce traffic but it has the +opposite effect in the case of aurweb: Many essentially useless lines are +transferred to the Git client during `git push` operations. + +In order to omit these advertisements, add the strings "^refs/" and "!refs/" to +the transfer.hideRefs configuration setting. Note that the order of these +patterns is important ("^refs/" must come first) and that Git 2.7 or newer is +required for them to work. -- 2.6.2

1 0

[aur-dev] [PATCH] Make the notification script configurable
by Lukas Fleischer 14 Nov '15

14 Nov '15

Add a configuration option to set the path of the notification script. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 1 + web/lib/acctfuncs.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/config.proto b/conf/config.proto index de9acdf..2390dfa 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -32,6 +32,7 @@ enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 [notifications] +notify-cmd = /srv/http/aurweb/scripts/notify.py sendmail = /usr/bin/sendmail sender = notify(a)aur.archlinux.org reply-to = noreply(a)aur.archlinux.org diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index a200998..a166d65 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -1282,7 +1282,7 @@ function account_set_ssh_keys($uid, $ssh_keys, $ssh_fingerprints) { * @return void */ function notify($params, $text='') { - $cmd = realpath('../../scripts/notify.py'); + $cmd = config_get('notifications', 'notify-cmd'); foreach ($params as $param) { $cmd .= ' ' . escapeshellarg($param); } -- 2.6.2

1 0

[aur-dev] [PATCH] Remove redundant code
by Lukas Fleischer 14 Nov '15

14 Nov '15

This code is no longer needed since 9746a65 (Port notification routines to Python, 2015-06-27). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index afccc7d..3c199d6 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -91,21 +91,7 @@ function pkgbase_add_comment($base_id, $uid, $comment) { $q.= $dbh->quote($comment) . ", UNIX_TIMESTAMP())"; $dbh->exec($q); - /* - * Send e-mail notifications. - * TODO: Move notification logic to separate function where it belongs. - */ - $q = "SELECT CommentNotify.*, Users.Email "; - $q.= "FROM CommentNotify, Users "; - $q.= "WHERE Users.ID = CommentNotify.UserID "; - $q.= "AND CommentNotify.UserID != " . $uid . " "; - $q.= "AND CommentNotify.PackageBaseID = " . intval($base_id); - $result = $dbh->query($q); - $bcc = array(); - - if ($result) { - notify(array('comment', $uid, $base_id), $comment); - } + notify(array('comment', $uid, $base_id), $comment); return array(true, __('Comment has been added.')); } -- 2.6.2

1 0

[aur-dev] [PATCH] MySQL unique index on Email column too long
by Stefan Auditor 12 Nov '15

12 Nov '15

Using unique indexes on varchar fields with a character count of more than 255 on InnoDB tables with utf8 encoding produces an error in MySQL. Fixes FS#47038 Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- schema/aur-schema.sql | 2 +- upgrading/4.2.0.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 98e8be0..27cee7a 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -25,7 +25,7 @@ CREATE TABLE Users ( AccountTypeID TINYINT UNSIGNED NOT NULL DEFAULT 1, Suspended TINYINT UNSIGNED NOT NULL DEFAULT 0, Username VARCHAR(32) NOT NULL, - Email VARCHAR(256) NOT NULL, + Email VARCHAR(255) NOT NULL, HideEmail TINYINT UNSIGNED NOT NULL DEFAULT 0, Passwd CHAR(32) NOT NULL, Salt CHAR(32) NOT NULL DEFAULT '', diff --git a/upgrading/4.2.0.txt b/upgrading/4.2.0.txt index c195f41..d2d8f3c 100644 --- a/upgrading/4.2.0.txt +++ b/upgrading/4.2.0.txt @@ -15,3 +15,9 @@ CREATE UNIQUE INDEX ProviderNameProvides ON OfficialProviders (Name, Provides); ---- ALTER TABLE Users MODIFY Email VARCHAR(256) NOT NULL; ---- + +3. Resize the email address field: + +---- +ALTER TABLE Users MODIFY Email VARCHAR(255) NOT NULL; +---- -- 2.6.2

2 3

[aur-dev] [PATCH] Fix missing closing bracket in footer
by Stefan Auditor 11 Nov '15

11 Nov '15

Fixes FS#47034 Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- 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

2 2

[aur-dev] Display of alternative source name instead of URL on packages' web pages
by Peter Mattern 31 Oct '15

31 Oct '15

Hello. An alternative source name set in variable 'source' of PKBDUILD is replacing the URL in packages' web pages, see e. g. https://aur.archlinux.org/packages/cantata-git/ where section "Sources (1)" states "cantata-git" instead of "git+https://github.com/CDrummond/cantata.git". I'm not absolutely sure whether this behaviour may eventually be expected but actually don't think it makes a lot of sense. So wouldn't it be better to have the URL displayed regardless of an alternative source name is set or not? Regards, Peter Mattern

5 7

[aur-dev] [PATCH] notify: Fix merging of header dicts
by Lukas Fleischer 26 Oct '15

26 Oct '15

Fixes another regression introduced in c764999 (notify: Split out email header generation, 2015-10-10). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/notify.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/notify.py b/scripts/notify.py index 4832baf..d3d9cb0 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -242,7 +242,8 @@ def request_open(cur, uid, reqid, reqtype, pkgbase_id, merge_into=None): refs = '[1] ' + user_uri + '\n' refs += '[2] ' + pkgbase_uri + '\n' thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>' - headers = headers_msgid(thread_id) + headers_cc(cc) + headers = headers_reply(thread_id) + headers.update(headers_cc(cc)) send_notification(to, subject, body, refs, headers) @@ -263,7 +264,8 @@ def request_close(cur, uid, reqid, reason): body += ':\n\n' + text refs = '[1] ' + user_uri thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>' - headers = headers_reply(thread_id) + headers_cc(cc) + headers = headers_reply(thread_id) + headers.update(headers_cc(cc)) send_notification(to, subject, body, refs, headers) -- 2.6.2

1 0