- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] pkg_details.php: Fix dependency links
by Lukas Fleischer 09 Jul '12

09 Jul '12

Remove an erroneous quote from the destination URL of links to officially supported package dependencies on archweb. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 05a20fe..67110fa 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -138,7 +138,7 @@ if ($atype == "Developer" || $atype == "Trusted User"): ?> <li><a href="packages.php?ID=<?php echo $darr[2]?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1]?>"><?php echo $darr[0].$darr[1]?></a></li> <?php else: ?> - <li><a href="http://www.archlinux.org/packages/?q="<?php echo urlencode($darr[0])?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1] ?>"><?php echo $darr[0].$darr[1] ?></a></li> + <li><a href="http://www.archlinux.org/packages/?q=<?php echo urlencode($darr[0])?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1] ?>"><?php echo $darr[0].$darr[1] ?></a></li> <?php endif; ?> <?php endwhile; ?> </ul> -- 1.7.11.1

1 1

[aur-dev] [PATCH] Update archweb stylesheet
by Lukas Fleischer 09 Jul '12

09 Jul '12

Pull in the latest changes from the archweb Git repository. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/archweb.css | 170 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 119 insertions(+), 51 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index 303173f..cafae77 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -85,6 +85,10 @@ input[type=submit] { clear: both; } +.hide { + display: none; +} + hr { border: none; border-top: 1px solid #888; @@ -122,6 +126,16 @@ a { color: #e90; } +/* special anchor elements */ +a.headerlink { + visibility: hidden; + padding-left: 0.5em; +} + +h3:hover > a.headerlink { + visibility: visible; +} + /* headings */ h2 { font-size: 1.5em; @@ -258,6 +272,23 @@ table.pretty2 { border: 1px solid #bbb; } + /* additional styles for JS sorting */ + table.pretty2 th.header { + padding-right: 20px; + background-image: url(nosort.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; + } + + table.pretty2 th.headerSortDown { + background-image: url(desc.gif); + } + + table.pretty2 th.headerSortUp { + background-image: url(asc.gif); + } + table.pretty2 td { padding: 0.35em; border: 1px dotted #bbb; @@ -481,15 +512,11 @@ h3 span.arrow { text-align: right; } - #pkg-updates span.testing, - #pkg-updates span.community-testing, - span.multilib-testing { + #pkg-updates span.testing { font-style: italic; } - #pkg-updates span.staging, - #pkg-updates span.community-staging, - span.multilib-staging { + #pkg-updates span.staging { font-style: italic; color: #ff8040; } @@ -575,25 +602,6 @@ table#download-torrents .cpu-arch { text-align: center; } -table#download-mirrors { - width: auto; - margin-bottom: 1em; -} - - table#download-mirrors td.mirror-country { - padding-top: 1em; - } - - table#download-mirrors td.mirror-server { - padding-right: 1em; - } - - table#download-mirrors a { - display: block; - float: right; - width: 4em; - } - /* pkglists/devlists */ table.results { font-size: 0.846em; @@ -649,8 +657,7 @@ div#pkglist-about { } /* pkglist: results navigation */ -#pkglist-stats-top, -#pkglist-stats-bottom { +.pkglist-stats { font-size: 0.85em; } @@ -668,9 +675,13 @@ div#pkglist-about { } /* search fields and other filter selections */ +.filter-criteria { + margin-bottom: 1em; +} + .filter-criteria h3 { font-size: 1em; - margin-top:0; + margin-top: 0; } .filter-criteria div { @@ -728,6 +739,11 @@ div#pkglist-about { padding: 0.25em 0 0.25em 1.5em; } + #pkgdetails #pkginfo .userdata { + font-size: 0.85em; + padding: 0.5em; + } + /* pkgdetails: flag package */ form#flag-pkg-form label { width: 10em; @@ -795,6 +811,28 @@ form#flag-pkg-form input[type=text] { padding-top: 1em; } + #pkgdetails #pkgfiles li.d { + color: #666; + } + + #pkgdetails #pkgfiles li.f { + } + +/* mirror stuff */ +table td.country { + white-space: normal; +} + +form#list-generator div ul { + list-style: none; + display: inline; + padding-left: 0; +} + + form#list-generator div ul li { + display: inline; + } + /* dev/TU biographies */ div#arch-bio-toc { width: 75%; @@ -802,33 +840,50 @@ div#arch-bio-toc { text-align: center; } -table.arch-bio-entry td.pic { - vertical-align: top; - padding-right: 15px; - padding-top: 10px; -} - - table.arch-bio-entry td.pic img { - padding: 4px; - border: 1px solid #ccc; + div#arch-bio-toc a { + white-space: nowrap; } -table.arch-bio-entry table.bio { - margin-bottom: 2em; +table.arch-bio-entry { + width: 75%; + min-width: 640px; + margin: 0 auto; } - table.arch-bio-entry table.bio th { - text-align: left; - padding-right: 0.5em; + table.arch-bio-entry td.pic { vertical-align: top; - white-space: nowrap; + padding-right: 15px; + padding-top: 2.25em; + } + + table.arch-bio-entry td.pic img { + padding: 4px; + border: 1px solid #ccc; + } + + table.arch-bio-entry td h3 { + border-bottom: 1px dotted #ccc; + margin-bottom: 0.5em; } - table.arch-bio-entry table.bio td { - width: 100%; - padding-bottom: 0.25em; + table.arch-bio-entry table.bio { + margin-bottom: 2em; } + table.arch-bio-entry table.bio th { + color: #666; + font-weight: normal; + text-align: right; + padding-right: 0.5em; + vertical-align: top; + white-space: nowrap; + } + + table.arch-bio-entry table.bio td { + width: 100%; + padding-bottom: 0.25em; + } + /* dev: login/out */ table#dev-login { width: auto; @@ -899,26 +954,26 @@ ul.admin-actions { background: #ffd; } -#dev-signoffs ul { +ul.signoff-list { list-style: none; margin: 0; padding: 0; } -#dev-signoffs .signoff-yes { +.signoff-yes { color: green; font-weight: bold; } -#dev-signoffs .signoff-no { +.signoff-no { color: red; } -#dev-signoffs .signoff-bad { +.signoff-bad { color: darkorange; } -#dev-signoffs .signoff-disabled { +.signoff-disabled { color: gray; } @@ -949,6 +1004,14 @@ ul.admin-actions { color: red; } +#key-status .signed-yes { + color: green; +} + +#key-status .signed-no { + color: red; +} + /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a, #archnavbar.anb-packages ul li#anb-packages a, @@ -982,3 +1045,8 @@ ul.admin-actions { font-size: 0.85em; line-height: 1em; } + +#visualize-keys svg { + width: 100%; + height: 100%; +} -- 1.7.11.1

1 0

[aur-dev] archweb branch merged into master
by Lukas Fleischer 08 Jul '12

08 Jul '12

Hi, guys! This turned out to take much longer than expected, but the archweb branch (>50 patches, that is) has finally been merged into master. There's a few things that still need some fine tuning but it basically pretty much looks like archweb already. Special thanks fly out to canyonknight, who contributed several patches and helped a lot with merging our work together! Cheers, Lukas

1 0

[aur-dev] [HEADS-UP] Breaking AUR helpers
by Lukas Fleischer 24 Jun '12

24 Jun '12

Hi! I just wanted to let everybody know that I'm about to apply a patch to our AUR setup that fixes some CSRF vulnerabilities. This will probably break most (all?) AUR helpers (mis)using the AUR HTML interface. AUR helpers, that only make use of the RPC interface, won't be affected. I recommend using the web interface until the affected programs are fixed.

3 5

[aur-dev] reinstalling an already installed app
by Arno Gaboury 13 Jun '12

13 Jun '12

Hello, this is a n00b question, but couldn't find any solution. I use Texstudio, and it has been working fine until recently. After a huge bunch of updates yesterday, Texstudio doesn't launch, and returns this error: *texstudio: error while loading shared libraries: libpoppler-qt4.so.3: cannot open shared object file: No such file or directory *My poppler-qt package is up to date. * *According to the AUR page, I shall rebuild Texstudio after my update of libpoppler-qt. I rebuilt the package, but when I want to install, I have a WARNING : Failed to install built package as a long list of usr/share/texstudio files exist in filesystem. My question is : how can I reinstall this AUR package? Shall I uninstall it before, and how? Shall I force the install, and how? Shall I just delete the already existing files in my filesystem? TY for your help.

3 5

[aur-dev] Update ikiwiki
by Nicolas P. M. Legrand 11 Jun '12

11 Jun '12

Hey, here is a diff to update ikiwiki: diff --git a/ikiwiki/PKGBUILD b/ikiwiki/PKGBUILD index 3a4de7c..23315e7 100644 --- a/ikiwiki/PKGBUILD +++ b/ikiwiki/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michael Williams <michael(a)dinosaur.io> pkgname=ikiwiki -pkgver=3.20120419 +pkgver=3.20120516 pkgrel=1 pkgdesc="wiki/blog compiler" arch=(any) @@ -9,7 +9,7 @@ license=('GPL') url="http://ikiwiki.info" depends=(perl-yaml perl-text-markdown perl-cgi-session perl-cgi-formbuilder perl-timedate perl-html-parser perl-html-scrubber perl-mail-sendmail perl-time-duration perl-uri perl-html-template perl-locale-gettext perl-rpc-xml perl-yaml-libyaml) source=("http://ftp.debian.org/debian/pool/main/i/${pkgname}/${pkgname}_${pkgver}.ta…") -md5sums=('0ce3494ebe36cce6e42c53844aae8cca') +md5sums=('822547f8861a3080fafc46a0c7a641f3') build() { cd "$srcdir/$pkgname"

2 2

[aur-dev] [PATCH] HTML/DOM fixes
by Dario Giovannetti 31 May '12

31 May '12

While developing a bot for the ArchWiki, I've noticed that some AUR pages cannot be parsed as text/xml documents because of 2 errors in the HTML code, both addressed by the attached patch. The change to pkg_comments.php is self explaining. The change to pkgfuncs.inc.php is due to the fact that <body> shouldn't have a text node as a child. As this patch is safe can you consider uploading the edited files directly to the server, instead of waiting for the next AUR release? Bug report: https://bugs.archlinux.org/task/29966 Patch: https://bugs.archlinux.org/task/29966?getfile=8802 Thank you Dario

2 1

[aur-dev] Drop packages
by Petronio Padilha 16 May '12

16 May '12

Hello there!! On the 15th and 16th May I did upload three packages: archscript, archsysinfo, and finally archsysinfo-git (the ok-version!). So,let's start from the beginning... First... i did upload my source named: *archscript*. After I upload, someone told me I could not leave the package without "-git" in its name and that there is also a script called archscript. So I decided to change the package name, but I made a mistake again... I identified a little problem with PKGBUILD and with the git code. So finally I uploaded the final version archsysinfo-git. I would like to stay with *archsysinfo-git *and remove *archscript *and * archsysinfo* Sorry for the confusion.

3 2

[aur-dev] [PATCH] user_table optimization
by Dan McGee 06 May '12

06 May '12

Rather than looking up by username, it makes more sense to look the stats up by user ID to reduce the number of needed joins. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/html/index.php | 4 ++-- web/lib/stats.inc.php | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 0d513d3..21de99d 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -58,8 +58,8 @@ echo __( <td class='boxSoft' valign='top'> <?php if (!empty($_COOKIE["AURSID"])) { - $user = username_from_sid($_COOKIE["AURSID"]); - user_table($user, $dbh); + $userid = uid_from_sid($_COOKIE["AURSID"]); + user_table($userid, $dbh); echo '<br />'; } diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 8f0f770..6659f6d 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -18,18 +18,17 @@ function updates_table($dbh) include('stats/updates_table.php'); } -function user_table($user, $dbh) +function user_table($userid, $dbh) { - $escuser = db_escape_string($user); - $base_q = "SELECT count(*) FROM Packages,Users WHERE Packages.MaintainerUID = Users.ID AND Users.Username='" . $escuser . "'"; + $base_q = "SELECT count(*) FROM Packages WHERE Packages.MaintainerUID = " . $userid; $maintainer_unsupported_count = db_cache_value($base_q, $dbh, - 'user_unsupported_count:' . $escuser); + 'user_unsupported_count:' . $userid); - $q = "SELECT count(*) FROM Packages,Users WHERE Packages.OutOfDateTS IS NOT NULL AND Packages.MaintainerUID = Users.ID AND Users.Username='" . $escuser . "'"; + $q = "SELECT count(*) FROM Packages WHERE Packages.OutOfDateTS IS NOT NULL AND Packages.MaintainerUID = " . $userid; $flagged_outdated = db_cache_value($q, $dbh, - 'user_flagged_outdated:' . $escuser); + 'user_flagged_outdated:' . $userid); # If the user is a TU calculate the number of the packages $atype = account_from_sid($_COOKIE["AURSID"]); -- 1.7.10.1

2 1

[aur-dev] [PATCH] web/html/packages.php: Remove duplicate code
by Lukas Fleischer 06 May '12

06 May '12

Retrieve the package ID early and merge the if-branches calling package_details(). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/packages.php | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 8f3b143..aa1d04c 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -89,28 +89,24 @@ html_header($title); <?php if (isset($_GET['ID'])) { - include('pkg_search_form.php'); - if (!$_GET['ID'] = intval($_GET['ID'])) { - print __("Error trying to retrieve package details.")."<br />\n"; - } else { - if (isset($_COOKIE["AURSID"])) { - package_details($_GET['ID'], $_COOKIE["AURSID"]); - } - else { - package_details($_GET['ID'], null); - } - } + $pkgid = intval($_GET['ID']); } else if (isset($_GET['N'])) { + $pkgid = pkgid_from_name($_GET['N']); +} else { + unset($pkgid); +} + +if (isset($pkgid)) { include('pkg_search_form.php'); - if (!$pkgid = pkgid_from_name($_GET['N'])) { - print __("Error trying to retrieve package details.")."<br />\n"; - } else { + if ($pkgid) { if (isset($_COOKIE["AURSID"])) { package_details($pkgid, $_COOKIE["AURSID"]); } else { package_details($pkgid, null); } + } else { + print __("Error trying to retrieve package details.")."<br />\n"; } } else { if (!isset($_GET['K']) && !isset($_GET['SB'])) { -- 1.7.10.1

1 0