- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Add hard limit for the length of dependency lists
by Lukas Fleischer 28 Apr '16

28 Apr '16

Introduce a configuration option max_depends which can be used to specify a maximum number of (reverse) dependencies to display on the package details pages. Fixes FS#49059. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 1 + web/lib/pkgfuncs.inc.php | 10 ++++++---- web/template/pkg_details.php | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 560c705..64af774 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -21,6 +21,7 @@ aur_location = https://aur.archlinux.org git_clone_uri_anon = https://aur.archlinux.org/%s.git git_clone_uri_priv = ssh://aur@aur.archlinux.org/%s.git max_rpc_results = 5000 +max_depends = 1000 aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 auto_orphan_age = 15552000 diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index eaea318..4b0fdba 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -230,10 +230,11 @@ function pkg_providers($name) { * Get package dependencies for a specific package * * @param int $pkgid The package to get dependencies for + * @param int $limit An upper bound for the number of packages to retrieve * * @return array All package dependencies for the package */ -function pkg_dependencies($pkgid) { +function pkg_dependencies($pkgid, $limit) { $deps = array(); $pkgid = intval($pkgid); if ($pkgid > 0) { @@ -243,7 +244,7 @@ function pkg_dependencies($pkgid) { $q.= "OR SUBSTRING(pd.DepName FROM 1 FOR POSITION(': ' IN pd.DepName) - 1) = p.Name "; $q.= "LEFT JOIN DependencyTypes dt ON dt.ID = pd.DepTypeID "; $q.= "WHERE pd.PackageID = ". $pkgid . " "; - $q.= "ORDER BY pd.DepName"; + $q.= "ORDER BY pd.DepName LIMIT " . intval($limit); $result = $dbh->query($q); if (!$result) { return array(); @@ -505,10 +506,11 @@ function pkg_source_link($url, $arch) { * * @param string $name The package name for the dependency search * @param array $provides A list of virtual provisions of the package + * @param int $limit An upper bound for the number of packages to retrieve * * @return array All packages that depend on the specified package name */ -function pkg_required($name="", $provides) { +function pkg_required($name="", $provides, $limit) { $deps = array(); if ($name != "") { $dbh = DB::connect(); @@ -523,7 +525,7 @@ function pkg_required($name="", $provides) { $q.= "LEFT JOIN DependencyTypes dt ON dt.ID = pd.DepTypeID "; $q.= "WHERE pd.DepName IN (" . $name_list . ") "; $q.= "OR SUBSTRING(pd.DepName FROM 1 FOR POSITION(': ' IN pd.DepName) - 1) IN (" . $name_list . ") "; - $q.= "ORDER BY p.Name"; + $q.= "ORDER BY p.Name LIMIT " . intval($limit); $result = $dbh->query($q); if (!$result) {return array();} while ($row = $result->fetch(PDO::FETCH_NUM)) { diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 8b038b9..b9c66d4 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -5,6 +5,7 @@ $log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['BaseName']) $snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['BaseName'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['BaseName'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['BaseName'])); +$max_depends = config_get_int('options', 'max_depends'); $uid = uid_from_sid($SID); @@ -40,7 +41,7 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($ $lics = pkg_licenses($row["ID"]); $grps = pkg_groups($row["ID"]); -$deps = pkg_dependencies($row["ID"]); +$deps = pkg_dependencies($row["ID"], $max_depends); usort($deps, function($x, $y) { if ($x[1] != $y[1]) { @@ -82,7 +83,7 @@ foreach ($rels as $rel) { } } -$requiredby = pkg_required($row["Name"], $rels_p); +$requiredby = pkg_required($row["Name"], $rels_p, $max_depends); # $sources[0] = 'src'; $sources = pkg_sources($row["ID"]); -- 2.8.0

2 3

[aur-dev] Frequent ipv6 timeouts
by Colin Woodbury 21 Apr '16

21 Apr '16

Something is amiss. I'm the author of Aura, and I've had users come to me in droves recently saying that Aura: 1. Can't connect to the AUR 2. Doesn't recognize legitimate packages as AUR packages 3. Can't install/upgrade, etc And so I dove into my [http libraries]( http://hackage.haskell.org/package/aur) and tested the hell out of everything. After some tweaks, everything seemed to work. Until it didn't. More manual testing has shown me that when resolving requests to the RPC via ipv6, most calls timeout/hang. I'm seeing this through my libraries, through firefox, and through curl. However, when forcing the request to resolve via ipv4, it always succeeds: ``` curl -4 "https://aur.archlinux.org/rpc?v=5&type=search&arg=foobar" ``` The following forum posts touch on the same problem: * [Ssl and ipv6](https://bbs.archlinux.org/viewtopic.php?id=210932) * [AUR being screwy](https://bbs.archlinux.org/viewtopic.php?id=206820) Can anyone else confirm this behaviour? For the record, I'm on the west coast of North America.

1 0

[aur-dev] [PATCH] Change text of enable notifications link
by Mark Weiman 18 Mar '16

18 Mar '16

Since notifications are sent for more than just comments, change the notify link to more generic text. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- web/template/pkgbase_actions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php index 237e712..d3f0592 100644 --- a/web/template/pkgbase_actions.php +++ b/web/template/pkgbase_actions.php @@ -24,7 +24,7 @@ <?php if (pkgbase_user_notify($uid, $base_id)): ?> <li><?= html_action_form($base_uri . 'unnotify/', "do_UnNotify", __('Disable notifications')) ?></li> <?php else: ?> - <li><?= html_action_form($base_uri . 'notify/', "do_Notify", __('Notify of new comments')) ?></li> + <li><?= html_action_form($base_uri . 'notify/', "do_Notify", __('Enable notifications')) ?></li> <?php endif; ?> <?php if (has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array($row["MaintainerUID"]))): ?> -- 2.7.3

2 1

[aur-dev] [PATCH] Resize the LastLoginIPAddress column
by Lukas Fleischer 15 Mar '16

15 Mar '16

Make sure that all valid IPv6 addresses fit into the LastLoginIPAddress field. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 2 +- upgrading/4.3.0.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index aa5ed9d..0804ac3 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -35,7 +35,7 @@ CREATE TABLE Users ( IRCNick VARCHAR(32) NOT NULL DEFAULT '', PGPKey VARCHAR(40) NULL DEFAULT NULL, LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0, - LastLoginIPAddress VARCHAR(40) NULL DEFAULT NULL, + LastLoginIPAddress VARCHAR(45) NULL DEFAULT NULL, InactivityTS BIGINT UNSIGNED NOT NULL DEFAULT 0, RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, CommentNotify TINYINT(1) NOT NULL DEFAULT 1, diff --git a/upgrading/4.3.0.txt b/upgrading/4.3.0.txt index 0d3a9b7..34b19a2 100644 --- a/upgrading/4.3.0.txt +++ b/upgrading/4.3.0.txt @@ -3,3 +3,9 @@ ---- ALTER TABLE Users ADD COLUMN OwnershipNotify TINYINT(1) NOT NULL DEFAULT 1; ---- + +2. Resize the LastLoginIPAddress column: + +---- +ALTER TABLE Users MODIFY LastLoginIPAddress VARCHAR(45) NULL DEFAULT NULL; +---- -- 2.7.3

1 0

[aur-dev] [PATCH] Fix instructions for omitting "have" lines
by Lukas Fleischer 15 Mar '16

15 Mar '16

In 002d348 (Describe how to omit "have" lines, 2015-11-14), we added instructions on how to omit "have" lines originating from other package repositories. Fix those instructions such that the HEAD ref of the repository is transferred properly. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 3 ++- doc/git-interface.txt | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index be39052..8b0cd29 100644 --- a/INSTALL +++ b/INSTALL @@ -47,7 +47,8 @@ Setup on Arch Linux # cd /srv/http/aurweb/aur.git/ # git init --bare # git config --local transfer.hideRefs '^refs/' - # git config --local transfer.hideRefs '!refs/' + # git config --local --add transfer.hideRefs '!refs/' + # git config --local --add transfer.hideRefs '!HEAD' # 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 4a24eef..69c558b 100644 --- a/doc/git-interface.txt +++ b/doc/git-interface.txt @@ -89,7 +89,7 @@ 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. +In order to omit these advertisements, add the strings "^refs/", "!refs/" and +"!HEAD" 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.7.3

1 0

[aur-dev] [PATCH] Limit comment height to 15 lines
by Eric Engestrom 14 Mar '16

14 Mar '16

Signed-off-by: Eric Engestrom <eric(a)engestrom.ch> --- web/html/css/aurweb.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index f5e1037..f777ab8 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -148,3 +148,8 @@ label.confirmation, color: red; font-weight: bold; } + +#news div p { + max-height: 15em; + overflow: auto; +} -- 2.7.2

4 4

[aur-dev] [PATCH] Store last login address as plain text
by Lukas Fleischer 14 Mar '16

14 Mar '16

Directly store the information contained in $_SERVER['REMOTE_ADDR'] instead of using ip2long() which does not support IPv6 addresses. Note that the LastLoginIPAddress field is designed to be used by the administrator on rare occasions only (e.g. to fight spam) and is not displayed anywhere. Fixes FS#48557. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 2 +- upgrading/4.2.1.txt | 5 +++++ web/lib/acctfuncs.inc.php | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 upgrading/4.2.1.txt diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 1a141c1..aa5ed9d 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -35,7 +35,7 @@ CREATE TABLE Users ( IRCNick VARCHAR(32) NOT NULL DEFAULT '', PGPKey VARCHAR(40) NULL DEFAULT NULL, LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0, - LastLoginIPAddress INTEGER UNSIGNED NOT NULL DEFAULT 0, + LastLoginIPAddress VARCHAR(40) NULL DEFAULT NULL, InactivityTS BIGINT UNSIGNED NOT NULL DEFAULT 0, RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, CommentNotify TINYINT(1) NOT NULL DEFAULT 1, diff --git a/upgrading/4.2.1.txt b/upgrading/4.2.1.txt new file mode 100644 index 0000000..83c8d46 --- /dev/null +++ b/upgrading/4.2.1.txt @@ -0,0 +1,5 @@ +1. Convert the LastLoginIPAddress column to VARCHAR(40): + +---- +ALTER TABLE Users MODIFY LastLoginIPAddress VARCHAR(40) NULL DEFAULT NULL; +---- diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index b39420f..2d70f65 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -554,8 +554,8 @@ function try_login() { } $q = "UPDATE Users SET LastLogin = UNIX_TIMESTAMP(), "; - $q.= "LastLoginIPAddress = " . $dbh->quote(ip2long($_SERVER['REMOTE_ADDR'])) . " "; - $q.= "WHERE ID = '$userID'"; + $q.= "LastLoginIPAddress = " . $dbh->quote($_SERVER['REMOTE_ADDR']) . " "; + $q.= "WHERE ID = $userID"; $dbh->exec($q); /* Set the SID cookie. */ -- 2.7.3

3 3

[aur-dev] [PATCH] Remove code referencing non-existent and unused file
by Ian D. Scott 13 Mar '16

13 Mar '16

--- web/html/index.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 3787d4e..78ab6ad 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -167,10 +167,6 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { header("Content-Type: image/gif"); readfile("./$path"); break; - case "/css/archnavbar/archlogo.gif": - header("Content-Type: image/png"); - readfile("./$path"); - break; case "/css/archnavbar/archlogo.png": case "/css/archnavbar/aurlogo.png": case "/images/favicon.ico": -- 2.7.2

2 1

[aur-dev] [PATCH] Fix l10n of "more"
by Lukas Fleischer 11 Mar '16

11 Mar '16

Use __() instead of _() to make the string translatable. Fixes FS#48529. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/stats/updates_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 4e2d39d..580583b 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -1,4 +1,4 @@ -<h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&SO=d"><?= _('more') ?></a>)</span></h3> +<h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&SO=d"><?= __('more') ?></a>)</span></h3> <a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a> -- 2.7.2

1 0

[aur-dev] [PATCH 1/2] popupdate: Avoid NULL entries in the popularity field
by Lukas Fleischer 01 Mar '16

01 Mar '16

The popularity field is declared as "NOT NULL" in the database schema. Fix the popularity update query such that it uses a popularity of 0.0 instead of NULL for packages with no votes. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/popupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/popupdate.py b/scripts/popupdate.py index 2aa8a54..f3ba513 100755 --- a/scripts/popupdate.py +++ b/scripts/popupdate.py @@ -22,7 +22,7 @@ cur.execute("UPDATE PackageBases SET NumVotes = (SELECT COUNT(*) FROM " + "PackageVotes WHERE PackageVotes.PackageBaseID = PackageBases.ID)") cur.execute("UPDATE PackageBases SET Popularity = (" + - "SELECT SUM(POWER(0.98, (UNIX_TIMESTAMP() - VoteTS) / 86400)) " + + "SELECT COALESCE(SUM(POWER(0.98, (UNIX_TIMESTAMP() - VoteTS) / 86400)), 0.0) " + "FROM PackageVotes WHERE PackageVotes.PackageBaseID = " + "PackageBases.ID AND NOT VoteTS IS NULL)") -- 2.7.2

1 1