- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] pkgfuncs.inc.php: Avoid printing duplicates in "Required by"
by canyonknight 05 Nov '12

05 Nov '12

Packages with multiple DepConditions are returned multiple times in the "Required by" column. Array is multi-dimensional so cannot have array_unique() run over it directly to remove duplicates. Serialize the array, remove duplicates, then unserialize the array. Fixes FS#32478 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/pkgfuncs.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 8f84cdf..4beaec3 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -178,6 +178,8 @@ function package_required($name="", $dbh=NULL) { while ($row = $result->fetch(PDO::FETCH_NUM)) { $deps[] = $row; } + + $deps = array_map('unserialize', array_unique(array_map('serialize', $deps))); } return $deps; } -- 1.8.0

1 0

[aur-dev] [BUG] Notification emails have broken URLs
by D. Can Celasun 05 Nov '12

05 Nov '12

Greetings, I've just received a mail like this: > Your package linux-mainline-dellxps has been flagged out of date by > *** [1]. You may view your package at: > https://aur.archlinux.org//packages/linux-mainline-dellxps/ > >[1] - https://aur.archlinux.org//account/***/ Notice the double slash after "org". Clicking the package link works fine, but making a POST request from that page (i.e commenting) redirects me to http://packages/linux-mainline-dellxps/ which obviously does not exist. Cheers, Can

2 1

[aur-dev] [PATCH 1/3] routing.inc.php: Return proper (non-virtual) URIs
by Lukas Fleischer 04 Nov '12

04 Nov '12

Make sure we always return root-relative URIs in get_pkg_uri() and in get_user_uri() and prepend a slash ("/") if the virtual URL feature is disabled. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/routing.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index dfd6942..206886c 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -54,7 +54,7 @@ function get_pkg_uri($pkgname) { if ($USE_VIRTUAL_URLS) { return $PKG_PATH . '/' . urlencode($pkgname) . '/'; } else { - return get_route($PKG_PATH) . '?N=' . urlencode($pkgname); + return '/' . get_route($PKG_PATH) . '?N=' . urlencode($pkgname); } } @@ -70,6 +70,6 @@ function get_user_uri($username) { if ($USE_VIRTUAL_URLS) { return $USER_PATH . '/' . urlencode($username) . '/'; } else { - return get_route($USER_PATH) . '?U=' . urlencode($username); + return '/' . get_route($USER_PATH) . '?U=' . urlencode($username); } } -- 1.8.0

1 2

[aur-dev] [PATCH] pkgsubmit.php: Show a warning for split packages
by Lukas Fleischer 04 Nov '12

04 Nov '12

Display a special error message if the package is identified as split package. Currently, the AUR displays a very vague error message when a split package is submitted ("Invalid name: only lowercase letters are allowed"). This often caused confusion among package submitters, see FS#22834 and FS#32450. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgsubmit.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 885c44f..5dd58af 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -269,6 +269,10 @@ if ($uid): } # Now we've parsed the pkgbuild, let's move it to where it belongs + if (!$error && $pkg_name[0] == '(') { + $error = __("Error - The AUR does not support split packages!"); + } + if (!$error) { $pkg_name = str_replace("'", "", $new_pkgbuild['pkgname']); $pkg_name = escapeshellarg($pkg_name); -- 1.8.0

1 0

[aur-dev] [PATCH 1/3] header.php: Do not lowercase language selection entries
by Lukas Fleischer 04 Nov '12

04 Nov '12

Commit 091c2b5f5523773604699b914c19e6b02ce290bc introduced lower casing to the language drop-down list. Revert this and use htmlspecialchars() to escape language entries instead. Addresses FS#32453. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/template/header.php b/web/template/header.php index a60174b..92cb2ff 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -37,9 +37,9 @@ reset($SUPPORTED_LANGS); foreach ($SUPPORTED_LANGS as $lang => $lang_name) { - print '<option value="' . strtolower($lang) . '"' . + print '<option value="' . htmlspecialchars($lang, ENT_QUOTES) . '"' . ($lang == $LANG ? ' selected="selected"' : '') . - '>' . strtolower($lang) . "</option>\n"; + '>' . htmlspecialchars($lang) . "</option>\n"; } ?> </select> -- 1.8.0

1 2

[aur-dev] [PATCH] UPGRADING: Remove reference to Archive_Tar
by Lukas Fleischer 04 Nov '12

04 Nov '12

The Archive_Tar PEAR module is no longer needed as of commit acdf9a85a0ff320f55d6eebb2ba7550fea61a5bb. Remove the associated upgrading instruction. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/UPGRADING b/UPGRADING index dcf9169..bf486a7 100644 --- a/UPGRADING +++ b/UPGRADING @@ -13,13 +13,11 @@ ALTER TABLE Users ADD COLUMN PGPKey VARCHAR(40) NULL DEFAULT NULL; 2. Merge "web/lib/config.inc.php.proto" with "web/lib/config.inc.php". -3. Update Archive_Tar to version greater than 1.3.7. +3. Enable the PDO MySQL extension (pdo_mysql.so) in "php.ini". -4. Enable the PDO MySQL extension (pdo_mysql.so) in "php.ini". +4. Upgrade to PHP>=5.4.0 or enable "short_open_tag" in "php.ini". -5. Upgrade to PHP>=5.4.0 or enable "short_open_tag" in "php.ini". - -6. Install translations by running `make install` in "po/". +5. Install translations by running `make install` in "po/". From 1.9.0 to 1.9.1 ------------------- -- 1.8.0

1 0

[aur-dev] [PATCH] Return 404 for invalid account/package subpages
by Lukas Fleischer 30 Oct '12

30 Oct '12

Display an error page and return a 404 status code in the following cases: * An invalid package name is passed to the "packages" action. * An invalid user name is passed to the "account" action. * An invalid package action is passed. * An invalid account action is passed. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 422c0e5..3b46ab9 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -7,15 +7,21 @@ include_once("pkgfuncs.inc.php"); $path = $_SERVER['PATH_INFO']; $tokens = explode('/', $path); -if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { - if (isset($tokens[2])) { +if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { + if (!empty($tokens[2])) { /* TODO: Create a proper data structure to pass variables from * the routing framework to the individual pages instead of * initializing arbitrary variables here. */ $pkgname = $tokens[2]; $pkgid = pkgid_from_name($pkgname); - if (isset($tokens[3])) { + if (!$pkgid) { + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; + } + + if (!empty($tokens[3])) { if ($tokens[3] == 'voters') { $_GET['ID'] = pkgid_from_name($tokens[2]); include('voters.php'); @@ -49,6 +55,10 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "merge": include('pkgmerge.php'); return; + default: + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; } if (isset($_COOKIE['AURSID'])) { @@ -60,17 +70,25 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } include get_route('/' . $tokens[1]); -} elseif (isset($tokens[1]) && '/' . $tokens[1] == get_user_route()) { - if (isset($tokens[2])) { - $_REQUEST['U'] = $tokens[2]; +} elseif (!empty($tokens[1]) && '/' . $tokens[1] == get_user_route()) { + if (!empty($tokens[2])) { + $_REQUEST['ID'] = uid_from_username($tokens[2]); - if (isset($tokens[3])) { + if (!$_REQUEST['ID']) { + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; + } + + if (!empty($tokens[3])) { if ($tokens[3] == 'edit') { $_REQUEST['Action'] = "DisplayAccount"; } elseif ($tokens[3] == 'update') { $_REQUEST['Action'] = "UpdateAccount"; } else { - $_REQUEST['Action'] = "AccountInfo"; + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; } } else { $_REQUEST['Action'] = "AccountInfo"; -- 1.8.0

1 0

[aur-dev] [PATCH] pkgsubmit.php: Check that there is one directory in a tarball
by canyonknight 29 Oct '12

29 Oct '12

Users are able to upload tarballs without a directory. The directory count for a tarball is available, so use it to display an error when there is not a single directory. This patch has no effect on users who generate their uploaded tarballs using makepkg. All other users must include a directory in their tarball. Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- The error message isn't great. But this avoids messing up the string freeze. web/html/pkgsubmit.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index efd90e1..885c44f 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -106,6 +106,10 @@ if ($uid): } } + if (!$error && $dircount !== 1) { + $error = __("Error - source tarball may not contain files outside a directory."); + } + if (!$error && empty($pkgbuild_raw)) { $error = __("Error trying to unpack upload - PKGBUILD does not exist."); } -- 1.8.0

2 1

[aur-dev] [PATCH] home.php: Remove unneeded tables
by Lukas Fleischer 28 Oct '12

28 Oct '12

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/home.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/web/html/home.php b/web/html/home.php index 40ad5fe..97de8bb 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -100,22 +100,10 @@ $dbh = db_connect(); </form> </div> <div id="pkg-updates" class="widget box"> - <table> - <tr> - <td class="pkg-name"> - <?php updates_table($dbh); ?> - </td> - </tr> - </table> + <?php updates_table($dbh); ?> </div> <div id="pkg-stats" class="widget box"> - <table> - <tr> - <td class="pkg-name"> - <?php general_stats_table($dbh); ?> - </td> - </tr> - </table> + <?php general_stats_table($dbh); ?> </div> </div> -- 1.8.0

1 0

[aur-dev] AUR 2.0.0-rc2 released
by Lukas Fleischer 28 Oct '12

28 Oct '12

2.0.0-rc2 has been released. The demo setup [1] is already up-to-date. The final release is scheduled for next week, please report any bugs to the bug tracker [2]. [1] https://dev.aur.archlinux.org/ [2] https://bugs.archlinux.org/index.php?project=2

3 4