December 2015 - Aur-dev - lists.archlinux.org

[aur-dev] PHP 7 compatibility
by Pierre Schmitz 20 Dec '15

20 Dec '15

Hi, as I will push PHP 7 to our repos soon, did anybody check if the AUR is compatible? Greetings, Pierre -- Pierre Schmitz, https://pierre-schmitz.com

2 2

[aur-dev] [PATCH 1/2] Change FlaggerComment to TEXT
by Mark Weiman 14 Dec '15

14 Dec '15

Makes FlaggerComments a TEXT field to be more consistent with package comments. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- schema/aur-schema.sql | 2 +- upgrading/4.2.0.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index f99833a..0a2dcb1 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -83,7 +83,7 @@ CREATE TABLE PackageBases ( NumVotes INTEGER UNSIGNED NOT NULL DEFAULT 0, Popularity DECIMAL(10,6) UNSIGNED NOT NULL DEFAULT 0, OutOfDateTS BIGINT UNSIGNED NULL DEFAULT NULL, - FlaggerComment VARCHAR(255) NOT NULL, + FlaggerComment TEXT NOT NULL DEFAULT '', SubmittedTS BIGINT UNSIGNED NOT NULL, ModifiedTS BIGINT UNSIGNED NOT NULL, FlaggerUID INTEGER UNSIGNED NULL DEFAULT NULL, -- who flagged the package out-of-date? diff --git a/upgrading/4.2.0.txt b/upgrading/4.2.0.txt index 7482204..c012db1 100644 --- a/upgrading/4.2.0.txt +++ b/upgrading/4.2.0.txt @@ -28,3 +28,9 @@ ALTER TABLE PackageComments ADD COLUMN PinnedTS BIGINT UNSIGNED NOT NULL DEFAULT ---- ALTER TABLE PackageRequests ADD COLUMN ClosureComment TEXT NOT NULL DEFAULT ''; ---- + +4. Change FlaggerComment from varchar to text. + +---- +ALTER TABLE PackageBases MODIFY COLUMN FlaggerComment TEXT NOT NULL DEFAULT ''; +---- -- 2.6.4

1 1

[aur-dev] [PATCH 1/2] Store current date and time when deleting comments
by Lukas Fleischer 13 Dec '15

13 Dec '15

Instead of modifying EditedTS when a comment is deleted, use a separate field DelTS. Use this field to determine whether a comment has been deleted, instead of checking DelUsersID which might be unset when the corresponding user is deleted. Fixes FS#47362. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 1 + upgrading/4.2.0.txt | 13 ++++++++++--- web/lib/pkgbasefuncs.inc.php | 8 ++++---- web/template/pkg_comments.php | 34 ++++++++++++++++++++-------------- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index f99833a..0c1b08a 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -260,6 +260,7 @@ CREATE TABLE PackageComments ( CommentTS BIGINT UNSIGNED NOT NULL DEFAULT 0, EditedTS BIGINT UNSIGNED NULL DEFAULT NULL, EditedUsersID INTEGER UNSIGNED NULL DEFAULT NULL, + DelTS BIGINT UNSIGNED NULL DEFAULT NULL, DelUsersID INTEGER UNSIGNED NULL DEFAULT NULL, PinnedTS BIGINT UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (ID), diff --git a/upgrading/4.2.0.txt b/upgrading/4.2.0.txt index 7482204..851d384 100644 --- a/upgrading/4.2.0.txt +++ b/upgrading/4.2.0.txt @@ -16,14 +16,21 @@ CREATE UNIQUE INDEX ProviderNameProvides ON OfficialProviders (Name, Provides); ALTER TABLE Users MODIFY Email VARCHAR(254) NOT NULL; ---- -3. Add new column in PackageComments for pinning system. +3. Add new columns to the PackageComments table: ---- -ALTER TABLE PackageComments ADD COLUMN PinnedTS BIGINT UNSIGNED NOT NULL DEFAULT 0; +ALTER TABLE PackageComments + ADD COLUMN DelTS BIGINT UNSIGNED NULL DEFAULT NULL, + ADD COLUMN PinnedTS BIGINT UNSIGNED NOT NULL DEFAULT 0; ---- +4. Update the deletion time stamp of all deleted comments: -3. Add new column to store the closure comment of package requests: +---- +UPDATE PackageComments SET DelTS = EditedTS WHERE DelUsersID IS NOT NULL; +---- + +5. Add new column to store the closure comment of package requests: ---- ALTER TABLE PackageRequests ADD COLUMN ClosureComment TEXT NOT NULL DEFAULT ''; diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 7b744d5..1abe426 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -21,7 +21,7 @@ function pkgbase_comments_count($base_id, $include_deleted, $only_pinned=false) $q = "SELECT COUNT(*) FROM PackageComments "; $q.= "WHERE PackageBaseID = " . $base_id . " "; if (!$include_deleted) { - $q.= "AND DelUsersID IS NULL"; + $q.= "AND DelTS IS NULL"; } if ($only_pinned) { $q.= "AND NOT PinnedTS = 0"; @@ -53,7 +53,7 @@ function pkgbase_comments($base_id, $limit, $include_deleted, $only_pinned=false $dbh = DB::connect(); $q = "SELECT PackageComments.ID, A.UserName AS UserName, UsersID, Comments, "; - $q.= "PackageBaseID, CommentTS, EditedTS, B.UserName AS EditUserName, "; + $q.= "PackageBaseID, CommentTS, DelTS, EditedTS, B.UserName AS EditUserName, "; $q.= "DelUsersID, C.UserName AS DelUserName, "; $q.= "PinnedTS FROM PackageComments "; $q.= "LEFT JOIN Users A ON PackageComments.UsersID = A.ID "; @@ -62,7 +62,7 @@ function pkgbase_comments($base_id, $limit, $include_deleted, $only_pinned=false $q.= "WHERE PackageBaseID = " . $base_id . " "; if (!$include_deleted) { - $q.= "AND DelUsersID IS NULL "; + $q.= "AND DelTS IS NULL "; } if ($only_pinned) { $q.= "AND NOT PinnedTS = 0 "; @@ -918,7 +918,7 @@ function pkgbase_delete_comment() { if (can_delete_comment($comment_id)) { $q = "UPDATE PackageComments "; $q.= "SET DelUsersID = ".$uid.", "; - $q.= "EditedTS = UNIX_TIMESTAMP() "; + $q.= "DelTS = UNIX_TIMESTAMP() "; $q.= "WHERE ID = ".intval($comment_id); $dbh->exec($q); return array(true, __("Comment has been deleted.")); diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 4f3ee3d..5a15fab 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -25,25 +25,30 @@ if (!isset($count)) { $heading = __('Anonymous comment on %s', $date_fmtd); } - if ($uid && $row['EditedTS']) { + $is_deleted = $row['DelTS']; + $is_edited = $row['EditedTS']; + $is_pinned = $row['PinnedTS']; + + if ($uid && $is_deleted) { + $date_fmtd = gmdate('Y-m-d H:i', $row['DelTS']); + $user_fmtd = html_format_username($row['DelUserName']); + $heading .= ' <span class="edited">('; + $heading .= __('deleted on %s by %s', $date_fmtd, $user_fmtd); + $heading .= ')</span>'; + } elseif ($uid && $is_edited) { $date_fmtd = gmdate('Y-m-d H:i', $row['EditedTS']); + $user_fmtd = html_format_username($row['EditUserName']); $heading .= ' <span class="edited">('; - if ($row['DelUsersID']) { - $user_fmtd = html_format_username($row['DelUserName']); - $heading .= __('deleted on %s by %s', $date_fmtd, $user_fmtd); - } else { - $user_fmtd = html_format_username($row['EditUserName']); - $heading .= __('last edited on %s by %s', $date_fmtd, $user_fmtd); - } + $heading .= __('edited on %s by %s', $date_fmtd, $user_fmtd); $heading .= ')</span>'; } $row['DelUserName'] = html_format_username($row['DelUserName']); $row['EditUserName'] = html_format_username($row['EditUserName']); ?> - <h4 id="comment-<?= $row['ID'] ?>"<?php if ($row['DelUsersID']): ?> class="comment-deleted"<?php endif; ?>> + <h4 id="comment-<?= $row['ID'] ?>"<?php if ($is_deleted): ?> class="comment-deleted"<?php endif; ?>> <?= $heading ?> - <?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?> + <?php if (!$is_deleted && can_delete_comment_array($row)): ?> <form class="delete-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> <input type="hidden" name="action" value="do_DeleteComment" /> @@ -53,11 +58,12 @@ if (!isset($count)) { </fieldset> </form> <?php endif; ?> - <?php if (!$row['DelUsersID'] && can_edit_comment_array($row)): ?> + + <?php if (!$is_deleted && can_edit_comment_array($row)): ?> <a href="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name) . 'edit-comment/?comment_id=' . $row['ID'], ENT_QUOTES) ?>" class="edit-comment" title="<?= __('Edit comment') ?>"><img src="/images/pencil.min.svg" alt="<?= __('Edit comment') ?>" width="11" height="11"></a> <?php endif; ?> - <?php if (!$row['DelUsersID'] && !$row['PinnedTS'] && can_pin_comment_array($row) && !(pkgbase_comments_count($base_id, false, true) >= 5)): ?> + <?php if (!$is_deleted && !$is_pinned && can_pin_comment_array($row) && !(pkgbase_comments_count($base_id, false, true) >= 5)): ?> <form class="pin-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> <input type="hidden" name="action" value="do_PinComment" /> @@ -69,7 +75,7 @@ if (!isset($count)) { </form> <?php endif; ?> - <?php if (!$row['DelUsersID'] && $row['PinnedTS'] && can_pin_comment_array($row)): ?> + <?php if (!$is_deleted && $is_pinned && can_pin_comment_array($row)): ?> <form class="pin-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> <input type="hidden" name="action" value="do_UnpinComment" /> @@ -80,7 +86,7 @@ if (!isset($count)) { </form> <?php endif; ?> </h4> - <div class="article-content<?php if ($row['DelUsersID']): ?> comment-deleted<?php endif; ?>"> + <div class="article-content<?php if ($is_deleted): ?> comment-deleted<?php endif; ?>"> <p> <?= parse_comment($row['Comments']) ?> </p> -- 2.6.4

1 1

[aur-dev] [PATCH] Add a "more" link to the recent updates box
by Lukas Fleischer 13 Dec '15

13 Dec '15

Implements FS#46924. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/stats/updates_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 7cad3fa..c1f8c6b 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -1,4 +1,4 @@ -<h3><?= __("Recent Updates") ?></h3> +<h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&SO=d">more</a>)</span></h3> <a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a> -- 2.6.4

1 1

[aur-dev] [PATCH] Add instructions to install needed python modules
by Mark Weiman 13 Dec '15

13 Dec '15

Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- INSTALL | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index d68fa26..2e89c18 100644 --- a/INSTALL +++ b/INSTALL @@ -49,12 +49,16 @@ Setup on Arch Linux # ln -s ../../git-interface/git-update.py hooks/update # chown -R aur . -7) Install the git-auth wrapper script: +7) Install Needed Python Modules: + + # pacman -S python-mysql-connector python-pygit2 + +8) Install the git-auth wrapper script: # cd /srv/http/aurweb/git-interface/ # make && make install -8) Configure sshd(8) for the AUR. Add the following lines at the end of your +9) Configure sshd(8) for the AUR. Add the following lines at the end of your sshd_config(5) and restart the sshd. Note that OpenSSH 6.9 or newer is needed! @@ -63,8 +67,8 @@ Setup on Arch Linux AuthorizedKeysCommand /usr/local/bin/aur-git-auth "%t" "%k" AuthorizedKeysCommandUser aur -9) If you want to enable smart HTTP support with nginx and fcgiwrap, you can - use the following directives: +10) If you want to enable smart HTTP support with nginx and fcgiwrap, you can + use the following directives: location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" { fastcgi_pass unix:/run/fcgiwrap.sock; -- 2.6.4

2 1

[aur-dev] [PATCH] cgitrc.proto: Add the aurweb favicon
by Lukas Fleischer 12 Dec '15

12 Dec '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/cgitrc.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/cgitrc.proto b/conf/cgitrc.proto index cb77367..1b3eacb 100644 --- a/conf/cgitrc.proto +++ b/conf/cgitrc.proto @@ -1,6 +1,7 @@ virtual-root=/cgit/ clone-prefix=https://aur.archlinux.org noheader=0 +favicon=/images/favicon.ico logo= css=/css/cgit.css snapshots=tar.gz -- 2.6.4

1 0

[aur-dev] [PATCH] aurjson: Do not search by ID when argument is numeric
by Lukas Fleischer 12 Dec '15

12 Dec '15

When performing info or multiinfo queries, one can currently either pass package names or package IDs as parameters. As a consequence, it is impossible to search for packages with a numeric package name because numeric arguments are always treated as IDs. Since package IDs are not public anymore these days, simply remove the possibility to search by ID in revision 5 of the RPC interface. Fixes FS#47324. Suggested-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 9097035..51a7c64 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -346,7 +346,7 @@ class AurJSON { if (!$arg) { continue; } - if (is_numeric($arg)) { + if ($this->version < 5 && is_numeric($arg)) { $id_args[] = intval($arg); } else { $name_args[] = $this->dbh->quote($arg); @@ -405,7 +405,7 @@ class AurJSON { */ private function info($http_data) { $pqdata = $http_data['arg']; - if (is_numeric($pqdata)) { + if ($this->version < 5 && is_numeric($pqdata)) { $where_condition = "Packages.ID = $pqdata"; } else { $where_condition = "Packages.Name = " . $this->dbh->quote($pqdata); -- 2.6.4

1 0

[aur-dev] [PATCH] aurjson: Do not interpret hexadecimal strings as IDs
by Lukas Fleischer 12 Dec '15

12 Dec '15

When performing info or multiinfo queries, one can either pass package names or package IDs are parameters. Currently, strings like "0xdbe" are parsed as package IDs which is not what we want. Change the parser such that only strings matching [0-9]+ are treated as IDs. Fixes FS#47324. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 9097035..09368df 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -346,7 +346,7 @@ class AurJSON { if (!$arg) { continue; } - if (is_numeric($arg)) { + if (ctype_digit($arg)) { $id_args[] = intval($arg); } else { $name_args[] = $this->dbh->quote($arg); @@ -405,7 +405,7 @@ class AurJSON { */ private function info($http_data) { $pqdata = $http_data['arg']; - if (is_numeric($pqdata)) { + if (ctype_digit($pqdata)) { $where_condition = "Packages.ID = $pqdata"; } else { $where_condition = "Packages.Name = " . $this->dbh->quote($pqdata); -- 2.6.4

1 1

[aur-dev] [PATCH] notify: Do not break overly long words
by Lukas Fleischer 12 Dec '15

12 Dec '15

Fixes FS#46937. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/notify.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/notify.py b/scripts/notify.py index 9a9cc29..b5bf518 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -36,8 +36,10 @@ def headers_reply(thread_id): return {'In-Reply-To': thread_id, 'References': thread_id} def send_notification(to, subject, body, refs, headers={}): - body = '\n'.join([textwrap.fill(line) for line in body.splitlines()]) - body += '\n\n' + refs + wrapped = '' + for line in body.splitlines(): + wrapped += textwrap.fill(line, break_long_words=False) + '\n' + body = wrapped + '\n' + refs for recipient in to: msg = email.mime.text.MIMEText(body, 'plain', 'utf-8') -- 2.6.4

1 0

[aur-dev] [PATCH 1/2] Save comment when closing requests
by Lukas Fleischer 12 Dec '15

12 Dec '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 1 + upgrading/4.2.0.txt | 7 +++++++ web/lib/pkgreqfuncs.inc.php | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 5561278..f99833a 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -333,6 +333,7 @@ CREATE TABLE PackageRequests ( MergeBaseName VARCHAR(255) NULL, UsersID INTEGER UNSIGNED NULL DEFAULT NULL, Comments TEXT NOT NULL DEFAULT '', + ClosureComment TEXT NOT NULL DEFAULT '', RequestTS BIGINT UNSIGNED NOT NULL DEFAULT 0, Status TINYINT UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (ID), diff --git a/upgrading/4.2.0.txt b/upgrading/4.2.0.txt index 1450d5e..7482204 100644 --- a/upgrading/4.2.0.txt +++ b/upgrading/4.2.0.txt @@ -21,3 +21,10 @@ ALTER TABLE Users MODIFY Email VARCHAR(254) NOT NULL; ---- ALTER TABLE PackageComments ADD COLUMN PinnedTS BIGINT UNSIGNED NOT NULL DEFAULT 0; ---- + + +3. Add new column to store the closure comment of package requests: + +---- +ALTER TABLE PackageRequests ADD COLUMN ClosureComment TEXT NOT NULL DEFAULT ''; +---- diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 3ea4692..c1a4931 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -227,7 +227,8 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) { return array(false, __("Only TUs and developers can close requests.")); } - $q = "UPDATE PackageRequests SET Status = " . intval($status) . " "; + $q = "UPDATE PackageRequests SET Status = " . intval($status) . ", "; + $q.= "ClosureComment = " . $dbh->quote($comments) . " "; $q.= "WHERE ID = " . intval($id); $dbh->exec($q); -- 2.6.4

1 1