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

[aur-dev] Problem compiling OpenSSH
by Marcel Korpel 31 Dec '14

31 Dec '14

Perhaps I'm not that sharp, but I'm not able to compile OpenSSH succesfully. I followed all steps in INSTALL, but things fail for me after issuing `make` in step 5. My terminal reads: auth2-pubkey.c: In function ‘user_key_command_allowed2’: auth2-pubkey.c:579:34: error: ‘SSH_FP_MD5’ undeclared (first use in this function) keytext = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); ^ auth2-pubkey.c:579:34: note: each undeclared identifier is reported only once for each function it appears in auth2-pubkey.c:523:18: warning: unused variable ‘errmsg’ [-Wunused-variable] char *username, errmsg[512]; ^ Makefile:148: recipe for target 'auth2-pubkey.o' failed make: *** [auth2-pubkey.o] Error 1 I suppose SSH_FP_MD5 is a constant, but I cannot find it elsewhere. Is there something I do wrong here? Regards, Marcel

4 7

[aur-dev] AUR 4.0.0 pre-alpha
by Lukas Fleischer 30 Dec '14

30 Dec '14

The 4.0.0 release brings Git repositories to AUR packages. You can test a pre-alpha version at aur-dev.archlinux.org [1]. In order to submit packages, you can follow these steps: 1. Create a new SSH key pair for the AUR. While this step is not strictly necessary (you can use any existing SSH key), it is recommended to do this: $ ssh-keygen -f ~/.ssh/id_rsa-aur 2. Log into the AUR web interface at [1], go to "My Account" and copy the content of ~/.ssh/id_rsa-aur.pub (or any other key you want to use) into the "SSH Public Key" field. Click "Update" to save the key. 3. The SSH daemon for the AUR uses a custom user and a custom port. It is recommended to add the following lines to your ~/.ssh/config so you don't need to specify user and port each time you connect to the AUR SSH interface: Host aur-dev.archlinux.org IdentityFile ~/.ssh/id_rsa-aur User aur Port 2222 4. To create a new (empty) package base foobar, run the following command: $ ssh aur-dev.archlinux.org setup-repo foobar 5. If you want to submit changes to a package base, you need to clone the package repository via SSH: $ git clone ssh+git://aur-dev.archlinux.org/foobar.git/ When making changes to the repository, make sure you always include the PKGBUILD and .SRCINFO in the top-level directory. You can submit new versions of a package base to the AUR by committing the new PKGBUILD and .SRCINFO and running `git push`. If you spot any major flaws or have suggestions for the new interface, please let me know. Regards, Lukas [1] https://aur-dev.archlinux.org/

4 6

[aur-dev] [PATCH] git-update.py: Cast epoch to an integer
by Lukas Fleischer 30 Dec '14

30 Dec '14

Convert epoch values before doing integer comparisons. Also, add a sanity check for the epoch variable. Reported-by: Ido Rosen <ido(a)kernel.org> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-update.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index 94da12e..6888ad0 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -42,8 +42,8 @@ def save_srcinfo(srcinfo, db, cur, user): for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) - if 'epoch' in pkginfo and pkginfo['epoch'] > 0: - ver = '%d:%s-%s' % (pkginfo['epoch'], pkginfo['pkgver'], + if 'epoch' in pkginfo and int(pkginfo['epoch']) > 0: + ver = '%d:%s-%s' % (int(pkginfo['epoch']), pkginfo['pkgver'], pkginfo['pkgrel']) else: ver = '%s-%s' % (pkginfo['pkgver'], pkginfo['pkgrel']) @@ -189,6 +189,9 @@ for commit in walker: for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) + if 'epoch' in pkginfo and not pkginfo['epoch'].isdigit(): + die_commit('invalid epoch: %s' % (pkginfo['epoch']), commit.id) + if not re.match(r'[a-z0-9][a-z0-9\.+_-]*$', pkginfo['pkgname']): die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) -- 2.2.1

1 0

Re: [aur-dev] [aur-general] AUR 4.0.0 pre-alpha
by Lukas Fleischer 29 Dec '14

29 Dec '14

On Mon, 29 Dec 2014 at 22:16:45, Ido Rosen wrote: > Will all existing AUR packages automatically get their own git > repositories or will we have to resubmit all packages? > [...] Both. The current plan is as follows: A couple of weeks before the official release of 4.0.0, I will reset the setup on aur-dev.archlinux.org and create an empty Git repository for each package that exists in the AUR at that moment. The package maintainer will be retained so that nobody can take over anybody else's package. AUR package maintainers are then asked to upload their packages to aur-dev.archlinux.org and co-maintain them on aur.archlinux.org and the Git repository on aur-dev.archlinux.org for some time (roughly four weeks). Users who have already been using Git for their AUR packages can add .SRCINFO to all commits and import the whole history. At some point in time, I am going to remove all package bases that have not been uploaded to aur-dev.archlinux.org and move everything from aur-dev.archlinux.org to aur.archlinux.org. It is a huge AUR cleanup.

1 0

[aur-dev] Architecture specific fields and RPC interface
by Rémy Marquis 29 Dec '14

29 Dec '14

Hi Lukas, Thanks for the great work achieved with AUR 3.5.0/3.5.1. Pacman 4.2 and AUR support the new architecture specific fields (such as depends_x86_64, depends_i686). I however just realized that the RPC interface (v3) now lists all depends and makedepends in the same generic array. Are there any plan to support these fields through the RPC interface? Maybe with new (Make)Depends_i686/_x86_64 json arrays? Thanks, Remy

2 1

[aur-dev] [PATCH] Disallow specifying an SSH key during registration
by Lukas Fleischer 29 Dec '14

29 Dec '14

Make sure that users confirm their email addresses before setting an initial SSH key. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/account_edit_form.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 996c207..110fbb5 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -97,10 +97,12 @@ <input type="text" size="30" maxlength="50" name="K" id="id_pgp" value="<?= html_format_pgp_fingerprint($K) ?>" /> </p> + <?php if ($A == "UpdateAccount"): ?> <p> <label for="id_ssh"><?= __("SSH Public Key") ?>:</label> <textarea name="PK" id="id_ssh" rows="5" cols="30"><?= htmlspecialchars($PK) ?></textarea> </p> + <?php endif; ?> <p> <label for="id_language"><?= __("Language") ?>:</label> -- 2.2.1

1 0

[aur-dev] [PATCH] Add systemd unit files for the AUR sshd
by Lukas Fleischer 29 Dec '14

29 Dec '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- INSTALL | 7 +++++-- conf/aur-sshd.socket | 6 ++++++ conf/aur-sshd@.service | 8 ++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 conf/aur-sshd.socket create mode 100644 conf/aur-sshd@.service diff --git a/INSTALL b/INSTALL index b198997..72e7539 100644 --- a/INSTALL +++ b/INSTALL @@ -37,6 +37,9 @@ Setup on Arch Linux # useradd -U -d /srv/http/aur -c 'AUR user' aur # chown aur:aur /srv/http/aur/.ssh/ -8) Run the sshd as the new user. +8) Add, enable and start systemd unit files for the new sshd: - $ /srv/http/aur/openssh/sshd -f /srv/http/aur/.ssh/sshd_config + # cp /srv/http/aur/conf/aur-sshd.socket /etc/systemd/system/ + # cp /srv/http/aur/conf/aur-sshd@.service /etc/systemd/system/ + # systemctl enable aur-sshd.socket + # systemctl start aur-sshd.socket diff --git a/conf/aur-sshd.socket b/conf/aur-sshd.socket new file mode 100644 index 0000000..5b0c3df --- /dev/null +++ b/conf/aur-sshd.socket @@ -0,0 +1,6 @@ +[Socket] +ListenStream=2222 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/conf/aur-sshd@.service b/conf/aur-sshd@.service new file mode 100644 index 0000000..e29c292 --- /dev/null +++ b/conf/aur-sshd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=AUR OpenSSH Per-Connection Daemon + +[Service] +ExecStart=-/srv/http/aur/openssh/sshd -i -f /srv/http/aur/.ssh/sshd_config +User=aur +StandardInput=socket +StandardError=syslog -- 2.2.1

1 0

[aur-dev] [PATCH 1/3] Use a custom logo
by Lukas Fleischer 29 Dec '14

29 Dec '14

Currently, the AUR sites are hard to distinguish from the official website, especially when browsing Git repositories in cgit. Add "user repository" to the logo to make it distinguishable from the official site. In order to avoid confusion, also change the link in the logo to the AUR home page instead of the main Arch Linux website. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/archnavbar/aurlogo.png | Bin 0 -> 5997 bytes web/html/css/aur.css | 4 ++++ web/html/css/cgit.css | 4 ++++ web/html/index.php | 1 + web/template/cgit/header.html | 2 +- web/template/header.php | 2 +- 6 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 web/html/css/archnavbar/aurlogo.png diff --git a/web/html/css/archnavbar/aurlogo.png b/web/html/css/archnavbar/aurlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..69110d8e31ac7f501df090eac841e97c164c7458 GIT binary patch literal 5997 zcmWld1yEFN6owaAx<k4}KuYQE<`+ajK#;B#1QuynmTn{!X;@Ogm6DPcY3c5krI&8_ zuQzAz%$>R4J?A{<eNVKmjyf>`Jpl*=BG%MU(F5+Sz{!V)16=3lFeiZ<j`e@)Dj?y1 zdxX65Iq(D@s`17hcw_qCiJ`=u=>t5(_0ZH-#a$v|q>+9uvDnZ60#RRUswf)x%<Y@` z8|xd@J!GeZ$*_Wx(NwzTA$iARCR8j22C$KMWSw#g(%8aha%oq5oUWpF+-+x?&UM%0 zyMC=<HZ}IX0n#Lkf=V5OCCC~H>7pUU@TJ6OOWbM<WKDv8NG8kQm-u!#fScuhJ|}&1 zJ2ltVaz4kvE+7ye5~}i;7_3URB4%W%5wWqwSNQnz)6NoQIzjiZM!4J<7#L)DV3P5Y zEp(*RWK1Q~)a+X}gWz?HkT9JUk~%H9i6$Z;>)&`B92~4tQuME0y@Gmst2;XK94s^n zOY~5t;;Ej-k{P77BRBGneohUNW?QAO@!S)DzanT>G*-OhvoI?qWZM!lNM3EPB9`nD zyJBe`KY7x%L9a*_I#up|5gPmq^ZIK(9<@pGQpA!ffzE%TS%+q{ei-rjQdEk0!ZJry zTXd3-a8k#059OQ@U)ANA+YCd-I$O~0cy00o9b_mb!drm{T2yvd!cFcj(d*vdh^4#I zu;)d>&D~98cZtN-UmX|;Z--uuZ^PUt;@HIcP-(d@hIQ3!NfmFS-C@YgXA^P-DA@QQ z?v7PKM|sozZ~EcQ59IXp1f>Q9RmMcX5tBbMHy4wdO8x1}mx7|AuDW>38n(|`qaz~< zO+D6CtQ64-$%TX0aIG>dYrM;sjF<iB?YIjmc6&MU6-schS(BI5pESW0s6^Z_9TCpk z#t+yx=lh-EgdXrF%MQ%n-QDaG611I>r0S}w*ye$Eo(&BRtdf#+HTHu_Q0Vh8B{sZ} z_G0bK#O!QmJ{CH<XgXp0_JILHW@hF@ts>OHfts^3zoV1WD|7Ss=4Kg`htw{mel`go zHR0&!DEjCq_{$d>2}Tk}M@Q(xeSpF1*NB3GPUd3aDDp6{B3(q#ODyV0($~+0zZj7+ z5F>kOvd(cyoPV^n$y?jlAWtNce>b?TlhM#bw)kJH)eOrCH$EH>JhR#8P2!wxZfU8q z=^+7w!D(+@ot?v9aAGNvrHMJyQ}dgIp-_;Tvxu-T+CYnX7bX%Wsj#>>B1o-Cje*0% z{asXieE0eO{Oamz2ZYww*LS8ZP~K(nXBYT&4fFEK29e#22ws_1`vK&jvD;J8VdZ2b zR%XQzHbRS`7r~{pE{JJz0Ya%Pv5GE29g&zNMHC@1?9jR0ceOi>0;qEatn6Nzd|vhU z2}+W&h;tI$wgdWJm!hMeYK)+gx|=ED6x-nEs9d?8L!xwWOlPeOy9$Tog2_$jWGcD! zY_*++R`mk4xVZS<Y)vGNA4tLjMaCWTE0y0AJ*v(k7}DCN!9h`2Qetzs)B^lr#G<_K zF~`53VbzJFHgcg?wXtDqYiGAw-*$(*LT^1zetFh3EoCQ3<yO(&zIulE+BtH6yQ}-r zXGr5srrwhBP1yA4BN1{bZ}}kG&USaji^@?{l$PRn^F<y(6yo*#zC87D-vDBda<)d5 zo*GVcwPE)hY8GcdpWHy8eIll`Pi}1|VvTq=gu~rw;d9+St)*rx9={Sja`Kjm;C5t0 zx2gZ`_)A+Mor=ZL>1kMfy?DTeUb)*P+N$~Hpvh+y`$kHNogH($By;T7&W@vsii%}- z939qJEp$~0hVH-(eIk?~Ti4E{eX<m8$O!Us5>+XRWRpF^Z;t;Kxv^o`U@l8iT|-P2 z8CmyR6vZqSp*RUzonU|mh|qC?Bx<KHIT(=9<$P<!vR-mO#uT{o^(-w<a+oJaPs~=~ ztAs&8sz0&nD5biGMBiw7g!LGe8Z^M~q<DCEbWKfTGcxF9e9$2FB)pD}4h?PXt|;>2 z2s%1Ce1R{7wI<H`vS(*!4FNY|L%H$^iHT%$`IN|)r+z@9p?ywi-1cS!ZSCzdbeRGJ z0}~6M8fRo?CgtWP%*~k;Byl}?5<DQv^d==GB`GP%s(S7}GMstIK$f3R5(2TpbV%!C z{n;A4J8V6_jE{ovLm8j~@}W~SQ%dV}agkNeI-9<KOAzQ8#0s0PMw}Bx%(?QJlpsUY z57dA7M$9>Jd@4x6hzYq|SXS8inM;CxN(RZfBAH>*hPEYQq*gy-di5tyH$ppfz%#vb zjQ0L^OTOUycM_aX3^q14^u<MFLISChvhwJ}MA+Dv-p1d*Yrmr@p>A%zw-l0$arB}D zMiu6wyGI|Dp~_fw&hruaB|3D9KLc*OYKFbMy&nq;Q#uUir~*V0p(ifXdrCn;k(io_ zBQGyc_2|)RLf~z|tfYp;Y>U5m>*X3DM1($N*Z<-`RZR^iObO9<*50lVArg7NJYX5Y za|(NgHT=l&5bD!=Posl;9TzaPW7vLoyF79kJ2;{lp}f0;9iKlsv7YjYser^vh>H!R zL2!{LxETOx?i`Ujc->%jT{a90PpIn~0EL7N4C=3(iMDeQ!(KyWJPtbZ+*u;jhRGW4 z(fkWBLPzLEgCN`VZBY`beDkoIE}}?KTT2U*Yx5D#-#_W0D=U^Y!yB8Mh}PB|wb*O= z5J_M33Wnh~V=Ia&4^L0kw{IEuXMxy$d)r9y@#9C%X;TvuD3AiZwnBVws=)wvL(N@% zDZGHp-<zu)*lW4DIDE{@OSrwgEmlR-A0g4|M#YL3CBRaR=U1=}slcuOPUP5DHPWc@ zv7PIBP!K2P<~~BJ>~mt)VsP>71D4&!3yE3-1>HB8ARmcU`8@BW5dMmA)EJ_KW)h(x zMkRQ{V#@k5Dw2{q*q}DlG?3CU7cZ#Ly=7<wj8_rp5XUpaOA!s0_C8S2)lKZ$O5?2N zqaLts48<iKv%Ye3bF-|O{lPsDLCgTjJCvv2TWB0FK0I6WUVhWOJU8bk>`*KX>!;|# zZTmU#_kN3;9)Y7kR_JTzH7Jb2S)b6uum3Nwr*n%&QO*rt;#dl@2+Jdg$MrDLIQ9nU zx7R%y#8uyqrUAZsL^%_ae4<k=6FcCgHXnDs1w9q2NbjlK!>xOH9!uOpYe1&g;J`qv z*M9$J-pivN7A8YiBcm^mUXX&`hIy8a=XMhrzu2+FsnkY0aR1eV)8EEe>oN+Mm>U!O z-mc}K<~J)ke2vAw-ZPV-i5Z!JO0R7adOdP7^7CrW48Ga_nN|)aVUyKVT-=RQqA_a+ zz1#ddm`Nfk;j}MA`#xPkXq%N!?!Vb-OWYSO$mu=!>VK6iQ_6=s#4)=>=7XXQpK_T! z0!gEGJmPYQv0g#~ox%93e_$Fz@9WEbK70_`H}UnAtgfzx9xO<DczCpTc4AR->HG%P zvbw$fuIt_GU&Qq|BS^Q@z$e2xw&VQx{GNGYZ)cbFB>bzKK_p6)@0a<4Fb#*NW5dFq z&dy75zkIoAcgC??F@Kos@FZJP`A<x11Uc@^rsow*&Y3+UCnr8Di*fw}+}&L`o<%-> zvfL;WJ64u?`7L}1HCm9%9ffNYA;Qp6WhoR|Aa%EPgr(LRZtd5K7lX2(eSlvs?B;2l zk7Kp6^K|X-AdyVPQ31Z~U4J$=vg8AqwTi~}PCkGB+~9xlU0K0Fz>S}Wr{6IQRjQw@ z4&q8<m*CVb!3n=<Z7<nl{qIvWNyrhM?=L;tOC>0SOX#={gGsbJbG-llHppUYEqJK1 zl*GSp5pDw@j7~TG`r41aH~kX+?4w}M;66gCtE=mWim;K9(Km~>CC6Eym6$Z&_a#t- z5&y7HH0b#TpXb*A!XR_J@S;MIE+_23sz4E90DX4LI2N+VI+2ZvOVhECJ$Nj`OzPs| z(oGuKDL6aMM@8U_1^3^B**s=?5|b9}e|H}%y55t}1GL*gxhAiDlZK`y=|UtE6B9QN zkC61%<zxli&Z~$TWIvb@4yXv&<!U6Sm4QEZns$2$Eg%)`up2|QZJ2$eewaw*zdS*0 z{%`@%<6<=ozOd$;$#%B%tW$y^9QeOFAM2s6*iY1orj-ju71)y$fGaB*?MVfokU~O2 zzP)r2wGQ;a)~VD{ojV9MI>FL#7MD_{%%i+AzF(7DMV&{3DwfU@SCFRlWR#RPYgO`> zD_DHSl^{t;$**N)N-&sA@r(2jfS>d};YtYnAe`!9&w*6_sF;|1WKMB$vGwsrpM={Q z*k!qu__J1cW#w}YPELBt+2rKpcKezt_?=%jm7Th7wt2te*6AnDIiVGdykW=kgHbKv zSmIiByoNz<{`wSKMM=kqt1C>ushBy=3eXHA-ho+I-f`9Vs*y#+iXn!9mHtR-CDE9^ z={x)KNym>YpS7@oAbvIA!2@GTNJ}dtbd7O=2w;|{{wcr0NEV*|NJ#K&R}zw$hBMjw zG_?i32SeXmNuv`OB|~T|U`bw7>IMc>`T6;@1KHBvBtWq0GuJQlkQd8=ET;7?MRakw zxw(_CC*O@1uZp)_5zF18m78|z`Lp_dTQadsZZ`#WB~71)iQrR|C2AT5S48<2^$70N z%HmR;h8p=V@Q!HRcI-eROh@5<Q72;<kY*(WGj())R66wTsL(S4q1!$=ISHYqF4d{` zrk#M>@bTC_&0v*0dFuRVumvKYm2vonSz9J#bd$!;-NDGv(0aUB8_Q2oJ%KsgfT!q* z@9bl2Z0z3N%4hreWn~2Z=X+I|J2MjGmT4yx_Cfy<#~)k>!o7^7FB9|#q&kc9ZGQM( zmp;16d-9G+iXE^tvS6i(BAX%cYA!#>bA`8+427vVL24)wG8z~Ts#f<me~=-CWy(5$ z>uwqDv1&Vk$}(M_$J2ZEpkH~B=sEdsrq+A67-u)z<0VG`JxxCr=u?Gb;gaMbk;H%m zw#Tp^PGZi5Uq2liA9uU^xi391lp`CvIq;>Rw6xFV#r)b4KIgii6U4HRzOKqoKRcgy zIjCq)vmC-wPj*HqueLkk@uTM!6RDqya9i?+z_v;MX<&ei63bHm6=>spC!C{L!o<V; zK3&Zp&#2=pN@gYpuAG5nCcB&)BwSzTXbWo<Q2+-qF>&I+CglBl+hVD*AY+J32r|rH z1lsB!pN=_cj#cUysmN*#Q{yF3n2tIkGcc=e9B;ec;RX6@^VQ$XG)ebj!N{C^?)B8R zZ{PR~jEvSNO7$U*j!J+K;o;?dWoD+$fa$vU)9$#6^UE^}H4_v1Vx8<5-;=*=tgIk7 z9Nzt^$opm$NU_B9^uDk9CF2MnT;7LEU4TDw#%VP{s@d5+Sxh{2gl6z|?8}eo`BiRu zvWl8<jy&;jln`B{yX-GFC)9JuQ0zCXYZvyXG@*Q;q(6iL1`$O7i#OCU_<$!MpR<=T zqlS^tni<@QRbGzu-i|j+9_Ca_Cm?>3$1Fzgc=#OBg(0H6y?8V=@7*F_Yr>D`?%<#Y z4(|RUro3hE8`7UT{p;rPkWX$rwUP?R=+v_x)1A9BYW4|ss+TZ1SU|ul3kz2vibM|l zV1;(tU7FY~h?A4M#zrJ7o{z7uV#Rbp<Ln1^b7N!LQ$N|Vva<Jc3G>nkw2~h<4i=jt zGcqzT+~5S@eXwYZ<(Vy*6uO&}!v!vVC74<OLWSjwXocn_#Rqjnlg2lbF!~Z_%{eNR zv9uA^I^anhn@~zAC%vc50*h^tZu=^suw9^z<#aPQLb$g>BYlZ4O{|%qlSPK(q;obF zh^-4<9O#CpW$DI0v>Cr|$ekzLYT6RyP(Bt3>ppr)J^z<a%do`LRnx0BQ&613q)PsW zODnW34P&&Zt-$H`CG#^8j^R%LQXWf6&f4aj)qq<+7$o<VLZ%|pJE8zf540X2i&zC_ zh@G};l#eU8%+1Ybntg=<Ifn(BsdHv9M4FtPV73B_=}MEV!<xpy8g0@*%8iR!%h2n? zagmwJZ9UKDpM@hHmRlT7N7Rg|2lmdEj^B&TzgOcK4=_E|<e;e8x0E8!51e;$a;ow< zvIe|Y@Swd7Aep10qVfV9IJ58Ob;!W{^bRkzqBNu9N8J_NkX+{Ea{_4I7&g9|9QOW- zpWu$g6QE<I604ws|28t@(aRmA;{@2+a%gF3#Sxm98zPl7HSyUWKL#{Ibb)#TI~NzO zP&$#rP?n&5p@4ZaEkKyWKHJ{DKEdw<xY*c;!a{K1)qn-y+dnc%d!<eEcr0hM?$6gh zmX>B{Y;2tQ=~+(x_T9U8+<bg0IyxjexpK}jk|Cx0KpFJ*_O|D%#-azsmqDPl_4QYJ zdLaM}Oefxb-w(VV&xPLK`r3r7bbn-UJ6cmM_k9!BK7FD}J>1SVp@nyl70Pk=u;Pzy zV|_Y<4c{j<<XsV44!vA3zl5JHC*~{=Y?)rM(%J7(WfJ=SqChqNa#-5UoDa=ROTz<P z(l^t3lG4)BnOY|rA{;DhYwJp&A^$7z^EoGg4M6N_H1CJQ@G1W-EEIPz*M9V(mH+zJ zuV0mR1Jr;xx7wK~O%t@i`S+^*ApNJ*RO`VEQHZN+&tc$$KhWBR>sl&c$9-HNKd(mT zg$D8m!2Iy<h)kcmw%t+d=;(AKi}3OB8~o08f)cz$x{n@>J`1+KFkKWuv3=zZSy@tr zGW6qmW-%&mclblGnsLQf41bV1Ry+s#wt_=1N6?v%Wbhh#lw5Qe(UWvru5lPLAbr>z zT3s!)v9+a)G-Md(hrwXzDO1<rfz4m@^9*o!LaCLN72Dwa#pl)wBfw6)wt&Os{xKL3 zL>y0^SnbVJL0k{<4H#v7$N*Q>J2ce2Gg(efN7pxV-kO}7OPc2p82W-!_+6}IHYu}A zUTrojo`|TZ)%o6RgZoyzoAi!CI5Efs!6l{4l^Mox^{9)?OqRq;J*Cs)x#Fu8(NCe% zx+JT$l)5Tyc(2hM>u@tWWA?Z3KUk)-w||10yf+)XjlO7{`nXl(<$>Dn&ng7pjdA?$ z>av>p_67(_w-6GE1gI?%@~x?fVQ6Rw^yiQc#T#%qpYNJiKKH`;ut{@i=||kXvpk?Z z#>U3bJLMHh<&$ft+rh4?9Kkt-Y>9k9`Rx?~;nPRUih2z<(Lp)(zS&5!+y_ka9<lQc ze_g6}>x)7q`Oq<Gj+Z$ybnaV2qLQloz*z9T7(;q`y2OXVEh4RGm5_li&loy<)_&u^ zZT2B&PwHL6Cr$lL9iU(Qq626KRkoVLemZa7q*uKK=7^jx(t<vHq5`bjDv--@&WEn2 z+1c56L_{iDS_A+^`FCuS0j&|rq4_6Ung$S~-ANFIhH;IE0;fv}v|~lbS--d#)6^A5 zSOFx6<3Skm{SGT;<_blS1se36eL0oG^+a1+8>mVRAgktG+dcw001Puhs9E#IcjKHk zJDs&o)4ImSQA0yIw`UcBUB{aPA8+CZ`uq1>Ist9t`q~0;4pS8tq`*c+O})0!m-3vJ zXr|GfD^<WO=JL{qn~LE5+z<Q@jf{X@v!7pj2#X20IbQ_|_xH_VTf#>MaV5?a!5!PV zm#>VBA^|H81dUBxd|GabJmZ|X%eg^y`0z4Xb)Otu>n-tipw*vKwoQdSSPAj`Z^|jD zVA-Uj$vuf?G8&BzQbJVvF-9Y;ChxBSsfs?Ewpecu#`=d)6?XFd7cA7V*wHFV1COdF zyqta&rf7=2p9z|+aj*eM>ve{Gvqiw?;@%~E_wXT|Bx-E;ERL$%^7)Lm>)vR|`1YSV z{fg;K?5{<2^Awxa*r#AcR&j9}>nd6c_*Ky&Nf2~H-iJ9kFktn_2bkQc1q8_Qr<`rE zpZpzE1}siYZ0tU1B@srT#ywLw<4y?MmG`FyT-<}Z*hdaU3&3C;q^YW-@?FU?<bQ)B BqD=q* literal 0 HcmV?d00001 diff --git a/web/html/css/aur.css b/web/html/css/aur.css index 654116a..dfa6717 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -3,6 +3,10 @@ color: white !important; } +#archnavbarlogo { + background: url('archnavbar/aurlogo.png') !important; +} + #lang_sub { float: right; } diff --git a/web/html/css/cgit.css b/web/html/css/cgit.css index 865a004..fde94c8 100644 --- a/web/html/css/cgit.css +++ b/web/html/css/cgit.css @@ -28,6 +28,10 @@ color: white !important; } +#archnavbarlogo { + background: url('archnavbar/aurlogo.png') !important; +} + body { padding: 0; margin: 0; diff --git a/web/html/index.php b/web/html/index.php index cc6a84c..9c321fa 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -152,6 +152,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { readfile("./$path"); break; case "/css/archnavbar/archlogo.png": + case "/css/archnavbar/aurlogo.png": case "/images/AUR-logo-80.png": case "/images/AUR-logo.png": case "/images/favicon.ico": diff --git a/web/template/cgit/header.html b/web/template/cgit/header.html index 0605ac2..0217f2f 100644 --- a/web/template/cgit/header.html +++ b/web/template/cgit/header.html @@ -1,5 +1,5 @@ <div id="archnavbar" class="anb-aur"> - <div id="archnavbarlogo"><h1><a href="https://www.archlinux.org/" title="Return to the main page">Arch Linux</a></h1></div> + <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux User Repository</a></h1></div> <div id="archnavbarmenu"> <ul id="archnavbarlist"> <li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> diff --git a/web/template/header.php b/web/template/header.php index a4958f5..8a1494c 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -16,7 +16,7 @@ </head> <body> <div id="archnavbar" class="anb-aur"> - <div id="archnavbarlogo"><h1><a href="https://www.archlinux.org/" title="Return to the main page">Arch Linux</a></h1></div> + <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux User Repository</a></h1></div> <div id="archnavbarmenu"> <ul id="archnavbarlist"> <li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> -- 2.2.1

1 2

[aur-dev] AUR 3.5.1 released
by Lukas Fleischer 29 Dec '14

29 Dec '14

Hello, I am pleased to announce that AUR 3.5.1 has been released. The official AUR setup [1] has already been updated. Apart from several bug fixes, this release deprecates mkaurball. We now recommend to use `makepkg --source` from pacman 4.2.0. 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.5.1 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH 1/2] Add cgit configuration and style sheet
by Lukas Fleischer 28 Dec '14

28 Dec '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- conf/cgitrc.proto | 29 ++ web/html/css/cgit.css | 853 ++++++++++++++++++++++++++++++++++++++++++ web/html/index.php | 1 + web/template/cgit/footer.html | 8 + web/template/cgit/header.html | 14 + 5 files changed, 905 insertions(+) create mode 100644 conf/cgitrc.proto create mode 100644 web/html/css/cgit.css create mode 100644 web/template/cgit/footer.html create mode 100644 web/template/cgit/header.html diff --git a/conf/cgitrc.proto b/conf/cgitrc.proto new file mode 100644 index 0000000..fdc280b --- /dev/null +++ b/conf/cgitrc.proto @@ -0,0 +1,29 @@ +virtual-root=/cgit/ +clone-prefix=git+ssh://aur@aur.archlinux.org:2222 +noheader=0 +logo= +css=/css/cgit.css +snapshots=tar.gz +readme=:README.md +readme=:README +enable-index-owner=0 +enable-index-links=1 + +cache-root=/var/cache/cgit +cache-size=500000 +cache-dynamic-ttl=15 +cache-repo-ttl=15 +cache-root-ttl=60 +cache-scanrc-ttl=120 +cache-static-ttl=60 + +root-title=AUR Package Repositories +root-desc=Web interface to the AUR Package Repositories +header=/srv/http/aur/web/template/cgit/header.html +footer=/srv/http/aur/web/template/cgit/footer.html +max-repodesc-length=50 +max-blob-size=2048 +max-stats=year +enable-http-clone=0 + +scan-path=/srv/http/aur/repos/ diff --git a/web/html/css/cgit.css b/web/html/css/cgit.css new file mode 100644 index 0000000..865a004 --- /dev/null +++ b/web/html/css/cgit.css @@ -0,0 +1,853 @@ +/* + * ARCH GLOBAL NAVBAR + * We're forcing all generic selectors with !important + * to help prevent other stylesheets from interfering. + */ + +/* container for the entire bar */ +#archnavbar { 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; } + +/* move the heading text offscreen */ +#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; } + +/* make the link the same size as the logo */ +#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; } + +/* style the links */ +#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; } +#archnavbarlist li a:hover { color: white !important; text-decoration: underline !important; } + +/* END ARCH GLOBAL NAVBAR */ + +#archnavbar.anb-aur ul li#anb-aur a { + color: white !important; +} + +body { + padding: 0; + margin: 0; + font-family: sans-serif; + font-size: 10pt; + color: #333; + background: white; +} + +div#cgit a { + color: blue; + text-decoration: none; +} + +div#cgit a:hover { + text-decoration: underline; +} + +div#cgit table { + border-collapse: collapse; +} + +div#cgit table#header { + width: 100%; + margin-bottom: 1em; +} + +div#cgit table#header td.logo { + width: 96px; + vertical-align: top; +} + +div#cgit table#header td.main { + font-size: 250%; + padding-left: 10px; + white-space: nowrap; +} + +div#cgit table#header td.main a { + color: #000; +} + +div#cgit table#header td.form { + text-align: right; + vertical-align: bottom; + padding-right: 1em; + padding-bottom: 2px; + white-space: nowrap; +} + +div#cgit table#header td.form form, +div#cgit table#header td.form input, +div#cgit table#header td.form select { + font-size: 90%; +} + +div#cgit table#header td.sub { + color: #777; + border-top: solid 1px #ccc; + padding-left: 10px; +} + +div#cgit table.tabs { + border-bottom: solid 3px #ccc; + border-collapse: collapse; + margin-top: 2em; + margin-bottom: 0px; + width: 100%; +} + +div#cgit table.tabs td { + padding: 0px 1em; + vertical-align: bottom; +} + +div#cgit table.tabs td a { + padding: 2px 0.75em; + color: #777; + font-size: 110%; +} + +div#cgit table.tabs td a.active { + color: #000; + background-color: #ccc; +} + +div#cgit table.tabs td.form { + text-align: right; +} + +div#cgit table.tabs td.form form { + padding-bottom: 2px; + font-size: 90%; + white-space: nowrap; +} + +div#cgit table.tabs td.form input, +div#cgit table.tabs td.form select { + font-size: 90%; +} + +div#cgit div.path { + margin: 0px; + padding: 5px 2em 2px 2em; + color: #000; + background-color: #eee; +} + +div#cgit div.content { + margin: 0px; + padding: 2em; + border-bottom: solid 3px #ccc; +} + + +div#cgit table.list { + width: 100%; + border: none; + border-collapse: collapse; +} + +div#cgit table.list tr { + background: white; +} + +div#cgit table.list tr.logheader { + background: #eee; +} + +div#cgit table.list tr:hover { + background: #eee; +} + +div#cgit table.list tr.nohover:hover { + background: white; +} + +div#cgit table.list th { + font-weight: bold; + /* color: #888; + border-top: dashed 1px #888; + border-bottom: dashed 1px #888; + */ + padding: 0.1em 0.5em 0.05em 0.5em; + vertical-align: baseline; +} + +div#cgit table.list td { + border: none; + padding: 0.1em 0.5em 0.1em 0.5em; +} + +div#cgit table.list td.commitgraph { + font-family: monospace; + white-space: pre; +} + +div#cgit table.list td.commitgraph .column1 { + color: #a00; +} + +div#cgit table.list td.commitgraph .column2 { + color: #0a0; +} + +div#cgit table.list td.commitgraph .column3 { + color: #aa0; +} + +div#cgit table.list td.commitgraph .column4 { + color: #00a; +} + +div#cgit table.list td.commitgraph .column5 { + color: #a0a; +} + +div#cgit table.list td.commitgraph .column6 { + color: #0aa; +} + +div#cgit table.list td.logsubject { + font-family: monospace; + font-weight: bold; +} + +div#cgit table.list td.logmsg { + font-family: monospace; + white-space: pre; + padding: 0 0.5em; +} + +div#cgit table.list td a { + color: black; +} + +div#cgit table.list td a.ls-dir { + font-weight: bold; + color: #00f; +} + +div#cgit table.list td a:hover { + color: #00f; +} + +div#cgit img { + border: none; +} + +div#cgit input#switch-btn { + margin: 2px 0px 0px 0px; +} + +div#cgit td#sidebar input.txt { + width: 100%; + margin: 2px 0px 0px 0px; +} + +div#cgit table#grid { + margin: 0px; +} + +div#cgit td#content { + vertical-align: top; + padding: 1em 2em 1em 1em; + border: none; +} + +div#cgit div#summary { + vertical-align: top; + margin-bottom: 1em; +} + +div#cgit table#downloads { + float: right; + border-collapse: collapse; + border: solid 1px #777; + margin-left: 0.5em; + margin-bottom: 0.5em; +} + +div#cgit table#downloads th { + background-color: #ccc; +} + +div#cgit div#blob { + border: solid 1px black; +} + +div#cgit div.error { + color: red; + font-weight: bold; + margin: 1em 2em; +} + +div#cgit a.ls-blob, div#cgit a.ls-dir, div#cgit a.ls-mod { + font-family: monospace; +} + +div#cgit td.ls-size { + text-align: right; + font-family: monospace; + width: 10em; +} + +div#cgit td.ls-mode { + font-family: monospace; + width: 10em; +} + +div#cgit table.blob { + margin-top: 0.5em; + border-top: solid 1px black; +} + +div#cgit table.blob td.lines { + margin: 0; padding: 0 0 0 0.5em; + vertical-align: top; + color: black; +} + +div#cgit table.blob td.linenumbers { + margin: 0; padding: 0 0.5em 0 0.5em; + vertical-align: top; + text-align: right; + border-right: 1px solid gray; +} + +div#cgit table.blob pre { + padding: 0; margin: 0; +} + +div#cgit table.blob a.no, div#cgit table.ssdiff a.no { + color: gray; + text-align: right; + text-decoration: none; +} + +div#cgit table.blob a.no a:hover { + color: black; +} + +div#cgit table.bin-blob { + margin-top: 0.5em; + border: solid 1px black; +} + +div#cgit table.bin-blob th { + font-family: monospace; + white-space: pre; + border: solid 1px #777; + padding: 0.5em 1em; +} + +div#cgit table.bin-blob td { + font-family: monospace; + white-space: pre; + border-left: solid 1px #777; + padding: 0em 1em; +} + +div#cgit table.nowrap td { + white-space: nowrap; +} + +div#cgit table.commit-info { + border-collapse: collapse; + margin-top: 1.5em; +} + +div#cgit div.cgit-panel { + float: right; + margin-top: 1.5em; +} + +div#cgit div.cgit-panel table { + border-collapse: collapse; + border: solid 1px #aaa; + background-color: #eee; +} + +div#cgit div.cgit-panel th { + text-align: center; +} + +div#cgit div.cgit-panel td { + padding: 0.25em 0.5em; +} + +div#cgit div.cgit-panel td.label { + padding-right: 0.5em; +} + +div#cgit div.cgit-panel td.ctrl { + padding-left: 0.5em; +} + +div#cgit table.commit-info th { + text-align: left; + font-weight: normal; + padding: 0.1em 1em 0.1em 0.1em; + vertical-align: top; +} + +div#cgit table.commit-info td { + font-weight: normal; + padding: 0.1em 1em 0.1em 0.1em; +} + +div#cgit div.commit-subject { + font-weight: bold; + font-size: 125%; + margin: 1.5em 0em 0.5em 0em; + padding: 0em; +} + +div#cgit div.commit-msg { + white-space: pre; + font-family: monospace; +} + +div#cgit div.notes-header { + font-weight: bold; + padding-top: 1.5em; +} + +div#cgit div.notes { + white-space: pre; + font-family: monospace; + border: solid 1px #ee9; + background-color: #ffd; + padding: 0.3em 2em 0.3em 1em; + float: left; +} + +div#cgit div.notes-footer { + clear: left; +} + +div#cgit div.diffstat-header { + font-weight: bold; + padding-top: 1.5em; +} + +div#cgit table.diffstat { + border-collapse: collapse; + border: solid 1px #aaa; + background-color: #eee; +} + +div#cgit table.diffstat th { + font-weight: normal; + text-align: left; + text-decoration: underline; + padding: 0.1em 1em 0.1em 0.1em; + font-size: 100%; +} + +div#cgit table.diffstat td { + padding: 0.2em 0.2em 0.1em 0.1em; + font-size: 100%; + border: none; +} + +div#cgit table.diffstat td.mode { + white-space: nowrap; +} + +div#cgit table.diffstat td span.modechange { + padding-left: 1em; + color: red; +} + +div#cgit table.diffstat td.add a { + color: green; +} + +div#cgit table.diffstat td.del a { + color: red; +} + +div#cgit table.diffstat td.upd a { + color: blue; +} + +div#cgit table.diffstat td.graph { + width: 500px; + vertical-align: middle; +} + +div#cgit table.diffstat td.graph table { + border: none; +} + +div#cgit table.diffstat td.graph td { + padding: 0px; + border: 0px; + height: 7pt; +} + +div#cgit table.diffstat td.graph td.add { + background-color: #5c5; +} + +div#cgit table.diffstat td.graph td.rem { + background-color: #c55; +} + +div#cgit div.diffstat-summary { + color: #888; + padding-top: 0.5em; +} + +div#cgit table.diff { + width: 100%; +} + +div#cgit table.diff td { + font-family: monospace; + white-space: pre; +} + +div#cgit table.diff td div.head { + font-weight: bold; + margin-top: 1em; + color: black; +} + +div#cgit table.diff td div.hunk { + color: #009; +} + +div#cgit table.diff td div.add { + color: green; +} + +div#cgit table.diff td div.del { + color: red; +} + +div#cgit .sha1 { + font-family: monospace; + font-size: 90%; +} + +div#cgit .left { + text-align: left; +} + +div#cgit .right { + text-align: right; + float: none !important; + width: auto !important; + padding: 0 !important; +} + +div#cgit table.list td.reposection { + font-style: italic; + color: #888; +} + +div#cgit a.button { + font-size: 80%; + padding: 0em 0.5em; +} + +div#cgit a.primary { + font-size: 100%; +} + +div#cgit a.secondary { + font-size: 90%; +} + +div#cgit td.toplevel-repo { + +} + +div#cgit table.list td.sublevel-repo { + padding-left: 1.5em; +} + +div#cgit ul.pager { + list-style-type: none; + text-align: center; + margin: 1em 0em 0em 0em; + padding: 0; +} + +div#cgit ul.pager li { + display: inline-block; + margin: 0.25em 0.5em; +} + +div#cgit ul.pager a { + color: #777; +} + +div#cgit ul.pager .current { + font-weight: bold; +} + +div#cgit span.age-mins { + font-weight: bold; + color: #080; +} + +div#cgit span.age-hours { + color: #080; +} + +div#cgit span.age-days { + color: #040; +} + +div#cgit span.age-weeks { + color: #444; +} + +div#cgit span.age-months { + color: #888; +} + +div#cgit span.age-years { + color: #bbb; +} +div#cgit div.footer { + margin-top: 0.5em; + text-align: center; + font-size: 80%; + color: #ccc; +} +div#cgit a.branch-deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #88ff88; + border: solid 1px #007700; +} +div#cgit a.tag-deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #ffff88; + border: solid 1px #777700; +} +div#cgit a.remote-deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #ccccff; + border: solid 1px #000077; +} +div#cgit a.deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #ff8888; + border: solid 1px #770000; +} + +div#cgit div.commit-subject a.branch-deco, +div#cgit div.commit-subject a.tag-deco, +div#cgit div.commit-subject a.remote-deco, +div#cgit div.commit-subject a.deco { + margin-left: 1em; + font-size: 75%; +} + +div#cgit table.stats { + border: solid 1px black; + border-collapse: collapse; +} + +div#cgit table.stats th { + text-align: left; + padding: 1px 0.5em; + background-color: #eee; + border: solid 1px black; +} + +div#cgit table.stats td { + text-align: right; + padding: 1px 0.5em; + border: solid 1px black; +} + +div#cgit table.stats td.total { + font-weight: bold; + text-align: left; +} + +div#cgit table.stats td.sum { + color: #c00; + font-weight: bold; +/* background-color: #eee; */ +} + +div#cgit table.stats td.left { + text-align: left; +} + +div#cgit table.vgraph { + border-collapse: separate; + border: solid 1px black; + height: 200px; +} + +div#cgit table.vgraph th { + background-color: #eee; + font-weight: bold; + border: solid 1px white; + padding: 1px 0.5em; +} + +div#cgit table.vgraph td { + vertical-align: bottom; + padding: 0px 10px; +} + +div#cgit table.vgraph div.bar { + background-color: #eee; +} + +div#cgit table.hgraph { + border: solid 1px black; + width: 800px; +} + +div#cgit table.hgraph th { + background-color: #eee; + font-weight: bold; + border: solid 1px black; + padding: 1px 0.5em; +} + +div#cgit table.hgraph td { + vertical-align: middle; + padding: 2px 2px; +} + +div#cgit table.hgraph div.bar { + background-color: #eee; + height: 1em; +} + +div#cgit table.ssdiff { + width: 100%; +} + +div#cgit table.ssdiff td { + font-size: 75%; + font-family: monospace; + white-space: pre; + padding: 1px 4px 1px 4px; + border-left: solid 1px #aaa; + border-right: solid 1px #aaa; +} + +div#cgit table.ssdiff td.add { + color: black; + background: #cfc; + min-width: 50%; +} + +div#cgit table.ssdiff td.add_dark { + color: black; + background: #aca; + min-width: 50%; +} + +div#cgit table.ssdiff span.add { + background: #cfc; + font-weight: bold; +} + +div#cgit table.ssdiff td.del { + color: black; + background: #fcc; + min-width: 50%; +} + +div#cgit table.ssdiff td.del_dark { + color: black; + background: #caa; + min-width: 50%; +} + +div#cgit table.ssdiff span.del { + background: #fcc; + font-weight: bold; +} + +div#cgit table.ssdiff td.changed { + color: black; + background: #ffc; + min-width: 50%; +} + +div#cgit table.ssdiff td.changed_dark { + color: black; + background: #cca; + min-width: 50%; +} + +div#cgit table.ssdiff td.lineno { + color: black; + background: #eee; + text-align: right; + width: 3em; + min-width: 3em; +} + +div#cgit table.ssdiff td.hunk { + color: black; + background: #ccf; + border-top: solid 1px #aaa; + border-bottom: solid 1px #aaa; +} + +div#cgit table.ssdiff td.head { + border-top: solid 1px #aaa; + border-bottom: solid 1px #aaa; +} + +div#cgit table.ssdiff td.head div.head { + font-weight: bold; + color: black; +} + +div#cgit table.ssdiff td.foot { + border-top: solid 1px #aaa; + border-left: none; + border-right: none; + border-bottom: none; +} + +div#cgit table.ssdiff td.space { + border: none; +} + +div#cgit table.ssdiff td.space div { + min-height: 3em; +} + +/* + * Style definitions generated by highlight 3.14, http://www.andre-simon.de/ + * Highlighting theme: Kwrite Editor + */ +div#cgit table.blob .num { color:#b07e00; } +div#cgit table.blob .esc { color:#ff00ff; } +div#cgit table.blob .str { color:#bf0303; } +div#cgit table.blob .pps { color:#818100; } +div#cgit table.blob .slc { color:#838183; font-style:italic; } +div#cgit table.blob .com { color:#838183; font-style:italic; } +div#cgit table.blob .ppc { color:#008200; } +div#cgit table.blob .opt { color:#000000; } +div#cgit table.blob .ipl { color:#0057ae; } +div#cgit table.blob .lin { color:#555555; } +div#cgit table.blob .kwa { color:#000000; font-weight:bold; } +div#cgit table.blob .kwb { color:#0057ae; } +div#cgit table.blob .kwc { color:#000000; font-weight:bold; } +div#cgit table.blob .kwd { color:#010181; } diff --git a/web/html/index.php b/web/html/index.php index 95989f5..cc6a84c 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -141,6 +141,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { switch ($path) { case "/css/archweb.css": case "/css/aur.css": + case "/css/cgit.css": case "/css/archnavbar/archnavbar.css": header("Content-Type: text/css"); readfile("./$path"); diff --git a/web/template/cgit/footer.html b/web/template/cgit/footer.html new file mode 100644 index 0000000..dbbc2cd --- /dev/null +++ b/web/template/cgit/footer.html @@ -0,0 +1,8 @@ +<div class="foot" style="padding-left:1em;padding-right:1em;"> +<p>Copyright © 2002-2014 <a href="mailto:jvinet@zeroflux.org" +title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" +title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo +are recognized trademarks. Some rights reserved. The registered trademark +Linux© is used pursuant to a sublicense from LMI, the exclusive licensee +of Linus Torvalds, owner of the mark on a world-wide basis.</p> +</div> diff --git a/web/template/cgit/header.html b/web/template/cgit/header.html new file mode 100644 index 0000000..0605ac2 --- /dev/null +++ b/web/template/cgit/header.html @@ -0,0 +1,14 @@ + <div id="archnavbar" class="anb-aur"> + <div id="archnavbarlogo"><h1><a href="https://www.archlinux.org/" title="Return to the main page">Arch Linux</a></h1></div> + <div id="archnavbarmenu"> + <ul id="archnavbarlist"> + <li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> + <li id="anb-packages"><a href="https://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> + <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> + <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> + <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li> + <li id="anb-aur"><a href="/" title="Arch Linux User Repository">AUR</a></li> + <li id="anb-download"><a href="https://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> + </ul> + </div> + </div> -- 2.2.1

1 1