- Aur-dev - lists.archlinux.org

[aur-dev] README patch
by Alexander Rødseth 20 Oct '11

20 Oct '11

Hi, This is my first patch to aur-dev, hope I'm doing it right. :) I just set up aur locally and made some minor changes to the README file. Attaching patch. -- Cordially, Alexander Rødseth Arch Linux Trusted User (xyproto on IRC, trontonic on AUR)

3 4

[aur-dev] aurweb
by Nv 15 Oct '11

15 Oct '11

Would it be possible to add a [more] button on the aur main page to display more than the 10 last updated packages? Just like there is on the main site with the official packages.

2 1

[aur-dev] apvlv: build problems
by Stefan Husmann 09 Oct '11

09 Oct '11

Hello, sorry for being late with the rebuild of apvlv for poppler 0.18. There is a nontrivial problem building it. I sent an e-Mail to the author, but I guess a rewrite of bigger parts of apvlv is needed. Maybe it has to be dropped from [community]. Regards Stefan -- found poppler-glib, version 0.18.0 -- Configuring done -- Generating done -- Build files have been written to: /build/src/apvlv-0.1.2-Source/build Scanning dependencies of target apvlv [ 8%] Building CXX object src/CMakeFiles/apvlv.dir/ApvlvCmds.cpp.o [ 16%] Building CXX object src/CMakeFiles/apvlv.dir/ApvlvCore.cpp.o [ 25%] Building CXX object src/CMakeFiles/apvlv.dir/ApvlvDir.cpp.o /build/src/apvlv-0.1.2-Source/src/ApvlvDir.cpp: In member function ‘void apvlv::ApvlvDir::apvlv_dir_change_node(apvlv::ApvlvDirNode*, GFile*, GFileMonitorEvent)’: /build/src/apvlv-0.1.2-Source/src/ApvlvDir.cpp:934:56: warning: ‘nnode’ may be used uninitialized in this function [-Wuninitialized] [ 33%] Building CXX object src/CMakeFiles/apvlv.dir/ApvlvDoc.cpp.o [ 41%] Building CXX object src/CMakeFiles/apvlv.dir/ApvlvFile.cpp.o /build/src/apvlv-0.1.2-Source/src/ApvlvFile.cpp: In member function ‘virtual bool apvlv::ApvlvPDF::pagetext(int, int, int, int, int, char**)’: /build/src/apvlv-0.1.2-Source/src/ApvlvFile.cpp:307:68: error: too many arguments to function ‘char* poppler_page_get_text(PopplerPage*)’ /usr/include/poppler/glib/poppler-page.h:67:24: note: declared here /build/src/apvlv-0.1.2-Source/src/ApvlvFile.cpp: In member function ‘virtual bool apvlv::ApvlvPDF::render(int, int, int, double, int, GdkPixbuf*, char*)’: /build/src/apvlv-0.1.2-Source/src/ApvlvFile.cpp:326:67: error: ‘poppler_page_render_to_pixbuf’ was not declared in this scope make[2]: *** [src/CMakeFiles/apvlv.dir/ApvlvFile.cpp.o] Error 1 make[1]: *** [src/CMakeFiles/apvlv.dir/all] Error 2

1 0

[aur-dev] [PATCH] send emails when delteing packages
by Florian Pritz 23 Sep '11

23 Sep '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- web/lib/pkgfuncs.inc.php | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 3e89fa3..b6d4d08 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -710,6 +710,49 @@ function pkg_delete ($atype, $ids, $mergepkgid, $dbh=NULL) { } if ($mergepkgid) { + $mergepkgname = pkgname_from_id($mergepkgid, $dbh); + } + + # Send email notifications + foreach ($ids as $pkgid) { + $q = 'SELECT CommentNotify.*, Users.Email '; + $q.= 'FROM CommentNotify, Users '; + $q.= 'WHERE Users.ID = CommentNotify.UserID '; + $q.= 'AND CommentNotify.UserID != ' . uid_from_sid($_COOKIE['AURSID']) . ' '; + $q.= 'AND CommentNotify.PkgID = ' . intval($pkgid); + $result = db_query($q, $dbh); + $bcc = array(); + + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + array_push($bcc, $row['Email']); + } + + $q = 'SELECT Packages.* '; + $q.= 'FROM Packages '; + $q.= 'WHERE Packages.ID = ' . intval($pkgid); + $result = db_query($q, $dbh); + $row = mysql_fetch_assoc($result); + + # TODO: native language emails for users, based on their prefs + # Simply making these strings translatable won't work, users would be + # getting emails in the language that the user who posted the comment was in + $body = ""; + if ($mergepkgid) { + $body .= username_from_sid($_COOKIE['AURSID']) . " merged \"".$row["Name"]."\" into \"$mergepkgname\".\n\n"; + $body .= "\n\n---\nYou will no longer receive notifications about this package, please go to https://aur.archlinux.org/packages.php?ID=".$mergepkgid." and click the Notify button if you wish to recieve them again."; + } else { + $body .= username_from_sid($_COOKIE['AURSID']) . " deleted \"".$row["Name"]."\".\n\n"; + $body .= "\n\n---\nYou will no longer receive notifications about this package."; + } + $body = wordwrap($body, 70); + $bcc = implode(', ', $bcc); + $headers = "Bcc: $bcc\nReply-to: nobody(a)archlinux.org\nFrom: aur-notify(a)archlinux.org\nX-Mailer: AUR\n"; + @mail(' ', "AUR Package deleted: " . $row['Name'], $body, $headers); + } + } + + if ($mergepkgid) { /* Merge comments */ $q = "UPDATE PackageComments "; $q.= "SET PackageID = " . intval($mergepkgid) . " "; -- 1.7.6.1

3 4

[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