- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] Fix links to AUR packages in optional dependencies
by Lukas Fleischer 05 Jun '14

05 Jun '14

Extend the SQL query that tries to find a package's dependencies so that optional dependencies with a description are correctly resolved. Fixes FS#40700. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 3bbf1a1..fed7c03 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -170,6 +170,7 @@ function pkg_dependencies($pkgid) { $dbh = DB::connect(); $q = "SELECT pd.DepName, dt.Name, pd.DepCondition, p.ID FROM PackageDepends pd "; $q.= "LEFT JOIN Packages p ON pd.DepName = p.Name "; + $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"; -- 2.0.0

1 1

[aur-dev] [PATCH] Increase the size of several database fields
by Lukas Fleischer 05 Jun '14

05 Jun '14

Several fields turned out to be too small (e.g. when long package versions are used in VCS packages). Since the type of all affected fields is VARCHAR, there is no reason to keep them as small as possible. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 17 +++++++++++++++++ schema/aur-schema.sql | 14 +++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/UPGRADING b/UPGRADING index a45c970..863fde3 100644 --- a/UPGRADING +++ b/UPGRADING @@ -1,6 +1,23 @@ Upgrading ========= +From 3.0.0 to 3.1.0 +------------------- + +1. Increase the size of all fields containing package names, license names, +group names or package versions: + +---- +ALTER TABLE PackageBases MODIFY Name VARCHAR(255) NOT NULL; +ALTER TABLE Packages + MODIFY Name VARCHAR(255) NOT NULL, + MODIFY Version VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE Licenses MODIFY Name VARCHAR(255) NOT NULL; +ALTER TABLE Groups MODIFY Name VARCHAR(255) NOT NULL; +ALTER TABLE PackageDepends MODIFY DepCondition VARCHAR(255); +ALTER TABLE PackageRelations MODIFY RelCondition VARCHAR(255); +---- + From 2.3.1 to 3.0.0 ------------------- diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index adacdf0..0efae93 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -96,7 +96,7 @@ INSERT INTO PackageCategories (Category) VALUES ('fonts'); -- CREATE TABLE PackageBases ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, - Name VARCHAR(64) NOT NULL, + Name VARCHAR(255) NOT NULL, CategoryID TINYINT UNSIGNED NOT NULL DEFAULT 1, NumVotes INTEGER UNSIGNED NOT NULL DEFAULT 0, OutOfDateTS BIGINT UNSIGNED NULL DEFAULT NULL, @@ -125,8 +125,8 @@ CREATE TABLE PackageBases ( CREATE TABLE Packages ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, PackageBaseID INTEGER UNSIGNED NOT NULL, - Name VARCHAR(64) NOT NULL, - Version VARCHAR(32) NOT NULL DEFAULT '', + Name VARCHAR(255) NOT NULL, + Version VARCHAR(255) NOT NULL DEFAULT '', Description VARCHAR(255) NOT NULL DEFAULT "An Arch Package", URL VARCHAR(255) NOT NULL DEFAULT "https://www.archlinux.org", PRIMARY KEY (ID), @@ -139,7 +139,7 @@ CREATE TABLE Packages ( -- CREATE TABLE Licenses ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, - Name VARCHAR(64) NOT NULL, + Name VARCHAR(255) NOT NULL, PRIMARY KEY (ID), UNIQUE (Name) ) ENGINE = InnoDB; @@ -160,7 +160,7 @@ CREATE TABLE PackageLicenses ( -- CREATE TABLE Groups ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, - Name VARCHAR(64) NOT NULL, + Name VARCHAR(255) NOT NULL, PRIMARY KEY (ID), UNIQUE (Name) ) ENGINE = InnoDB; @@ -196,7 +196,7 @@ CREATE TABLE PackageDepends ( PackageID INTEGER UNSIGNED NOT NULL, DepTypeID TINYINT UNSIGNED NOT NULL, DepName VARCHAR(255) NOT NULL, - DepCondition VARCHAR(20), + DepCondition VARCHAR(255), INDEX (PackageID), INDEX (DepName), FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE, @@ -222,7 +222,7 @@ CREATE TABLE PackageRelations ( PackageID INTEGER UNSIGNED NOT NULL, RelTypeID TINYINT UNSIGNED NOT NULL, RelName VARCHAR(255) NOT NULL, - RelCondition VARCHAR(20), + RelCondition VARCHAR(255), INDEX (PackageID), INDEX (RelName), FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE, -- 2.0.0

1 0

[aur-dev] [PATCH] Display versioned conflicts/provides/replaces
by Lukas Fleischer 05 Jun '14

05 Jun '14

Show the specific conflicts/provides/replaces versions in the web interface. Implements FS#40699. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 19daefc..c813e35 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -213,9 +213,9 @@ if ($SID && ($uid == $row["MaintainerUID"] || <?php foreach($rels_c as $rarr): ?> <span class="related"> <?php if ($rarr !== end($rels_c)): ?> - <?= htmlspecialchars($rarr[0]) ?>, + <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>, <?php else: ?> - <?= htmlspecialchars($rarr[0]) ?> + <?= htmlspecialchars($rarr[0] . $rarr[2]) ?> <?php endif; ?> </span> <?php endforeach; ?> @@ -229,9 +229,9 @@ if ($SID && ($uid == $row["MaintainerUID"] || <?php foreach($rels_p as $rarr): ?> <span class="related"> <?php if ($rarr !== end($rels_p)): ?> - <?= htmlspecialchars($rarr[0]) ?>, + <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>, <?php else: ?> - <?= htmlspecialchars($rarr[0]) ?> + <?= htmlspecialchars($rarr[0] . $rarr[2]) ?> <?php endif; ?> </span> <?php endforeach; ?> @@ -245,9 +245,9 @@ if ($SID && ($uid == $row["MaintainerUID"] || <?php foreach($rels_r as $rarr): ?> <span class="related"> <?php if ($rarr !== end($rels_r)): ?> - <?= htmlspecialchars($rarr[0]) ?>, + <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>, <?php else: ?> - <?= htmlspecialchars($rarr[0]) ?> + <?= htmlspecialchars($rarr[0] . $rarr[2]) ?> <?php endif; ?> </span> <?php endforeach; ?> -- 2.0.0

1 0

[aur-dev] [PATCH] Collapse long source lists
by Lukas Fleischer 04 Jun '14

04 Jun '14

In commit e582cfe (Collapse long dependency lists, 2014-04-18), we added code to automatically collapse dependency and requirement lists with more than 20 entries. Add the same functionality to source lists. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/packages.php | 1 + web/template/pkg_details.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web/html/packages.php b/web/html/packages.php index 466042a..2fb9cbc 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -77,6 +77,7 @@ function collapseDependsList(list) { $(document).ready(function() { collapseDependsList("#pkgdepslist"); collapseDependsList("#pkgreqslist"); + collapseDependsList("#pkgsrcslist"); }); </script> diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b3d02ac..19daefc 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -359,7 +359,7 @@ if ($row["PackagerUID"]): </div> <?php if (count($sources) > 0): ?> <div> - <ul> + <ul id="pkgsrcslist"> <?php while (list($k, $src) = each($sources)): $src = explode('::', $src); -- 2.0.0

1 0

[aur-dev] [PATCH] Add a "Search wiki" link to package details
by Lukas Fleischer 31 May '14

31 May '14

Implements FS#33153. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 1 + web/template/pkgbase_details.php | 1 + 2 files changed, 2 insertions(+) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 12aa692..b3d02ac 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -57,6 +57,7 @@ $sources = pkg_sources($row["ID"]); <ul class="small"> <li><a href="<?= $urlpath ?>/PKGBUILD"><?= __('View PKGBUILD') ?></a></li> <li><a href="<?= $urlpath . '/' . $row['BaseName'] ?>.tar.gz"><?= __('Download tarball') ?></a></li> + <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($USE_VIRTUAL_URLS && $uid): ?> <?php if ($row["OutOfDateTS"] === NULL): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index eab3a53..da9a962 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -32,6 +32,7 @@ $pkgs = pkgbase_get_pkgnames($base_id); <ul class="small"> <li><a href="<?= $urlpath ?>/PKGBUILD"><?= __('View PKGBUILD') ?></a></li> <li><a href="<?= $urlpath . '/' . $row['Name'] ?>.tar.gz"><?= __('Download tarball') ?></a></li> + <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($USE_VIRTUAL_URLS && $uid): ?> <?php if ($row["OutOfDateTS"] === NULL): ?> -- 1.9.3

1 0

[aur-dev] [PATCH] Accept upper case letters in valid_username()
by Lukas Fleischer 30 May '14

30 May '14

In commit 0722f46 (Simplify valid_user() and valid_username(), 2014-02-06), the conversion to lower case letters was unintentionally removed and in consequence, names with upper case letters have been rejected since then. Instead of reintroducing the conversion, add the "i" modifier to the regular expression validating the name to do case-insensitive pattern matching. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 962ebb4..51ffec6 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -538,7 +538,7 @@ function valid_username($user) { if (strlen($user) < USERNAME_MIN_LEN || strlen($user) > USERNAME_MAX_LEN) { return false; - } else if (!preg_match("/^[a-z0-9]+[.\-_]?[a-z0-9]+$/", $user)) { + } else if (!preg_match("/^[a-z0-9]+[.\-_]?[a-z0-9]+$/i", $user)) { return false; } -- 1.9.3

1 0

Re: [aur-dev] [aur-general] AUR 3.0.0 released
by Lukas Fleischer 29 May '14

29 May '14

On Thu, 29 May 2014 at 10:52:58, Andreas Radke wrote: > [...] > The RSS feed seems empty. > Fixed in maint. Thanks! > -Andy >

1 0

[aur-dev] [PATCH 1/2] Move latest_pkgs() to pkgfuncs.inc.php
by Lukas Fleischer 29 May '14

29 May '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/aur.inc.php | 24 ------------------------ web/lib/pkgfuncs.inc.php | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index ff46455..99f5ae4 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -550,30 +550,6 @@ function end_atomic_commit() { } /** - * Determine package information for latest package - * - * @param int $numpkgs Number of packages to get information on - * - * @return array $packages Package info for the specified number of recent packages - */ -function latest_pkgs($numpkgs) { - $dbh = DB::connect(); - - $q = "SELECT * FROM Packages "; - $q.= "ORDER BY SubmittedTS DESC "; - $q.= "LIMIT " .intval($numpkgs); - $result = $dbh->query($q); - - if ($result) { - while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $packages[] = $row; - } - } - - return $packages; -} - -/** * Merge pkgbase and package options * * Merges entries of the first and the second array. If any key appears in both diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c35147f..a43512c 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -942,3 +942,27 @@ function pkg_add_lic($pkgid, $licid) { ); $dbh->exec($q); } + +/** + * Determine package information for latest package + * + * @param int $numpkgs Number of packages to get information on + * + * @return array $packages Package info for the specified number of recent packages + */ +function latest_pkgs($numpkgs) { + $dbh = DB::connect(); + + $q = "SELECT * FROM Packages "; + $q.= "ORDER BY SubmittedTS DESC "; + $q.= "LIMIT " .intval($numpkgs); + $result = $dbh->query($q); + + if ($result) { + while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + $packages[] = $row; + } + } + + return $packages; +} -- 1.9.3

1 1

[aur-dev] Requesting ownership for package nicovideo-dl
by Jari Vetoniemi 28 May '14

28 May '14

AUR package nicovideo-dl exposes bug in python, and thus won't work without patch. I've tried to contact the maintainer by e-mail (about half a year ago) and comment for orphaning the package, but haven't got reply so far. https://aur.archlinux.org/packages/nicovideo-dl - Jari

2 2

[aur-dev] AUR 3.0.0 released
by Lukas Fleischer 27 May '14

27 May '14

Hello, I am pleased to announce that AUR 3.0.0 has just been released. The official AUR setup [1] has already been updated. Note that in order to build source packages for the AUR, you will now need to use a tool called mkaurball (instead of `makepkg --source`). It is included in the pkgbuild-introspection package [2]. For a comprehensive list of changes, please consult the Git log [3]. As usual, bugs should be reported to the AUR bug tracker [4]. [1] https://aur.archlinux.org/ [2] https://www.archlinux.org/packages/community/any/pkgbuild-introspection/ [3] https://projects.archlinux.org/aur.git/log/?id=v3.0.0 [4] https://bugs.archlinux.org/index.php?project=2

1 0