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

[aur-dev] AUR 3.4.2 released
by Lukas Fleischer 29 Jul '14

29 Jul '14

Hello, I am pleased to announce that AUR 3.4.2 has been released. The official AUR setup [1] has already been updated. This release includes several bug fixes regarding the requests interface. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the AUR bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aur.git/log/?id=v3.4.2 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH] Lock fresh orphan requests
by Lukas Fleischer 29 Jul '14

29 Jul '14

Trusted Users should almost always wait for two weeks before accepting an orphan request. Lock orphan requests during the first two weeks. Package bases can still be orphaned and package requests can still be closed manually during that period of time. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkgreq_results.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 5e64476..3d50c82 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -33,6 +33,19 @@ <tbody> <?php while (list($indx, $row) = each($results)): ?> + <?php + $due = ($row['Open'] && time() - intval($row['RequestTS']) > $REQUEST_IDLE_TIME); + if (!$due) { + $time_left = $REQUEST_IDLE_TIME - (time() - intval($row['RequestTS'])); + if ($time_left > 48 * 3600) { + $time_left_fmt = __("~%d days left", round($time_left / (24 * 3600))); + } elseif ($time_left > 3600) { + $time_left_fmt = _n("~%d hour left", "~%d hours left", round($time_left / 3600)); + } else { + $time_left_fmt = __("<1 hour left"); + } + } + ?> <tr class="<?= ($indx % 2 == 0) ? 'odd' : 'even' ?>"> <?php if ($row['BaseID']): ?> <td><a href="<?= htmlspecialchars(get_pkgbase_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) ?></a></td> @@ -53,7 +66,7 @@ <td> <a href="<?= get_uri('/account/') . htmlspecialchars($row['User'], ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($row['User'])) ?>"><?= htmlspecialchars($row['User']) ?></a> </td> - <td<?php if ($row['Open'] && time() - intval($row['RequestTS']) > $REQUEST_IDLE_TIME): ?> class="flagged"<?php endif; ?>><?= gmdate("Y-m-d H:i", intval($row['RequestTS'])) ?></td> + <td<?php if ($due): ?> class="flagged"<?php endif; ?>><?= gmdate("Y-m-d H:i", intval($row['RequestTS'])) ?></td> <?php if ($row['Open']): ?> <td> <?php if ($row['BaseID']): ?> @@ -63,12 +76,15 @@ <?php elseif ($row['Type'] == 'merge'): ?> <a href="<?= get_pkgbase_uri($row['Name']) ?>merge/?into=<?= urlencode($row['MergeInto']) ?>&via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> <br /> - <?php elseif ($row['Type'] == 'orphan'): ?> + <?php elseif ($row['Type'] == 'orphan' && $due): ?> <form action="<?= get_pkgbase_uri($row['Name']) . 'disown/'; ?>" method="post"> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="hidden" name="via" value="<?= intval($row['ID']) ?>" /> <input type="submit" class="button text-button" name="do_Disown" value="<?= __('Accept') ?>" /> </form> + <?php elseif ($row['Type'] == 'orphan' && !$due): ?> + <?= __('Locked') ?> (<?= $time_left_fmt ?>) + <br /> <?php endif; ?> <?php endif; ?> <a href="<?= get_pkgreq_route() . '/' . intval($row['ID']) ?>/close/"><?= __('Close') ?></a> -- 2.0.3

1 0

[aur-dev] [PATCH 1/2] Remove duplicate recipients from Cc
by Lukas Fleischer 29 Jul '14

29 Jul '14

When a user files a request for a package maintained by himself, he is currently included in the Cc list twice. Use array_unique() to omit repeated entries. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgreqfuncs.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 8fba838..2ae64e0 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -173,6 +173,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { "[2] " . $AUR_LOCATION . get_pkgbase_uri($row['Name']) . "\n"; } $body = wordwrap($body, 70); + $cc = array_unique($cc); $headers = "MIME-Version: 1.0\r\n" . "Content-type: text/plain; charset=UTF-8\r\n" . "Cc: " . implode(', ', $cc) . "\r\n"; @@ -281,6 +282,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) { $body .= "\n"; } $body = wordwrap($body, 70); + $cc = array_unique($cc); $headers = "MIME-Version: 1.0\r\n" . "Content-type: text/plain; charset=UTF-8\r\n" . "Cc: " . implode(', ', $cc) . "\r\n"; -- 2.0.3

1 1

[aur-dev] [PATCH] Allow users to delete their own comments
by Lukas Fleischer 29 Jul '14

29 Jul '14

Fixes a regression introduced in 03c6304 (Rework permission handling, 2014-07-15). Fixes FS#41379. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 69b1c94..defe7f4 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -13,27 +13,19 @@ include_once("pkgbasefuncs.inc.php"); * @return bool True if the user can delete the comment, otherwise false */ function can_delete_comment($comment_id=0) { - if (!uid_from_sid($_COOKIE["AURSID"])) { - /* Unauthenticated users cannot delete anything. */ - return false; - } - if (has_credential(CRED_COMMENT_DELETE)) { - /* TUs and developers can delete any comment. */ - return true; - } - $dbh = DB::connect(); - $q = "SELECT COUNT(*) FROM PackageComments "; - $q.= "WHERE ID = " . intval($comment_id) . " AND UsersID = " . $uid; + $q = "SELECT UsersID FROM PackageComments "; + $q.= "WHERE ID = " . intval($comment_id); $result = $dbh->query($q); if (!$result) { return false; } - $row = $result->fetch(PDO::FETCH_NUM); - return ($row[0] > 0); + $uid = $result->fetch(PDO::FETCH_COLUMN, 0); + + return has_credential(CRED_COMMENT_DELETE, array($uid)); } /** -- 2.0.3

1 0

[aur-dev] AUR 3.4.1 released
by Lukas Fleischer 29 Jul '14

29 Jul '14

Hello, I am pleased to announce that AUR 3.4.1 has been released. The official AUR setup [1] has already been updated. This release includes bug fixes regarding the account registration form and translations. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the AUR bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aur.git/log/?id=v3.4.1 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH 1/3] Do not show deletion link on the registration page
by Lukas Fleischer 29 Jul '14

29 Jul '14

In 7df8dc8 (Add support for deleting user accounts, 2014-07-25), a link to the account deletion page was added to the account edit form. Make sure we only show this link if the user actually wants to edit an account and do not show this link on the account registration page. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/account_edit_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 3733985..17dd937 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -1,8 +1,8 @@ +<?php if ($A == "UpdateAccount"): ?> <p> <?= __('Click %shere%s if you want to permanently delete this account.', '<a href="' . get_user_uri($U) . 'delete/' . '">', '</a>') ?> </p> -<?php if ($A == "UpdateAccount"): ?> <form id="edit-profile-form" action="<?= get_user_uri($U) . 'update/'; ?>" method="post"> <?php else: ?> <form id="edit-profile-form" action="<?= get_uri('/register/'); ?>" method="post"> -- 2.0.3

1 2

[aur-dev] [PATCH] Make deleted comments visible to Trusted Users
by Lukas Fleischer 29 Jul '14

29 Jul '14

This allows Trusted Users to check whether a user posted a politically incorrect comment, even if he already deleted it. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/aur.css | 4 ++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 20 ++++++++++++++------ web/lib/pkgfuncs.inc.php | 3 ++- web/template/pkg_comments.php | 12 ++++++++---- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/web/html/css/aur.css b/web/html/css/aur.css index 9435e22..654116a 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -68,3 +68,7 @@ padding: 0; border: none; } + +.comment-deleted { + color: #999; +} diff --git a/web/lib/credentials.inc.php b/web/lib/credentials.inc.php index 47dd3fd..efc203d 100644 --- a/web/lib/credentials.inc.php +++ b/web/lib/credentials.inc.php @@ -7,6 +7,7 @@ define("CRED_ACCOUNT_EDIT_DEV", 3); define("CRED_ACCOUNT_LAST_LOGIN", 4); define("CRED_ACCOUNT_SEARCH", 5); define("CRED_COMMENT_DELETE", 6); +define("CRED_COMMENT_VIEW_DELETED", 22); define("CRED_PKGBASE_ADOPT", 7); define("CRED_PKGBASE_CHANGE_CATEGORY", 8); define("CRED_PKGBASE_DELETE", 9); @@ -55,6 +56,7 @@ function has_credential($credential, $approved_users=array()) { case CRED_ACCOUNT_LAST_LOGIN: case CRED_ACCOUNT_SEARCH: case CRED_COMMENT_DELETE: + case CRED_COMMENT_VIEW_DELETED: case CRED_PKGBASE_ADOPT: case CRED_PKGBASE_CHANGE_CATEGORY: case CRED_PKGBASE_DELETE: diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 0d6b22b..cf0b09b 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -25,10 +25,11 @@ function pkgbase_categories() { * Get the number of non-deleted comments for a specific package base * * @param string $base_id The package base ID to get comment count for + * @param bool $include_deleted True if deleted comments should be included * * @return string The number of comments left for a specific package */ -function pkgbase_comments_count($base_id) { +function pkgbase_comments_count($base_id, $include_deleted) { $base_id = intval($base_id); if (!$base_id) { return null; @@ -37,7 +38,9 @@ function pkgbase_comments_count($base_id) { $dbh = DB::connect(); $q = "SELECT COUNT(*) FROM PackageComments "; $q.= "WHERE PackageBaseID = " . $base_id . " "; - $q.= "AND DelUsersID IS NULL"; + if (!$include_deleted) { + $q.= "AND DelUsersID IS NULL"; + } $result = $dbh->query($q); if (!$result) { return null; @@ -51,10 +54,11 @@ function pkgbase_comments_count($base_id) { * * @param int $base_id The package base ID to get comments for * @param int $limit Maximum number of comments to return (0 means unlimited) + * @param bool $include_deleted True if deleted comments should be included * * @return array All package comment information for a specific package base */ -function pkgbase_comments($base_id, $limit) { +function pkgbase_comments($base_id, $limit, $include_deleted) { $base_id = intval($base_id); $limit = intval($limit); if (!$base_id) { @@ -63,10 +67,13 @@ function pkgbase_comments($base_id, $limit) { $dbh = DB::connect(); $q = "SELECT PackageComments.ID, UserName, UsersID, Comments, "; - $q.= "CommentTS FROM PackageComments LEFT JOIN Users "; + $q.= "CommentTS, DelUsersID FROM PackageComments LEFT JOIN Users "; $q.= "ON PackageComments.UsersID = Users.ID "; $q.= "WHERE PackageBaseID = " . $base_id . " "; - $q.= "AND DelUsersID IS NULL ORDER BY CommentTS DESC"; + if (!$include_deleted) { + $q.= "AND DelUsersID IS NULL "; + } + $q.= "ORDER BY CommentTS DESC"; if ($limit > 0) { $q.=" LIMIT " . $limit; } @@ -242,7 +249,8 @@ function pkgbase_display_details($base_id, $row, $SID="") { } $limit = isset($_GET['comments']) ? 0 : 10; - $comments = pkgbase_comments($base_id, $limit); + $include_deleted = has_credential(CRED_COMMENT_VIEW_DELETED); + $comments = pkgbase_comments($base_id, $limit, $include_deleted); if (!empty($comments)) { include('pkg_comments.php'); } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 8c2a67d..69b1c94 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -436,7 +436,8 @@ function pkg_display_details($id=0, $row, $SID="") { } $limit = isset($_GET['comments']) ? 0 : 10; - $comments = pkgbase_comments($base_id, $limit); + $include_deleted = has_credential(CRED_COMMENT_VIEW_DELETED); + $comments = pkgbase_comments($base_id, $limit, $include_deleted); if (!empty($comments)) { include('pkg_comments.php'); } diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 9961554..3e99d9b 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -6,7 +6,8 @@ if (isset($row['BaseID'])) { /* On a package base details page. */ $base_id = $row['ID']; } -$count = pkgbase_comments_count($base_id); +$include_deleted = has_credential(CRED_COMMENT_VIEW_DELETED); +$count = pkgbase_comments_count($base_id, $include_deleted); ?> <div id="news"> <h3> @@ -18,8 +19,8 @@ $count = pkgbase_comments_count($base_id); <?php if ($row['UserName'] && $SID): $row['UserName'] = "<a href=\"" . get_user_uri($row['UserName']) . "\">{$row['UserName']}</a>"; endif; ?> - <h4> - <?php if (can_delete_comment_array($row)): ?> + <h4<?php if ($row['DelUsersID']): ?> class="comment-deleted"<?php endif; ?>> + <?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> <input type="hidden" name="action" value="do_DeleteComment" /> @@ -39,10 +40,13 @@ $count = pkgbase_comments_count($base_id); <?php else: ?> <?= __('Anonymous comment') ?> <?php endif; ?> + <?php if ($row['DelUsersID']): ?> + (<?= __('deleted') ?>) + <?php endif; ?> <?php endif; ?> </h4> <p class="timestamp"><?= gmdate('Y-m-d H:i', $row['CommentTS']) ?></p> - <div class="article-content"> + <div class="article-content<?php if ($row['DelUsersID']): ?> comment-deleted<?php endif; ?>"> <p> <?= parse_comment($row['Comments']) ?> </p> -- 2.0.2

4 9

[aur-dev] AUR 3.4.0 released
by Lukas Fleischer 28 Jul '14

28 Jul '14

Hello, I am pleased to announce that AUR 3.4.0 has been released. The official AUR setup [1] has already been updated. This release includes several improvements to the package request feature and a couple of bug fixes. The PKGBUILD parser has been dropped, you can no longer upload source packages without meta data. Also, a new user group "Trusted User & Developer" was added. I already converted a couple of accounts to the new group; please let me know if I missed anyone. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the AUR bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aur.git/log/?id=v3.4.0 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH] Auto-generate po/POTFILES
by Lukas Fleischer 27 Jul '14

27 Jul '14

Reduce maintenance costs by auto-generating po/POTFILES in the Makefile. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- .gitignore | 1 + po/Makefile | 7 +++++-- po/POTFILES | 58 ---------------------------------------------------------- 3 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 po/POTFILES diff --git a/.gitignore b/.gitignore index 11e9b7e..ed22497 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ dummy-data.sql* web/locale/*/ po/*.mo po/*.po~ +po/POTFILES diff --git a/po/Makefile b/po/Makefile index 97e1822..49eab32 100644 --- a/po/Makefile +++ b/po/Makefile @@ -44,7 +44,10 @@ all: ${MOFILES} lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ msgmerge -U --no-location --lang="$$lang" $< aur.pot -update-pot: +POTFILES: + find ../web -type f -name '*.php' -printf '%P\n' | sort >POTFILES + +update-pot: POTFILES pkgname=AUR; \ pkgver=`sed -n 's/.*"AUR_VERSION", "$.*$".*/\1/p' ../web/lib/version.inc.php`; \ xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \ @@ -57,7 +60,7 @@ update-po: ${MAKE} ${UPDATEPOFILES} clean: - rm -f *.mo *.po\~ + rm -f *.mo *.po\~ POTFILES install: all for l in ${LOCALES}; do mkdir -p ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/; done diff --git a/po/POTFILES b/po/POTFILES deleted file mode 100644 index 2b9322b..0000000 --- a/po/POTFILES +++ /dev/null @@ -1,58 +0,0 @@ -html/404.php -html/account.php -html/addvote.php -html/home.php -html/index.php -html/login.php -html/logout.php -html/packages.php -html/passreset.php -html/pkgbase.php -html/pkgdel.php -html/pkgmerge.php -html/pkgreq.php -html/pkgsubmit.php -html/rpc.php -html/rss.php -html/tu.php -html/voters.php -lib/acctfuncs.inc.php -lib/Archive/PEAR5.php -lib/Archive/PEAR.php -lib/Archive/Tar.php -lib/aur.inc.php -lib/aurjson.class.php -lib/cachefuncs.inc.php -lib/DB.class.php -lib/feedcreator.class.php -lib/gettext.php -lib/pkgbasefuncs.inc.php -lib/pkgfuncs.inc.php -lib/pkgreqfuncs.inc.php -lib/routing.inc.php -lib/stats.inc.php -lib/streams.php -lib/translator.inc.php -lib/version.inc.php -template/account_delete.php -template/account_details.php -template/account_edit_form.php -template/account_search_results.php -template/actions_form.php -template/footer.php -template/header.php -template/pkgbase_details.php -template/pkg_comment_form.php -template/pkg_comments.php -template/pkg_details.php -template/pkgreq_form.php -template/pkgreq_results.php -template/pkg_search_form.php -template/pkg_search_results.php -template/search_accounts_form.php -template/stats/general_stats_table.php -template/stats/updates_table.php -template/stats/user_table.php -template/tu_details.php -template/tu_last_votes_list.php -template/tu_list.php -- 2.0.3

1 0

[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