May 2014 - Aur-dev - lists.archlinux.org

[aur-dev] [HEADS-UP] Meta data and split package support in the AUR
by Lukas Fleischer 27 Jul '14

27 Jul '14

Hello, I plan to do the next major AUR release by late May or June and I thought this might be a good time to let people know what is going on behind the scenes. AUR 3.0.0 will be able to read metadata from source packages. These metadata will be read from a file called .AURINFO (contained in the source tarball). Dave wrote several tools [1], including mkaurball which can be used to automatically build a source tarball with metadata so you don't need to worry about creating this file on your own. Having this information available means that: 1. We can drop the PKGBUILD parser from the AUR. The parser will still be available in the upcoming release but it will be marked as deprecated and a warning will be displayed whenever someone tries to upload a source tarball without metadata. 2. We can implement other things that were blocked by the AUR PKGBUILD parser being incomplete and inaccurate. Specifically, the next release will support split packages. Things that are on our TODO list: * Test the new AUR code. The split package code is still experimental. * Fix and extend the AUR RPC interface. * Test Dave's pkgbuild-introspection. * Move pkgbuild-introspection (or at least mkaurball) to [community]. It would also be nice to get metadata generation integrated into makepkg so that people no longer need to install mkaurball to generate source tarballs for the AUR. Regards, Lukas [1] https://github.com/falconindy/pkgbuild-introspection

1 1

[aur-dev] mismatched AUR IDs
by Xyne 05 Jun '14

05 Jun '14

Hi, I'm in the process of updating python3-aur for the 3.0.0 release and I have come across a bug. The IDs of recently updated packages reported by the RPC interface are incorrect. For example, etmtk is currently listed in the Recent Updates feed on the front page. The RPC interface reports the ID as 83532 but the true ID (e.g. for the deletion form) is 80587. Packages that have not been updated since the release of 3.0.0 do not appear to encounter this bug. Regards, Xyne

2 4

[aur-dev] [PATCH] Add support for TU ninja edits
by Lukas Fleischer 05 Jun '14

05 Jun '14

Trusted Users now have the ability to overwrite packages without changing ownership. This allows for adding small fixes to PKGBUILDs without disowning the package. Implements FS#32807. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgsubmit.php | 10 ++++++++-- web/lib/aur.inc.php | 5 +++++ web/lib/pkgbasefuncs.inc.php | 7 ++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index f07580b..969eb35 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -346,9 +346,15 @@ if ($uid): * base, the database ID needs to be preserved * so that any votes are retained. */ - $was_orphan = (pkgbase_maintainer_uid($base_id) === NULL); + $maintainer_uid = pkgbase_maintainer_uid($base_id); + $was_orphan = ($maintainer_uid === NULL); - pkgbase_update($base_id, $pkgbase_info['pkgbase'], $uid); + if ($was_orphan) { + /* Adopt orphan packages. */ + $maintainer_uid = $uid; + } + + pkgbase_update($base_id, $pkgbase_info['pkgbase'], $maintainer_uid, $uid); if ($category_id > 1) { pkgbase_update_category($base_id, $category_id); diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index ff46455..9fc3378 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -293,6 +293,11 @@ function html_footer($ver="") { * @return int 0 if the user can't submit, 1 if the user can submit */ function can_submit_pkgbase($name="", $sid="") { + $atype = account_from_sid($_COOKIE["AURSID"]); + if ($atype == "Trusted User" || $atype == "Developer") { + return 1; + } + if (!$name || !$sid) {return 0;} $dbh = DB::connect(); $q = "SELECT MaintainerUID "; diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 9f80ef2..9dbdff6 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -934,17 +934,18 @@ function pkgbase_create($name, $category_id, $uid) { * * @param string $name Name of the updated package base * @param int $base_id The package base ID of the affected package - * @param int $uid User ID of the package uploader + * @param int $maintainer_uid User ID of the package mainainer + * @param int $packager_uid User ID of the package uploader * * @return void */ -function pkgbase_update($base_id, $name, $uid) { +function pkgbase_update($base_id, $name, $maintainer_uid, $packager_uid) { $dbh = DB::connect(); $q = sprintf("UPDATE PackageBases SET " . "Name = %s, ModifiedTS = UNIX_TIMESTAMP(), " . "MaintainerUID = %d, PackagerUID = %d, OutOfDateTS = NULL " . "WHERE ID = %d", - $dbh->quote($name), $uid, $uid, $base_id); + $dbh->quote($name), $maintainer_uid, $packager_uid, $base_id); $dbh->exec($q); } -- 1.9.3

3 5

[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

[aur-dev] [PATCH 1/2] UPGRADING: Add missing column to the instructions
by Lukas Fleischer 27 May '14

27 May '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UPGRADING b/UPGRADING index d9860bb..71b3d1d 100644 --- a/UPGRADING +++ b/UPGRADING @@ -50,8 +50,9 @@ CREATE TABLE PackageBases ( 4. Migrate data from Packages to PackageBases: ---- -INSERT INTO PackageBases SELECT ID, Name, CategoryID, NumVotes, OutOfDateTS, - SubmittedTS, ModifiedTS, SubmitterUID, MaintainerUID FROM Packages; +INSERT INTO PackageBases + SELECT ID, Name, CategoryID, NumVotes, OutOfDateTS, SubmittedTS, + ModifiedTS, SubmitterUID, MaintainerUID, NULL FROM Packages; ---- 5. Delete unneeded foreign keys from Packages: -- 1.9.3

1 1