- Aur-dev - lists.archlinux.org

[PATCH] Document required PHP extensions in php.ini
by Remy Marquis 26 Jan '18

26 Jan '18

To people unfamiliar with the code, it is not obvious that the pdo_* PHP extensions must be enabled. --- INSTALL | 2 ++ TESTING | 2 ++ 2 files changed, 4 insertions(+) diff --git a/INSTALL b/INSTALL index ba24a45..7fcf724 100644 --- a/INSTALL +++ b/INSTALL @@ -38,6 +38,8 @@ read the instructions below. } } + Ensure to enable the pdo_mysql extension in php.ini. + 3) Copy conf/config.proto to /etc/aurweb/config and adjust the configuration (pay attention to disable_http_login, enable_maintenance and aur_location). diff --git a/TESTING b/TESTING index d2c97d9..e45f35f 100644 --- a/TESTING +++ b/TESTING @@ -13,6 +13,8 @@ INSTALL. # pacman -S php php-sqlite sqlite + Ensure to enable the pdo_sqlite extension in php.ini. + 3) Prepare the testing database: $ cd /path/to/aurweb/schema -- 2.15.1

2 1

[PATCH] Move git privilege check to update.py rather than auth.py
by Johannes Löthberg 21 Jan '18

21 Jan '18

auth.py is run as an AutherizedKeysCommand which does not get the environment variables passed to it, so AUR_OVERWRITE always got hard-set to '0' by it. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- aurweb/git/auth.py | 1 - aurweb/git/update.py | 2 +- test/t1100-git-auth.sh | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/aurweb/git/auth.py b/aurweb/git/auth.py index b7819a9..828ed4e 100755 --- a/aurweb/git/auth.py +++ b/aurweb/git/auth.py @@ -53,7 +53,6 @@ def main(): env_vars = { 'AUR_USER': user, 'AUR_PRIVILEGED': '1' if account_type > 1 else '0', - 'AUR_OVERWRITE' : os.environ.get('AUR_OVERWRITE', '0') if account_type > 1 else '0', } key = keytype + ' ' + keytext diff --git a/aurweb/git/update.py b/aurweb/git/update.py index f681ddb..da48eb3 100755 --- a/aurweb/git/update.py +++ b/aurweb/git/update.py @@ -238,7 +238,7 @@ def main(): user = os.environ.get("AUR_USER") pkgbase = os.environ.get("AUR_PKGBASE") privileged = (os.environ.get("AUR_PRIVILEGED", '0') == '1') - allow_overwrite = (os.environ.get("AUR_OVERWRITE", '0') == '1') + allow_overwrite = (os.environ.get("AUR_OVERWRITE", '0') == '1') and privileged warn_or_die = warn if privileged else die if len(sys.argv) == 2 and sys.argv[1] == "restore": diff --git a/test/t1100-git-auth.sh b/test/t1100-git-auth.sh index dd20bea..71d526f 100755 --- a/test/t1100-git-auth.sh +++ b/test/t1100-git-auth.sh @@ -25,21 +25,4 @@ test_expect_success 'Test authentication with a wrong key.' ' test_must_be_empty out ' -test_expect_success 'Test AUR_OVERWRITE passthrough.' ' - AUR_OVERWRITE=1 \ - "$GIT_AUTH" "$AUTH_KEYTYPE_TU" "$AUTH_KEYTEXT_TU" >out && - grep -q AUR_OVERWRITE=1 out -' - -test_expect_success 'Make sure that AUR_OVERWRITE is unset by default.' ' - "$GIT_AUTH" "$AUTH_KEYTYPE_TU" "$AUTH_KEYTEXT_TU" >out && - grep -q AUR_OVERWRITE=0 out -' - -test_expect_success 'Make sure regular users cannot set AUR_OVERWRITE.' ' - AUR_OVERWRITE=1 \ - "$GIT_AUTH" "$AUTH_KEYTYPE_USER" "$AUTH_KEYTEXT_USER" >out && - grep -q AUR_OVERWRITE=0 out -' - test_done -- 2.16.0

2 4

[aur-dev][PATCH] Fix regression that stopped package maintainers from pinning comments
by Eli Schwartz 23 Dec '17

23 Dec '17

In commit 8c98db0b82cc85a4498589e5d60299fefd93b421 support was added for package comaintainers to pin comments in addition to maintainers. Due to a typo, the SQL query was reset halfway through and only added the comaintainer IDs to the list of allowed users. Fixes FS#56783 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index dbcf63e..d022ebe 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -100,7 +100,7 @@ function can_pin_comment($comment_id=0) { $q.= "LEFT JOIN PackageComments AS pc ON pb.ID = pc.PackageBaseID "; $q.= "WHERE pc.ID = " . intval($comment_id) . " "; $q.= "UNION "; - $q = "SELECT pcm.UsersID FROM PackageComaintainers AS pcm "; + $q.= "SELECT pcm.UsersID FROM PackageComaintainers AS pcm "; $q.= "LEFT JOIN PackageComments AS pc "; $q.= "ON pcm.PackageBaseID = pc.PackageBaseID "; $q.= "WHERE pc.ID = " . intval($comment_id); -- 2.15.1

2 1

aur-dev mailing list configuration changes regarding subject prefix and Reply-To header
by Florian Pritz 04 Dec '17

04 Dec '17

Hi, The aur-dev mailing list will no longer change common headers in mails that are being distributed. This especially means that the subject will no longer contain the [aur-dev] prefix and the list will not rewrite the reply-to header. If you want to filter mails coming from this list, please use the List-Id header. If you wish to reply to a mail from the list, use the "Reply to List" function of your mail client if available. This changes ensure that DKIM signatures remain valid if a mail passes through the list. If the mails were changed and the sender domain publishes a DMARC policy an invalid signature would lead to the mail being rejected by providers checking DMARC. To prevent this, the list previously rewrote the sender, but this makes it difficult to import patches with git am. By Lukas' request the list behaviour is now changed. If you experience any problems with this change, please feel free to contact me. Florian

1 1

[aur-dev] [PATCH] Allow setting an empty home page
by Lukas Fleischer 03 Dec '17

03 Dec '17

Since commit 4efba18 (Only allow valid HTTP(s) URLs as home page, 2017-11-05), the home page field in the account settings must be a valid URL. However, this new check prevents from leaving the field empty. Keep the check in place but skip it if the home page field is left empty. Fixes FS#56550. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index b8d9dc5..df57375 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -162,7 +162,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="" $error = __("The email address is invalid."); } - if (!$error && !valid_homepage($HP)) { + if (!$error && !empty($HP) && !valid_homepage($HP)) { $error = __("The home page is invalid, please specify the full HTTP(s) URL."); } -- 2.15.1

1 0

[aur-dev] aurweb 4.6.0 released
by Lukas Fleischer 03 Dec '17

03 Dec '17

Dear aurweb contributors and users, We are pleased to announce the release of aurweb 4.6.0! This release brings a lot of improvements to the comment functionality. You can now use basic Markdown syntax to format your comments. Commit hashes to the Git repository of the package and references to Flyspray tickets are converted to links automatically. Long comments are collapsed and can be expanded on demand. We also made some changes not immediately visible to the end user, including several security fixes, a safety mechanism to prevent Trusted Users from accidentally performing non-fast-forward pushes and a public API to retrieve a list of registered account names. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the aurweb bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aurweb.git/log/?id=v4.6.0 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH] Sync CSS with archweb
by Lukas Fleischer 28 Nov '17

28 Nov '17

This partially fixes FS#56472. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/archnavbar/archlogo.png | Bin 4192 -> 5359 bytes web/html/css/archnavbar/archnavbar.css | 6 ++-- web/html/css/archweb.css | 49 ++++++++++++++++++++++++++++++--- 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/web/html/css/archnavbar/archlogo.png b/web/html/css/archnavbar/archlogo.png index e873e94b1a38b58963e15252f6e175fc1c6f1ec7..3d2cd40fb499b2b37651ea67ec6f3b4400e3d157 100644 GIT binary patch delta 5335 zcmV;|6e#Q9Anz%VC4Xl@O+f$vv5yP<VFdsH03c&XQcVB=dL{q>fP?@5`Tzg`fam}K zbua(`>R<o>I+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)00009a7bBm000ie000ie z0hKEb8vp<R2XskIMF-&n0}TQ!Oz$d-000xYNkl<Zc-rlpdw+CQ^_9mz``qM00zm|l z8}L!^K~;o+)JN6PRjt%%@zL5r#piU?sg=Y*YPIc*Qgv({ri$EPv7J`!@-aHL6|qiR zMXR8t)qx~nD+O&8kR*sALdff$J%8+Ta!>9(_n9!TX5H^vSzONjz0dyb-*-QLR~Q7u z;>`d8j1#3D=znQ#s2hx?ODJKlz!}80s(_nR7_YLgr&U4;*)f=cKOMLX_&h-EqLzI< zw-QRohye?JEZzj-I>48Jk-(RMQ7XEx=T<@q8BsRyCInO_0B3s-rUQQiEM?(J_@`6% z^&Iz0sP-v_DE1yY07MGpiIdKw_S)M~*Nq@@AWDZgbbqwYsbg$>wO>jA-CBR#zMl4e zg8^y$F^ktAM(EE54)Y#Y02hHqW09(TJ-_`5s*0*cRn=D%-vS;7zE*6Tv9I2Ss*XV9 zF5p>&6IG!m-b{i>nM>q+m&k0FvNF#JQ33<h_z~AZMMq-vCb)^t1epr_VP8*hKg8+4 z4}gP!p?}`9cZ+XM0T~XQiz%N9Fcl9>0Tuxc=%0YqMRoE25QAado(vqH@~j$|)l;rg z(^%3nDHsKeCn@v;gn&uE1|J9@$eX}Jzz+mA?CXi|PbgaOWASE0wH&w*7#33Gyz(A7 zqGaQyAt<DK4XyQcfOd#*JLp{sAGg()Vk<rdM1OTuqz?F8hOdtRz9cGlRWEL4+jXTy z&w{~-eDu@!;0r(9`+9QwBZ?CISiA`(AwuM0AeN=*MJoER<FaM21|0B)lmV5%2<*g( z06oAi;3HrUpt-yxUVDO_ehDzoN}wOdYa6fq!aXm0AHfr3zZ=~Ch~hN9fZ&WknU<sE zWPjisge7C{S<U-%i+8651o2ql9L#VV4~)hPx(Lt<>;^UiuK~}f>gzzaFRWfW<-i2s z6WGagH1G!SL!eAmKZ)5bM`0Vg3V0Ownb(E@2VlnJ1fUk<>@M&D@D9eQTY*H%M#)BV z%2ahEaG=*-53s}g>x8gP*Qe+epV}9R+JAU6A|mSQ5EaT%T%faD%Mv@CkJ(v&Qqk{k ze?!57U(>h-z(E-fd=D50d@@7v2yg{1KaWHr?Sn900d4^PK1aEufX@QgV8-3|RCQZG zXbuOS048F7bOC;Z3Gmke|0MHmpzXl-z0ZdN7hztMqp%GSTt~%x^6vt_1s+k=KY!qz z79rS%d0WoKyknDrG1%rz06T$=z{|k1s`@7VHdC6M3&7ZWTd3R<Wmjca4Z>8=Ro0dO zItpYOFa&sBRl7x`O5rqBJriLfP=(M7Z0(WWRTWe`J7i(YU&K*u_wukj_h=N`{NsTp zpe>s%QN4H_j@yHZ6BXqkfhg+!8Gl4o90VPqwuTvPlCg`|cnd8NRY?G}%_)pZ7i`>$ zI-oKh<Pl&Ra5JzbOO@#eGZBd0w<fPXvS0)ztodRzFc<h&U|34fD2BawUvjE}yS?&b zQ`Y7MZ;qb_egS+JIK^u}Re1<Ty^aR11)lQCkMq6{YW!`$Lf{1KM7a!@3V$5zjc**b zxn=@)0sjqr2Z(twfndM=IKJyByM}cgi12{d$B4iX&jFqRZbT^;kx9UVz<+u3{{nCt za0YM*<`R9ziRgt$A`*-DdykWVr@irKQh<GM+yvkt%H_aI3OC@0qauKgSNIR$JBkji zi8qC|;kpj4>m01E+=g<j+kcawc5z`TG6iY;*u5<{xVXqH%pZM<Clo)!IQ5An`LK_2 zOhZ3S!g;@-(WPSyrf~~_0G9&40iMiKZU#y1A4CW62yhm#1ltsaj(Hw-ntTP%@$R+z zTTIAKBDWF};1J-OKpij#qf}w#d{kf?P*bK=fl(<%I2u@tZN7JbSAT)E7-g#hjswp0 z+KCI1PQ-nxX3;u4lc)mQq<P7bV0=)FCLRJ*Xfms@8u&CYMv(Of_C)WGENWqE!<4@I zv3N5oS}rOLz>UB}rz~=Xy4q35ODRm_JBo{p$21e(WM_B-h+>>J3?~3HL8y)oD26f~ z)3S;gv2Oz_fS-GRD}RBuka`usc_d#>7!R(b|I2f+&HNnDj%n>eh2F=<7***G^xc6e zkCW;D9`;}Yy&l*?Iz@79E%_H9ddfk=A+w8A>65dx=U^w(KVzrLJ;2$5T&5~_Mje(Q zEI_y%b6Ky(Ht~&UWQ-WY@Yl&-)13B&3OL%oo_fQPJ@OiGhky6{mJiFj&u~Ti5*}lV zn!O4#6Qi-afu)Fa6zU+(TjSR*Y9S#B9Cc=4yFZ8nfKLS`lZq&C6}Z22h-@oth-u?} z1T$RUz^KA5@4JNecPMZt$=o3yld$9dgB*QyVM6)~U>)#R;CkSgkg|$xv?kz9Z!9q^ zUuhCXrMiIyz<&cN^~R*MwcG3SQQ*(m2B^YL)p;TPp9aKcOc=50l`Xr1&n2awOdA5s zQE&(_58)x8r*+Pheg$Lk<{sch&>KJ=2aW^%6!5DYeS||5bsR|2G;vfwz^w#9ev0a3 z;5y8PoUNi8tM6;_4j7IAZoy<OE+S6=6ng(7Z^2hl9Dj8t09TNCXJ<P>P5?O<_;GAe zGi}9PRCx|~1v~1`z&tw#W7;|aYyy^H`7fWr1kXnmrs1*){)d>x`7!1a1=~n7L&|ny zLfVK4{hq)YjKMrl^DsJdH%ZMMCM0_>?j9%Lz418wdTjIkCq@N)M1ZoPWqq%r5U-9u zh6-STqJIyFN+QgdY^$#$*4PBF66G1-A28u765<Pe(j6uK2eq|O?(`_w8NltpwN65I zAXK2-jM+i20t-~NyO_XSUV<Nsw@}`_ho0!rOGwxD`J&ugv}Fhdd3XXw+;re3jBk$! zDS906x0uFE6#$3q8&fgCyBE)E;`LjHQLG?bjDHv30(7Lf7+qCu$2QN)*k;<DV~Q_h z_Csf|t-u&oW5QpZQcrz#8yG=2t?}FKFLawg9uY`n6&?$9B(O~gc7g}L9f&Jc6jS-_ z^>yYc65hiS_#OlP4tNvMJ5ae8Gq&4-TR}F7x<z!EH^*0cqC+PFmlruXAID>P`{bJ` z7=IA@v%H14fN-Jr5yg)1XjpT>1yA{I2j-nfqy(^zrvJ$SX8bKAUFfZ05&v(4h`jIr zKMOWuc0eY$_y>JzUx1hoKP_@gkcRXpB>txzh~}bxNOEhr8T!Z@g5YubzVSLLeGRtN z*Wsv;h`7JUPQgy#dQ@(~lwK6LM~S=u(0|%6wUF-nkW=t$8k^}D;(}3}Ba7-Ki8A0S zlCHgcaR|oS4<A6^xuTohB<V^JVPjo^1<3|F4j=ibEzR?*42G;qpq%#ot9b}+dWlSS zL~i32MUshi5TH6fwl+*5((8cAV^}8Z0oVyJ5mQb}goN8xKP6Xp8Ie=)MWM3GIe!+I zU34$~F%6id0<n9WvM*9n>z;$rm{hc4-1j!j5c(yixd#glFg)b>W*F4eg?zMTXc@`< z$WyQVWIPz|&7DW+M3T*<_mQ{I`-M{qhW6jqPzR#jz`p~lFr~Q#v%z)@G~q6*;Mc}m za1aOc!;jC=mhWENPWBh+0ACU16Mr~)tyLLtYRFhuVYKHm;8x7P{bh`fy_KP@LbD>3 zaEdXcz;^QKC)f8HUPn^f2-C)rLc#mW7D>#D*7%}!_5|xVAu8m8c;9qufg0~~C2$aV zD9v2RDEJ4(SD`2_Ivoq)XTu6$7G{Ni0eG0qA$l+lKHKSvP_sDa1j<RL8-E{R!u~4I z8{p8Lm{;c>(&<AnslW<^1>KGX%2Ohz13^9wxml_P1us<iQobl`;Q3RX+z^6RhxZ|! zZ>^*Skdc@J;RxV8%quq^<;XmhW=3T6>LjQ@Agb_>WDne|2CfFyD=vcb4(8s2WS}c- z`d7L`5>JXN8+cmb+>8?u(to4D+x<Q=ctM)6O;DLqFMrLHY-<B1bU`I?D(3BZy@)k0 zb_0e}9ZA#Tq4lJHp@Qg%>nKj5Pg7^ASEwZVr=}OcN>;aPlSl-;1`9lH!U9&8VqTqZ z3tShAH}4Kop850VdrKnKn8E~$%k+5vcB*Q*hztwW_%)3!{)(Lne19>^;JbjkLDqxP zUOx?QARl2tn|HF*od{g1ip1W@nrG3Axdel##<Xs~e3igwKX{Z4nWCAgSPg0J*Rhzf zRUMKu<KL|nRsEc*o)%Un&%Se&340bkuW+wUUeNqCejdUvh)M*@j0K}QeHCjOn|w`o zI+iz-02ZL~D=g<~9e*%e;mYdHGHTPkgXOAvx~hItRp+VdNve9Is$TBBgELk2?oh!O zRS+t%OVFdT%;Jy0^PsfVPYtYu;)?qQ$>?4tTq?rk9A&ym`j357VN~ZtzzGOe6f=as zPWmZPEH7D)1))-L9_DeV10wzyym5@iB99LMKfzqF*-*4`8-MbBW<S1!+5>s;a!upq zA^k?k>pG>Pq7$$*7HdAxp6B8j3(Uv({S&|gh~nD4Vc*4h^R}VAC#yp2zJ7|c8%wr( z6<FTY)%A?`{20tTG#MD0CipcLr2}OKnQvG5c&$t$?UJ%~?e$Y})NwI^>CICAP~d7s zBe9T7yudO3B7f;YpcA|aHez(_1}u{L5d9;ITd};DB)iP^R?^W0+>fP41mR%D^)f72 zH5bdqybJR#ecyY5hkNzU$<jwL#;vVUdi_vstf+)|b@D@c>7d-~!rZ`Rz^BzMBbFhn zGLXi64ar~S=o?pUycscyas#IE*J56rT~(10IJSA0Vt>KDgMr%+VkE5o{Q2{Jx&uZ} z-HM6|Fvif1{p?LQuq93Ky&ZQTrtQOAc|ol2m4sIIR%H5qBbHAdgo|YXuJyi~CCG_6 z6weCa`H<&_V8XTp6SNDwvHN%f<KY!#7LJSvY`hg-`<)raa0Ql@a3Amu>?8^X&?aDs zd?P7N@PGYv%T_0c#_zXxl4bMJ`RQ)kzzuiZ3ivAbVsUzpM}%15m-NOhTt_V4geX;* zP+x()8wgSz71Zt}T!YERZJ_G`Hhyh_<=m_Gcx$~J%Nm`h;+AJfVHWQlDn^mc1^xo` z_7nWk@g{!_&ck+Gt{1T#;O)5?<61jN*VKM4i+`W-xD?BU8ImQM`!ROJttEe~1AdC- zbrkIa@D?tC<)q(1adCpTFq>xw;U~{PHGZZ?NdebTcV>P*8F5kz2|#;&9fEXVr|d3F zi~kViB18|4#ha^QjZGsHk;D-ovs8E#dymVpQxO7NQbi|XS*Ig_`w?9V5Hw)bEd$Y3 zjDPBG2EHoloR327;-vhD$VT9u-rin-77<y4rG_*CzwambWfq(si)qoYkbfTQ-VX`F z-EfuIZoL}Y`A;C?kRkl<VGWkg{u{DipmwoDHa|o2kUU>;XNIx*W7q@y8*nA?65-lE z6&+ZlaW+PYGGQ<{ex^BQJ7MyoJeEAx?|<DS<;ET_!?bV*rf43-?rA)a%5v}X!<egk zIp!GflK>q>#U&z`Jk$X%2;7ZIPtbM*Xup0E0Ndx>^a@5RhXS{V$YFlkj)*XF<jB`Y zjT-gF{Q2`4K79D|ot>SVfQMD}-DouWRG&N3l7kdfW@9PFx!~Xh7DmTcvpxLh>3^#5 ze&8qr4)X^85URH$Y_3_<M0-m9MZmTAIu=uyiJeN5Fyq_7PKAw_CV9*&GX}e9^cL_x zB)vnun8#@y@F(wYEm^!!-WYnY6KVyP7CggyQR6ULDA)#R#Ww0P%+3ks;rQ1HcVd)p z1GbrS!M{)3hH1Lr0Xq}6E}fVm-G75=H6PvBC8760w+DoGD|WwlIq6h11bzEs3uafX z^dGd%siSsLa~H^WRdfSJQzm1!jek_^@z(fp%pPjPvSfb;yeQD?baki>8S<pJmP-^` z88$3*G;MRH5~Br#2T`2{L{WD8)4TQ7Tl>m3G&F?2Pyd5QGmgYG)KOVhp??b#kUs)H zL7Zi{J+w9S7ksb13Bb3pjdU2c5i+gpOTb)|CUKP3Ia9+6_P;(@jaljuOt`j@q*kLa zL+L|L0D>E6D7Gm+#I#h-Ut`EH4#%6*NG!PGcrW=wjMlh*zkxcn-nzVpQN`Wa`uFOT zVK<XpOz8XSjb5;p&fcWr?tl1}(Slf`ci~4x=siH&<{sv~mnIw>M^Rh{w{kc9^&8p4 z|KsA#^s0j+8U@^*a;LX)cY;mxlJ#Qowe&EYa(0fyt{{&0)}#yAEbykN(+;Yx(e5hm zUf3=WZEcuBWqc)7R8@F&++1l1u|>@wi~@R8`MAA+RClpKH-m_S>VKVB23#t7F|D~A z(@tvywu(s4p&i|9E06H@-1Hw@h{c;xh={rOj=?T~&%kpjh4k}l>>~Gob1_ONAsdo{ zZ@KPEvEOv`(Sh;h$ARY%XEUlrWyRGtHX*3E>Ws$RN*7{0KX?<V3v*3AgeYwpw0;RC z3=|TJH-i#IxDUH10)NK)p2Mv5mmG(ky}d5muFv%|I{CpinhpUu4ofOKAEN*Ot5Cj( z&|1>^CG0JTr|mzB87)JwXzTr=tWdP0t;j_Gd|-hNDZ@MgS7CnmQNTPET^LC?Y`wnt zoa+)w$OMTsHXnfUBg{~Yqx>3SH?B+DAZhqq@HSsL7WiqvB7eG<0B@DFehGU65{oxa z2aXna7W4xpLR)>V^qIYb+ITZ+7mCjUcB%4$ltbIKCE+h&a8U-V74tc}ttr8R|7*0? z*AZ)M-h;9Xk#dP>KKV5zlu$7K7r*fEqP3u(9smFUC3HntbYx+4WjbSWWnpw>05UK! zH!UzTEif}wF+wvsFfuwcG%GMUIxsN218Xt>001R)MObuXVRU6WZEs|0W_bWIFflhR pFf%PMGgL7%IxsRiG&CzPIXW;f&0f=vkwzy9002ovPDHLkV1lSW=|TVi delta 4160 zcmV-G5Wny5Dc~TGB_VS{NmK|32nc)#WQYI&010qNS#tmY4c7nw4c7reD4Tebz7!{a z58X*bK~#90?VNjjRn?WpzxyO4+WI7toFEQXKzW1{6sdl6#-eR4w$nN~gI0@*en!)V z8*$V!(+AZQ@$D$&1i?6;S_*9yY&-3U(@tmFsal^%a-b<Hj9_`(fRCvtkL2d;`D2~? z$hqg<bMAxD();^-?kCAUd#}Au&f4pLto2)KU!}FCTrh3t<A4#5S<jVCXayA<1XPz< zUJR%KzF20t6;x1GsB&3+({@Gxe*mh0kHurwwz3GWpn`({ql~hy1!|GENUV%<E2yCC zD2v56ZKn!&9XP>jdIuO4k6C+57G6OG2La`>_!p8^dVphrE6XJN&jBX`N0v)}*s%|E zA5$(_hbqdY_(87CT+?<`ndBd8m;l@a{215;yaJq5s?bK;X*F#pUR!P4n%QpJ>nEF? z&LY)bR@e4V8YQzjrtM4u&JDOU9{3FK@1@Rh2x1;E+t*eOBQY6hK&53hwfELgr+<cK zbp3E=Em+ITFwdVn%3%TW1+xEtPzL!GM1@8IHmy>Mzu}gN{jQ;BX{B%3)n<L~16$jN z3?*57({_#quE^8neA9L&#$#4*Df3iNDBK}$k6o?JPXkYXK#TcMqEw4N8~A8QpSdN@ zaVVmE>GBM?O5|!?7Psk;MyWpj)Chg9Fm2~s@tD<D;#@&E9B2j_fqL(Mqk*{hSqtop zC~Fun64)AWts1C9l5;ysTk=7K)*7Wisfyx<plHQ6ZN~)u9tp~3<>`7j@O8>-`3>M# zz?n#iL@v0%Z-BdjCj+j31^5KegiwmTz!cyZ;4<&i<o&IHYk==$jQ==rDKHAzG$Vn% zz-I5W7FZ4RN4Tc}<azvmC2*oAvle*G`)ow=BcU+LWbsw|udDSf(-Y;8^<hI%if`JE z0sInqxYq$&fN$m*(qh`qz44g!hhpXnz*yj%2>lFTI-=YQf%*P*A#aRK`~`Av<9zLX z!1q0we*@eIoSkFdri|bJ8R$ed-vO`9@9Nx(DEu#w%@c$K@R-+scU@2i<+(bUtPa2l z_xBDTs7`!YV?5f|*0dR5ROiOJgxmim493LgSaU%bpf~FhUqR_<Xk|6j4IgjX&bta; z((saD7%O+QHvQf|Z)3;05w2m(P+Coh$E>gCSbr8qcCH&e=vIBAx^`gA_Uop;nQX7` z=s9&)TXWz&4!Pfdht>|$*G(OWI$tJ=_3^I&CIMdnHXvMd40$*~s3lwJN`YTl!=R9j zIWwf+allh#D?Pvx<PEY4c%0ly??(ghZ6vrnG2r^6$YxtgZlwn?QkMfSBO58;*%{*F z`&^y=VTlze7V4@*DoHlz4m6=ygyvF!#?GEeZ`KXG06c(yR$oG>(P2QH7FzlnuIs+g z(AjfQ_Ow->Raz|vTJx+w3$Cu(q7>hyzvegq1*)ObS!F2oe8b`mXXP8))ZSau&_C?A zjh*Y~6f$RO$%PIuZKoD_kVzZ|EJhUTKY_s<L$5Y%XH3B>3`U`fpM>At^1B4bBTDGU ze&9jiA>iVFBIiCG_&Z<QtH3nik^*J50xNP})o!S(qm1-hXH<tXN~4|y)vV!VrPMzu z?f$iERFBi>84B7pYy*x^T0P!qufHHumg^>E6&zd0Mm1!d2CZDx0}NA!yQ*Q)hK5`N zch?Op08ZCh&mVF3D+Oo0i*a>Y304l%`{bMJR`Sz-pHa~ayazmw_~o0t&lV&Iodnzf zoZ=fd4T(ASMVx0V&;zVN+?UxQ{Ra_u<|6^u{snPUAnodmCENJy0Dg+x56HdF1P=4{ zy9~I?Tc1E_9mE$Yl$+&UxoPevVXy>EztZaJzPBeY*SFwi^xOpeykXIX2dQ#@0-Wih zZzD5*W>VTMCI6-e2U3Ik+9ofox1F;TTtJokm}>v^C;f58$j<fWDAdh>R;a6Y&pTyL zp>q~w@lD$~3JFw;#pPb6w^ZDS1e~7&x)5tL8gac&1pXTdeE;YhSHn;yD%aC`15vD# zkUFGg<i78Hz-^w~BM^G`c%)i&v)AVrz?TDm#`^#N-v-7YLHB*$=SoER|2JU#gy1Fl zEpK)uVxlV5R*&Xf17pU{w#kq9ls<*NxlMhBVO#@f1*eVZ>^V6t-tb}zU6jSgFjPi^ z9;Rxp0Nzk=PQ&ow_hb$j{?OW^U9Fb`28xcIvB^QCMJNh&b-s$YHpRkVsGC$Q-U4oa zM&b(x@wt}(cL2+gx4=ULQ<F!B$le0{74SnyDZy|gNcLkh@>ZFT_}=@y_8q{(fQ1Cr zGszwQB=I0{ONNY0yov<L`H{-p`Zl!6eh(-&rT9uK=Iw|zy%Z*XM{CpXwO4{-Xg-#b zrE<(04smq`hi=qubH=}=w4Mp{qqxC;>~vBGn`-)NY{bZ|KhpikyaMM-A+q9|w$ng) zN)RqGZRfNS#+yh0dMD!2<ibou@%#vL?-n5zKNHgf#tk5Eg?voaUL^K;H)Kx8=d%mK z^B_8y)xiz0;%;?%GbD^3g)a|JG_L{}7-`)pzP8=7_}Q_+&bH<klvX!+y&g7y7duUj zojsR;o(1g3<?`3s#vbsGi;6-l{(Qo-v{9fC*Ps}TMBJE(WmrdYEq-(dw2caA`wj47 zk@E&A%KIT>0$q?m_!C$vzhd^yZ7Mvun7O&qfpSrfzOD)mig&h6wvjjQM=|t|wN^_3 zlvZDjUvF(FX09Y6DZXhtCn0=)eYtRfX**Hrz)akVB$|SdARQ3qLowDVh-O?{gq(Z` zTUWT^Clx%4)iJVVr+s`>F$(Jrrp73A^i4Swq0hoKs;>n$f*K1P3+f4PLzIN57XLPc z(=8_owfYL-vHe(wFh%tU|2_)IC~uD_GYW$4y<jGxM1(4d(n%hF=zRr$DQ1R`U*uvk zT^*xXi!b96xoOZ{trOqVip9ylmFAvYeG5UT;+wWJg=pWJ(1QeW|A-u{2*Y&Kc0LuM zUlNUEyINb2vj8hdr}MWX)ZzIAD@!pCJgDC1j3VUZTSMs<KP73XBDn#<ZH9XS?L}Dp z%*~bd@rw&?s|Iq8t6$Q8YbrNQh-mcUaUGj#3!EnlQ7rx)gx}B;z!~wF_04$9x;q}T z#v{rXhC-}<P)*JnvMI|XdV%!;?Zqg55Ib}>LaCMur7ON63TXJAmkMC_hgkfHtBO$k z^yUiOSYg9ujiP^p!4_YEs&W&Lpg2xxp4RXb3TuzrSF+X5%W#-~wlf`=5h7zVaB)0l z`3tdHk)%&P%Xo%qJD-oote=G~6j8o+ful0o{0XW|7|2^9AEG|+Um`I?=Kt$hghCB+ zzcSH`(5|^M+EEc*xw2`+>`hapHQ@=~+*4?u#TVU;EO6u^=j6dEaUq8VusQ$@9Zs88 zd<OWVG6rW=57z2`K_k%(x~;LJ`{z5`raTceuBD}AJaPgM0K+g|a$UD!*|KG8z3ZP2 zv-o#LxQF`!lpe3`_6Xw_L_C|T$;?s;&Leka=$*ib9C8Z9J4h1BkIR4u2+q_duRjm` zfT5e_;J7-TW%t+W1j$yJbY|~}A}oH!u1UL1ky*k-m7bP=T3mp|Hy1liDDLtmYuz#D z)UDgEpZJE-Lb7OOe5Za%Z(yZ>>$>l`t{YcMUFo`R+;!b4NS=h2mX=1~v78GvZRcXb z{n&lLBYCc`LF(f3p_%BlDt@X_0pA0jLEbRuB5C|yB-xgUWacwd2?}}Oa|q6!&P9@F z-$F9S=OLMY<)@Kq&RQg=u$ufO)Fmr^%H>d5raZsw#v_YhbuukJ$*+;A2`erGsj5`k zxIWe3v-smWHr1k72^<D$MLah7`^jrN+pN`S9tK7j?%;QW7^$wVu5DdiUC(K)cXf4j zJ%_xlyIWdXPD3hd*90oQ_dPia!)^fB6pvXs>t5o2F)Kl^rSzlSn==ecks2L8&O#~{ z{|h<D?N8;eAzkZIESs?fxGKl^F+e-;uSlWZePmZ}UI=s)IX9FL+)6EtUs`Fbj)6+) zj*Gh<Z+*&eXNQe72Zr5&;uO3xZEYlmtap!k{|*!u@cMw>n^k>TRXZ>j*a-Uk`i`C( zBQAM=4dS-f0lRZq{MlsqNO|yDgg!whmR!V2u0alIoI<qXwO-)r2>mkAg=BmEMP9|= zr;vR87K~Sb1>Wz)xH{pAnu}f0**w0=;PEHzJiMgfc6aR59Y}dKz_pF``oL0xkxMpA zXzXyF)S8<V`fCJ~XEbzf_%x^+fI;mVv)*cdJ0mOWz5TkWdtJl53^<^ay8ZahNR<Hl zk<ybb5a5%UwsRPgD2jq82TOveKm#c!n1mb#xf!^`w4Erqg4IanWsv31ghu@DUBGF+ z_9Tjl?!Jb&GtU<=<|oL(nS9?TTC%GX#NJ4IwsjxKu=odt*Ocbt3%-F@>Y>qhnYQzP zhG{!LG&_41n4LW<Oxt<UbzMg*W`KGk{+6{gHPZ9(M|EzjQ`&t5sj|DR@A{_S=9+$2 z>y&PUI<IjxKQQlgvZ@MP*G;m9&v>7^kn<Gx1hG181gGeO5EMKXg3-uPzST&O8ufL) z2v~`@HD4tCEp8fNnO+9&N385Fgxl|b^*;U_!#hY4tlRq;dh&<#vBwJ$_vd89-ATSx z_Ic~*LEN5PG6%f%I7s1LK4kuH_9OQ)WFu+C`%0@9QSP%t+6^^;*1t1cBTfAZtFssM zGn?MtHYgR+k#PWwA%-U&vtDoPSa-TsRjZH_ZzlkkGPGdx0H}F=vB?i;(5CHwEn6Fd z014fH6!N^b#v5K)5L{}NMqkWY++aKBYnZNUjAmfSM(OJ6+6J&}*|KD^G5K@*5MyB4 z&N0XX8y@i=@Kiiz<vjvu+Rpumg$~2(z(w(x<!5f9;0UA~c`HLRs#V^#TwH$xQHsB! z!9X5%0&(y1S@2U4dUGSu&f|iAY^*5=HM)rc=uy><;V(CCYVWQ2UE@Ao=+QlMsZ-x) z47`(ToB}msaraomsG5e>(@^?oFxI2AQ%z0xwmIWd8@$2pK0Bcgtj~03#&v9}eb?Q8 zOw{@zbE#ABy6#Bt4G<ZA#lIbSm4{&ulC)YGk6HhgcVV`37E<T)1%&&5&WF9gRq>d$ zI>H(%sGw-16yLO+M#Pfj;-ue3g1g6o|A@z|f=WU?|NT7RZxKo<mz%T)7!!|Ky9<$D zK?Q{%Q}LG~fo3KWh%dbo_?1UbmJE-&JO@eeTtzm&y*M7TDqloZ!9j!4T4UPII3!p~ z2D>hjZM-!ev!ayx77f#Xc19y7kFG>~auC0FLOf>u&%vC#f<Ip*>CA<Q(re&HfEABf zvktb>1H@z2)_Bai2B9_|_0~{B@rP9^s2~)op`&Lia+2stV17Jiz5GEg$h4hiMCm^V zoc=+tr-DNh)kxj?+3}e5Y*^?24|sIu=S|x=6IokD@hd1h{tt!|wjGp1kc7<u0000< KMNUMnLSTaalMD&~ diff --git a/web/html/css/archnavbar/archnavbar.css b/web/html/css/archnavbar/archnavbar.css index d10c5f5..5a83dfd 100644 --- a/web/html/css/archnavbar/archnavbar.css +++ b/web/html/css/archnavbar/archnavbar.css @@ -5,7 +5,7 @@ */ /* container for the entire bar */ -#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; } +#archnavbar { min-height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; } #archnavbarlogo { background: url('archlogo.png') no-repeat !important; } /* move the heading/paragraph text offscreen */ @@ -16,8 +16,8 @@ #archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; } /* display the list inline, float it to the right and style it */ -#archnavbar ul { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; } -#archnavbar ul li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; } +#archnavbar ul { display: block !important; list-style: none !important; margin: 0 !important; padding: 0 !important; font-size: 0px !important; text-align: right !important; } +#archnavbar ul li { display: inline-block !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 14px !important; padding: 14px 15px 0px !important; } /* style the links */ #archnavbar ul#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; } diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index b7d6e1e..d8c66aa 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -13,8 +13,12 @@ */ /* container for the entire bar */ -#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; } +#archnavbar { min-height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; } #archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url('archnavbar/archlogo.png') no-repeat !important; } +@media (-webkit-min-device-pixel-ratio: 1.2), (min--moz-device-pixel-ratio: 1.2), (-o-min-device-pixel-ratio: 2/1) { + #archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url(archnavbar/archlogo.svg) no-repeat !important;background-size:100% !important; + } +} /* move the heading text offscreen */ #archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; } @@ -23,8 +27,8 @@ #archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; } /* display the list inline, float it to the right and style it */ -#archnavbarlist { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; } -#archnavbarlist li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; } +#archnavbarlist { display: block !important; list-style: none !important; margin: 0 !important; padding: 0 !important; font-size: 0px !important; text-align: right !important; } +#archnavbarlist li { display: inline-block !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 14px !important; padding: 14px 15px 0px !important; } /* style the links */ #archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; } @@ -79,6 +83,7 @@ pre { pre code { display: block; background: none; + overflow: auto; } blockquote { @@ -400,6 +405,10 @@ ul.errorlist { color: red; } +form ul.errorlist { + margin: 0.5em 0; +} + /* JS sorting via tablesorter */ table th.tablesorter-header { padding-right: 20px; @@ -654,6 +663,17 @@ div.news-article .article-info { width: 75%; } +/* todolists: list */ +.todolist-nav { + float: right; + margin-top: -2.2em; +} + + .todolist-nav .prev, + .todolist-nav .next { + margin: 0 1em; + } + /* donate: donor list */ #donor-list ul { width: 100%; @@ -700,6 +720,10 @@ table.results { color: red; } + .results tr.empty td { + text-align: center; + } + /* pkglist: layout */ #pkglist-about { margin-top: 1.5em; @@ -959,6 +983,12 @@ table td.country { width: auto; } +/* dev: dashboard: dashboard and stats area */ +#dev-dashboard tr:hover, +#stats-area tr:hover { + background: #ffd; +} + /* dev dashboard: flagged packages */ #dash-pkg-notify { text-align: right; @@ -1027,7 +1057,18 @@ ul.admin-actions { /* todo lists (public and private) */ .todo-info { - margin: 0; color: #999; + color: #999; + border-bottom: 1px dotted #bbb; +} + +.todo-description { + margin-top: 1em; + padding-left: 2em; + max-width: 900px; +} + +.todo-pkgbases { + border-top: 1px dotted #bbb; } .todo-list h4 { -- 2.15.0

1 0

[aur-dev] [PATCH 1/2] doc/git-interface: Fix configuration strings mangled by asciidoc
by Eli Schwartz 15 Nov '17

15 Nov '17

Double-quoted "strings" were surrounded by the <sup> tag, but what we actually want is fenced-in `strings` to create the <code> tag. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/git-interface.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/git-interface.txt b/doc/git-interface.txt index f940961..a029400 100644 --- a/doc/git-interface.txt +++ b/doc/git-interface.txt @@ -100,9 +100,9 @@ opposite effect in the case of aurweb: Most of the refs transferred to the client during `git push` operations belong to branches of other package bases and are essentially useless. -In order to omit these advertisements, one can add the strings "^refs/", -"!refs/" and "!HEAD" to the transfer.hideRefs configuration setting. Note that -the order of these patterns is important ("^refs/" must come first) and that +In order to omit these advertisements, one can add the strings `^refs/`, +`!refs/` and `!HEAD` to the transfer.hideRefs configuration setting. Note that +the order of these patterns is important (`^refs/` must come first) and that Git 2.7 or newer is required for them to work. Since garbage collection always affects all objects (from all namespaces), it -- 2.15.0

2 2

[aur-dev] [PATCH] Auto-link bug reports in comments
by Lukas Fleischer 08 Nov '17

08 Nov '17

Automatically detect references to Flyspray bug reports in comments and convert them to links to the Arch Linux bug tracker. Implements FS#52008. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/rendercomment.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index 22aa856..4b64227 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -26,6 +26,20 @@ class LinkifyExtension(markdown.extensions.Extension): md.preprocessors.add('linkify', LinkifyPreprocessor(md), '_end') +class FlysprayLinksPreprocessor(markdown.preprocessors.Preprocessor): + _fsre = re.compile(r'\b(FS#(\d+))\b') + _sub = r'[\1](https://bugs.archlinux.org/task/\2)' + + def run(self, lines): + return [self._fsre.sub(self._sub, line) for line in lines] + + +class FlysprayLinksExtension(markdown.extensions.Extension): + def extendMarkdown(self, md, md_globals): + preprocessor = FlysprayLinksPreprocessor(md) + md.preprocessors.add('flyspray-links', preprocessor, '_end') + + class GitCommitsPreprocessor(markdown.preprocessors.Preprocessor): _oidre = re.compile(r'(\b)([0-9a-f]{7,40})(\b)') _repo = pygit2.Repository(repo_path) @@ -102,6 +116,7 @@ def main(): text, pkgbase = get_comment(conn, commentid) html = markdown.markdown(text, extensions=['fenced_code', LinkifyExtension(), + FlysprayLinksExtension(), GitCommitsExtension(pkgbase), HeadingExtension()]) allowed_tags = bleach.sanitizer.ALLOWED_TAGS + \ -- 2.15.0

1 0

[aur-dev] [PATCH] Fix sorting order when clicking table headings
by Lukas Fleischer 07 Nov '17

07 Nov '17

A bug introduced in commit 7d7e079 (Hide the table sorting links on the dashboard, 2017-02-04) resulted in multiple clicks on a table heading in the package search results table no longer having any effect, instead of changing the sorting order. Fix this by removing erroneous spaces from the GET parameters in the search URL. Fixes FS#56261. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_search_results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 7f92685..d7512b1 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -3,7 +3,7 @@ if ($show_headers) { $fmtth = function($title, $sb=false, $so=false, $hint=false) { echo '<th>'; if ($sb) { - echo '<a href="?' . mkurl('SB=' . $sb . '&SO = ' . $so) . '">' . $title . '</a>'; + echo '<a href="?' . mkurl('SB=' . $sb . '&SO=' . $so) . '">' . $title . '</a>'; } else { echo $title; } -- 2.15.0

1 0