- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] RPC: Provide out-of-date timestamp
by Lukas Fleischer 23 Sep '11

23 Sep '11

Convert the "OutOfDate" field to provide a timestamp instead of a boolean flag in JSON results. We don't really care about backward compatibility here, as most AUR helpers would break anyway when trying to parse RPC responses after the data type overhaul that should come with one of the following patches. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/aurjson.class.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index b596359..b4648c9 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -18,9 +18,8 @@ class AurJSON { 'search', 'info', 'multiinfo', 'msearch' ); private static $fields = array( - 'Packages.ID', 'Name', 'Version', 'CategoryID', - 'Description', 'URL', 'License', - 'NumVotes', '(OutOfDateTS IS NOT NULL) AS OutOfDate', + 'Packages.ID', 'Name', 'Version', 'CategoryID', 'Description', 'URL', + 'License', 'NumVotes', 'OutOfDateTS AS OutOfDate', 'SubmittedTS AS FirstSubmitted', 'ModifiedTS AS LastModified' ); -- 1.7.6.3

1 1

[aur-dev] [PATCH] web/html/pkgsubmit.php: Deal with unset category ID
by Lukas Fleischer 02 Sep '11

02 Sep '11

Do not move the package to the incoming package directory and fail to create proper database entries if some AUR upload helper doesn't provide a category. We got several failing constraints here, such as: Cannot add or update a child row: a foreign key constraint fails (`AUR`.`Packages`, CONSTRAINT `Packages_ibfk_1` FOREIGN KEY (`CategoryID`) REFERENCES `PackageCategories` (`ID`) ON DELETE NO ACTION) Instead, default to "1" (which is "none", or "keep category" for existing packages) if no category is supplied. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgsubmit.php | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 54c4b3e..f715e15 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -311,6 +311,18 @@ if ($uid): $pkg_version = sprintf('%s-%s', $new_pkgbuild['pkgver'], $new_pkgbuild['pkgrel']); } + # Check the category to use, "1" meaning "none" (or "keep category" for + # existing packages). + if (isset($_POST['category'])) { + $category_id = intval($_POST['category']); + if ($category_id <= 0) { + $category_id = 1; + } + } + else { + $category_id = 1; + } + if ($pdata) { # This is an overwrite of an existing package, the database ID # needs to be preserved so that any votes are retained. However, @@ -324,9 +336,9 @@ if ($uid): db_query($q, $dbh); # If a new category was chosen, change it to that - if ($_POST['category'] > 1) { + if ($category_id > 1) { $q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d", - mysql_real_escape_string($_REQUEST['category']), + $category_id, $packageID); db_query($q, $dbh); @@ -350,7 +362,7 @@ if ($uid): mysql_real_escape_string($new_pkgbuild['pkgname']), mysql_real_escape_string($new_pkgbuild['license']), mysql_real_escape_string($pkg_version), - mysql_real_escape_string($_REQUEST['category']), + $category_id, mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['url']), $uid, -- 1.7.6.1

1 0

[aur-dev] [PATCH] Link to current page in the login bar HTTPs link
by Lukas Fleischer 26 Aug '11

26 Aug '11

This is way more convenient if you follow a HTTP link. Implements FS#25757. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/login_form.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/template/login_form.php b/web/template/login_form.php index 419e031..f12c5b6 100644 --- a/web/template/login_form.php +++ b/web/template/login_form.php @@ -31,8 +31,8 @@ elseif (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) else { ?> <span class='error'> - <?php echo __("HTTP login is disabled. Please switch to HTTPs if you want to login: "); ?> - <a href="https://aur.archlinux.org/">https://aur.archlinux.org/</a> + <?php printf(__("HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."), + '<a href="https://aur.archlinux.org' . htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES) . '">', '</a>'); ?> </span> <?php } ?> </div> -- 1.7.6.1

1 0

[aur-dev] Git workflow changes
by Lukas Fleischer 22 Aug '11

22 Aug '11

To simplify the preparation of proper maintenance releases, I just created a separate maintenance branch ("maint"). From now on, all maintenance-related commits will be merged into this branch. I also decided to delete the "stable" branch which used to be nothing more than a reference to the latest release. Follow the "maint" branch or checkout the latest annotated tag instead.

1 0

[aur-dev] [PATCH] RPC: Fix info queries when using package IDs
by Lukas Fleischer 22 Aug '11

22 Aug '11

Info queries using package IDs were no longer working due to commit c6d84b3a8df10c522d79c754d4f73cb2a352586f, which introduced a table join in process_query(), thus making the "ID" column ambiguous. Fix this by explicitly specifying the table to use. Fixes FS#25696. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/aurjson.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 277c824..b596359 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -203,7 +203,7 @@ class AurJSON { // just using sprintf to coerce the pqd to an int // should handle sql injection issues, since sprintf will // bork if not an int, or convert the string to a number 0 - $where_condition = "ID={$pqdata}"; + $where_condition = "Packages.ID={$pqdata}"; } else { $where_condition = sprintf("Name=\"%s\"", -- 1.7.6

1 0

[aur-dev] [PATCH] RPC: Coerce numeric values into integers
by Lukas Fleischer 21 Aug '11

21 Aug '11

Coerce "ID", "FirstSubmitted" and "LastModified" into integers to ensure json_encode() serializes them as numeric values. This means that there will be a minor API break. There doesn't seem to be a better way to do this properly, though. Fixes FS#25693. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/aurjson.class.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 277c824..ad99529 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -126,6 +126,9 @@ class AurJSON { while ( $row = mysql_fetch_assoc($result) ) { $name = $row['Name']; $row['URLPath'] = URL_DIR . substr($name, 0, 2) . "/" . $name . "/" . $name . ".tar.gz"; + $row['ID'] = intval($row['ID']); + $row['FirstSubmitted'] = intval($row['FirstSubmitted']); + $row['LastModified'] = intval($row['LastModified']); if ($type == 'info') { $search_data = $row; -- 1.7.6

3 4

[aur-dev] [PATCH] Add missing __() to category info in package details
by Lukas Fleischer 20 Aug '11

20 Aug '11

This makes the "Category" label as well as "Change category" button on the package details page translatable. Fixes FS#25692. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index c03493d..880a675 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -10,7 +10,7 @@ if ($uid == $row["MaintainerUID"] or $edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n"; $edit_cat.= "<p>"; $edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory' />"; - $edit_cat.= "<span class='f3'>Category:</span> "; + $edit_cat.= "<span class='f3'>" . __("Category") . ":</span> "; $edit_cat.= "<select name='category_id'>\n"; foreach ($catarr as $cid => $catname) { $edit_cat.= "<option value='$cid'"; @@ -19,13 +19,13 @@ if ($uid == $row["MaintainerUID"] or } $edit_cat.=">".$catname."</option>"; } - $edit_cat.= "</select> <input type='submit' value='Change category' />"; + $edit_cat.= "</select> <input type='submit' value='" . __("Change category") . "' />"; $edit_cat.= "</p>"; $edit_cat.= "</form>"; } else { - $edit_cat = "<span class='f3'>Category: " . $row['Category'] . "</span>"; + $edit_cat = "<span class='f3'>" . __("Category") . ": " . $row['Category'] . "</span>"; } if ($row["SubmitterUID"]) { -- 1.7.6

1 0

[aur-dev] [PATCH] Provide more examples on the RPC info page
by Lukas Fleischer 20 Aug '11

20 Aug '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/rpc.php | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/html/rpc.php b/web/html/rpc.php index ee7cda3..415dcb8 100644 --- a/web/html/rpc.php +++ b/web/html/rpc.php @@ -18,7 +18,7 @@ else { // here. ?> <html><body> -<p>The methods currently allowed are:</p> +<h2>Allowed methods</h2> <ul> <li><tt>search</tt></li> <li><tt>info</tt></li> @@ -29,7 +29,14 @@ else { <pre>type=<em>methodname</em>&arg=<em>data</em></pre> <p>Where <em>methodname</em> is the name of an allowed method, and <em>data</em> is the argument to the call.</p> <p>If you need jsonp type callback specification, you can provide an additional variable <em>callback</em>.</p> -<p>Example URL: <tt>http://aur-url/rpc.php?type=search&arg=foobar&callback=jsonp1192244…</tt></p> +<h2>Examples</h2> +<dl> + <dt><tt>search</tt></dt><dd><tt>http://aur-url/rpc.php?type=search&arg=foobar</tt></li></dd> + <dt><tt>info</tt></dt><dd><tt>http://aur-url/rpc.php?type=info&arg=foobar</tt></dd> + <dt><tt>multiinfo</tt></dt><dd><tt>http://aur-url/rpc.php?type=multiinfo&arg[]=foo&arg[]=bar</tt></dd> + <dt><tt>msearch</tt></dt><dd><tt>http://aur-url/rpc.php?type=msearch&arg=john</tt></li></dd> + <dt>Callback</dt><dd><tt>http://aur-url/rpc.php?type=search&arg=foobar&callback=jsonp1192244…</tt></dd> +</dl> </body></html> <?php // close if statement -- 1.7.6

1 0

[aur-dev] [PATCH] UPGRADING: Fix rewrite rules
by Lukas Fleischer 20 Aug '11

20 Aug '11

Do not attempt to rewrite "/packages/fo/foo/foo.tar.gz". Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADING b/UPGRADING index dad4adf..c0866e5 100644 --- a/UPGRADING +++ b/UPGRADING @@ -28,13 +28,13 @@ container or optionally create a ".htaccess" file in the upload directory): ---- RewriteEngine on -RewriteRule ^/packages/([^/]{1,2})([^/]*/(PKGBUILD|.*\.tar\.gz|))$ /packages/$1/$1$2 +RewriteRule ^/packages/([^/]{1,2})([^/]*/(PKGBUILD|[^/]*\.tar\.gz|))$ /packages/$1/$1$2 ---- The following equivalent rule can be used for lighttpd setups: ---- -url.rewrite-once = ( "^/packages/([^/]{1,2})([^/]*/(PKGBUILD|.*\.tar\.gz|))$" => "/packages/$1/$1$2" ) +url.rewrite-once = ( "^/packages/([^/]{1,2})([^/]*/(PKGBUILD|[^/]*\.tar\.gz|))$" => "/packages/$1/$1$2" ) ---- If you use a non-standard URL_DIR, slight modifications might be necessary. -- 1.7.6

1 0

[aur-dev] AUR 1.9.0 released
by Lukas Fleischer 20 Aug '11

20 Aug '11

Important changes: * Using gettext and Transifex for translations, several translation additions and changes (make sure to read UPGRADING) * New package notification script dropped * The RPC interface now supports a "multiinfo" query and provides "First submitted" and "Last modified" fields * ETag support for the RPC interface * Use HTTPs links, HTTP login disabled by default * Add the possibility to merge package comments and votes * Support more than 32,000 packages when using ext3 * Several small bug fixes Check the Git log [1] for a complete list. The official Arch Linux AUR setup [2] will be upgraded soon! [1] http://projects.archlinux.org/aur.git/log/?id=72b657eb [2] https://aur.archlinux.org/

2 3