Merge branch 'upstream'

Link to the package's issue tracker on gitlab.archlinux.org instead of
the old bug tracker.

.github/workflows/build-docker.yml

@@ -37,15 +37,15 @@ jobs:
     - name: Set up docker
       run: curl -fsSL https://get.docker.com | sh
     - name: Set up QEMU
-      uses: https://github.com/docker/setup-qemu-action@v2
+      uses: https://github.com/docker/setup-qemu-action@v3
     - name: Set up Docker Buildx
       id: buildx
-      uses: https://github.com/docker/setup-buildx-action@v2
+      uses: https://github.com/docker/setup-buildx-action@v3
       with:
         install: true
 
     - name: Log in to the Container registry
-      uses: https://github.com/docker/login-action@v2
+      uses: https://github.com/docker/login-action@v3
       if: startsWith(gitea.ref, 'refs/tags/v')
       with:
         registry: ${{ env.REGISTRY }}
@@ -53,7 +53,7 @@ jobs:
         password: ${{ secrets.PAT }}
 
     - name: Log in to the Docker Hub
-      uses: https://github.com/docker/login-action@v2
+      uses: https://github.com/docker/login-action@v3
       if: startsWith(gitea.ref, 'refs/tags/v')
       with:
         registry: ${{ env.DH_REGISTRY }}
@@ -94,7 +94,7 @@ jobs:
     
     - name: Build and push release Docker image
       if: startsWith(gitea.ref, 'refs/tags/v')
-      uses: https://github.com/docker/build-push-action@v4
+      uses: https://github.com/docker/build-push-action@v5
       with:
         file: Dockerfile
         target: deploy
@@ -106,7 +106,7 @@ jobs:
 
     - name: Build develop Docker image
       if: "!startsWith(gitea.ref, 'refs/tags/v')"
-      uses: https://github.com/docker/build-push-action@v4
+      uses: https://github.com/docker/build-push-action@v5
       with:
         file: Dockerfile
         target: deploy

docker-compose.yml

@@ -10,6 +10,7 @@ version: '2'
 # docker compose run --rm packages_web python manage.py generate_keyring pgp.surfnet.nl ./config/keyring
 # docker compose run --rm packages_web python manage.py pgp_import ./config/keyring
 ## go to /admin/devel/developerkey/ and set the owner (and parent) for the ownerless key
+## go to /admin/sites/site/1/change/ and set the domain
 
 
 services:

packages/views/__init__.py

@@ -21,7 +21,7 @@ from ..utils import get_wrong_permissions, multilib_differences
 @require_safe
 @cache_control(public=True, max_age=86400)
 def opensearch(request):
-    domain = "%s://%s" % (request.scheme, request.META.get('HTTP_HOST'))
+    domain = "%s://%s" % ('https', request.META.get('HTTP_HOST'))
 
     return render(request, 'packages/opensearch.xml',
                   {'domain': domain},

releng/urls.py

@@ -1,5 +1,6 @@
 from django.conf.urls import include
 from django.urls import path, re_path
+from django.views.decorators.cache import cache_page
 
 from releng import views
 
@@ -8,8 +9,8 @@ from .views import ReleaseDetailView, ReleaseListView
 releases_patterns = [
     path('', ReleaseListView.as_view(), name='releng-release-list'),
     path('json/', views.releases_json, name='releng-release-list-json'),
-    re_path(r'^(?P<version>[-.\w]+)/$', ReleaseDetailView.as_view(), name='releng-release-detail'),
+    re_path(r'^(?P<version>[-.\w]+)/$', cache_page(311)(ReleaseDetailView.as_view()), name='releng-release-detail'),
-    re_path(r'^(?P<version>[-.\w]+)/torrent/$', views.release_torrent, name='releng-release-torrent'),
+    re_path(r'^(?P<version>[-.\w]+)/torrent/$', cache_page(311)(views.release_torrent), name='releng-release-torrent'),
 ]
 
 netboot_patterns = [

requirements.txt

@@ -1,5 +1,5 @@
 -e git+https://github.com/fredj/cssmin.git@master#egg=cssmin
-Django==5.0.7
+Django==5.0.8
 IPy==1.1
 Markdown==3.3.7
 bencode.py==4.0.0

sitestatic/archweb.css

@@ -1197,3 +1197,24 @@ ul.signoff-list {
 .pgp-key-ids {
     display: inline-block;
 }
+
+.logout-form {
+    display: inline-block;
+
+    /* style input as a normal anchor */
+    input {
+      background: none!important;
+      border: none;
+      padding: 0!important;
+      /*optional*/
+      font-family: arial, sans-serif;
+      font-size: 0.9em;
+      /*input has OS specific font-family*/
+      color: #07b;
+    }
+
+    input:hover {
+        text-decoration: underline;
+        cursor: pointer;
+    }
+}

sitestatic/artixweb.css

@@ -1,7 +1,17 @@
 html body {
     min-width: 100px;
-    background: #1a1a1a;
+}
-    color: #d9d9d9;
+
+a:link,
+a:visited,
+th a:visited {
+    color: #0a6682;
+}
+
+a:hover,
+a:focus,
+a:visited:hover {
+    color: #1696bd;
 }
 
 #archnavbarlogo {
@@ -10,45 +20,9 @@ html body {
 }
 
 #archnavbar#archnavbar {
-
     border-bottom: 5px #0a6682 solid !important;
 }
 
-a:link,
-a:visited,
-th a:visited {
-    color: #53bffc;
-}
-
-a:hover,
-a:focus,
-a:visited:hover {
-    color: #92D7FC;
-}
-
-#pkgdetails #pkginfo .recent {
-    color: #B39DDB;
-}
-
-div.box.box {
-    background-color: #2a2a2a;
-    border: 1px solid #858585;
-}
-
-table th.tablesorter-header {
-    background-image: url(data:image/gif;base64,R0lGODlhFQAJAPABAOTu/wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAgABACwAAAAAFQAJAAACF4yPgMsJ2mJ4VDKKrd4GVz5lYPeMiVUAADs=);
-}
-
-table thead th.tablesorter-headerAsc {
-    background-color: #173f59;
-    background-image: url(data:image/gif;base64,R0lGODlhFQAEAPABAOTu/wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAgABACwAAAAAFQAEAAACDYyPAcmtsJyDVDKKWQEAOw==);
-}
-
-table thead th.tablesorter-headerDesc {
-    background-color: #173f59;
-    background-image: url(data:image/gif;base64,R0lGODlhFQAEAPABAOTu/wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAgABACwAAAAAFQAEAAACDYwfoAvoz9qbZ9FrJC0AOw==);
-}
-
 th,
 td {
     white-space: initial;
@@ -60,54 +34,26 @@ table.results.results {
 
 .results.results td,
 .results.results th {
-    border: 1px solid #858585;
     text-align: left;
     overflow-x: auto;
     overflow-wrap: anywhere;
     padding: 8px;
 }
 
-.results.results tr:nth-child(2n+1) {
-    background-color: #1a1a1a;
-}
-
-.results.results tr:nth-child(even) {
-    background-color: #111;
-}
-
 .results th {
-    color: #fff;
-    background-color: #0f3147;
-    border: 1px solid #0A6682;
     white-space: nowrap;
 }
 
-#pkglist-results .results tr:hover {
-    background: #0d0d0d;
-}
-
-#pkgdetails #detailslinks>div {
-    background-color: rgba(255, 255, 255, 0.1);
-}
-
 input,
 select {
     vertical-align: middle;
-    background: #1a1a1a;
-    color: #bbb;
-    border: 1px solid #858585;
     border-radius: 4px;
+    border: 1px solid #858585;
     padding: .25em;
     max-width: 85vw;
     max-width: calc(92vw - 16px);
 }
 
-select option:checked {
-    background: linear-gradient(#0A6682, #0A6682);
-    background-color: #0A6682;
-    color: #fff;
-}
-
 #pkglist-results-form {
     overflow-x: auto;
 }
@@ -116,10 +62,6 @@ tr :nth-child(7) {
     display: none;
 }
 
-#pkgfilelist li.d {
-    color: #92929a;
-}
-
 @media screen and (max-width: 750px) {
     tr :nth-child(5) {
         display: none;
@@ -160,4 +102,89 @@ tr :nth-child(7) {
         float: none;
         width: initial;
     }
+}
+
+@media not all and (prefers-color-scheme: light) {
+    html body {
+        background: #1a1a1a;
+        color: #d9d9d9;
+    }
+
+    a:link,
+    a:visited,
+    th a:visited {
+        color: #53bffc;
+    }
+
+    a:hover,
+    a:focus,
+    a:visited:hover {
+        color: #92D7FC;
+    }
+
+    #pkgdetails #pkginfo .recent {
+        color: #B39DDB;
+    }
+
+    div.box.box {
+        background-color: #2a2a2a;
+        border: 1px solid #858585;
+    }
+
+    table th.tablesorter-header {
+        background-image: url(data:image/gif;base64,R0lGODlhFQAJAPABAOTu/wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAgABACwAAAAAFQAJAAACF4yPgMsJ2mJ4VDKKrd4GVz5lYPeMiVUAADs=);
+    }
+
+    table thead th.tablesorter-headerAsc {
+        background-color: #173f59;
+        background-image: url(data:image/gif;base64,R0lGODlhFQAEAPABAOTu/wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAgABACwAAAAAFQAEAAACDYyPAcmtsJyDVDKKWQEAOw==);
+    }
+
+    table thead th.tablesorter-headerDesc {
+        background-color: #173f59;
+        background-image: url(data:image/gif;base64,R0lGODlhFQAEAPABAOTu/wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFAgABACwAAAAAFQAEAAACDYwfoAvoz9qbZ9FrJC0AOw==);
+    }
+
+    .results.results td,
+    .results.results th {
+        border: 1px solid #858585;
+    }
+
+    .results.results tr:nth-child(2n+1) {
+        background-color: #1a1a1a;
+    }
+
+    .results.results tr:nth-child(even) {
+        background-color: #111;
+    }
+
+    .results th {
+        color: #fff;
+        background-color: #0f3147;
+        border: 1px solid #0A6682;
+    }
+
+    #pkglist-results .results tr:hover {
+        background: #0d0d0d;
+    }
+
+    #pkgdetails #detailslinks>div {
+        background-color: rgba(255, 255, 255, 0.1);
+    }
+
+    input,
+    select {
+        background: #1a1a1a;
+        color: #bbb;
+    }
+
+    select option:checked {
+        background: linear-gradient(#0A6682, #0A6682);
+        background-color: #0A6682;
+        color: #fff;
+    }
+
+    #pkgfilelist li.d {
+        color: #92929a;
+    }
 }

templates/base.html

@@ -59,7 +59,11 @@
                     {% if user|in_groups:'Developers:Package Maintainers:Support Staff' %}
                     <li><a href="/devel/tier0mirror/" title="Your Tier 0 Mirror information">Tier0 mirror</a></li>
                     {% endif %}
-                    <li><a href="/logout/" title="Logout of the developer interface">Logout</a></li>
+                    <li>
+                        <form class="logout-form" method="post" action="/logout/">{% csrf_token %}
+                            <input type="submit" title="Logout of the developer interface" value="Logout"/>
+                        </form>
+                    </li>
                 </ul>
             {% endif %}
         </div>

templates/packages/details.html

@@ -85,6 +85,9 @@ function collapseDependsList(list) {
     // enough items, or the link already exists.
     const limit = 20;
     const elem = document.querySelector(list);
+    if (!elem)
+	return;
+
     const linkid = elem.getAttribute('id') + 'link';
     const items = Array.from(elem.querySelectorAll('li')).slice(limit);
 

templates/packages/flag.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load package_extras %}
 {% load humanize %}
+{% load details_link %}
 
 {% block title %}Arch Linux - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
 {% block head %}<meta name="robots" content="noindex"/>{% endblock %}
@@ -29,9 +30,9 @@
     with your additional text.</p>
 
     <p><strong>Note:</strong> Do <em>not</em> use this facility if the
-    package is broken! The package will be unflagged and the report will be ignored!
+    package is broken! The package will be unflagged and the report will be ignored! File an issue on
-    <a href="https://bugs.archlinux.org/" title="Arch Linux Bugtracker">Use the
+    <a href="{% bugs_list package %}" title="Bug tickets for {{ package }}">the package's GitLab repository</a>
-    bugtracker to file a bug</a> instead.</p>
+    instead.</p>
 
     <p>Please confirm your flag request for {{package.pkgname}}:</p>
 

templates/packages/opensearch.xml

@@ -1,9 +1,9 @@
 {% load static %}<?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Arch Packages</ShortName>
+	<ShortName>Artix Packages</ShortName>
-	<LongName>Arch Linux Package Repository Search</LongName>
+	<LongName>Artix Linux Package Repository Search</LongName>
-	<Description>Search the Arch Linux package repositories by keyword in package names and descriptions.</Description>
+	<Description>Search the Artix Linux package repositories by keyword in package names and descriptions.</Description>
-	<Tags>linux archlinux package software</Tags>
+	<Tags>linux artixlinux package software</Tags>
 	<Image height="16" width="16" type="image/png">{{ domain }}{% static "favicon.png" %}</Image>
 	<Image height="64" width="64" type="image/png">{{ domain }}{% static "logos/icon-transparent-64x64.png" %}</Image>
 	<Language>en-us</Language>

templates/packages/package_details.html

@@ -123,7 +123,7 @@
             <th>Description:</th>
             <td class="wrap" itemprop="description">{{ pkg.pkgdesc|default:"" }}</td>
         </tr><tr>
-            <th>Upstream URL:</th>
+            <th>Homepage:</th>
             <td>{% if pkg.url %}<a itemprop="url" href="{{ pkg.url }}"
                     title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url|url_unquote }}</a>{% endif %}</td>
         </tr><tr>

templates/public/download.html

@@ -25,6 +25,8 @@
     It is intended for new installations only; an existing Arch Linux system
     can always be updated with <code>pacman -Syu</code>.</p>
 
+    <p>Images for installing Arch can be downloaded via <a href="#bittorrent-download">BitTorrent</a> or right here in your browser from one of the <a href="#http-downloads">Arch HTTP(S) mirrors down below</a>.</p>
+
     <ul>
         {% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %}
         {% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %}
@@ -52,7 +54,7 @@
     to update your existing system. You may be looking for
     <a href="{% url 'mirrorlist' %}">an updated mirrorlist</a> instead.</p>
 
-    <h3>BitTorrent Download (recommended)</h3>
+    <h3 id="bittorrent-download">BitTorrent Download (recommended)</h3>
 
     <p>If you can spare the bytes, please leave the client open after your
     download is finished, so you can seed it back to others.
@@ -91,10 +93,10 @@
 
     <p>Official virtual machine images are available for download on our <a href="https://gitlab.archlinux.org/archlinux/arch-boxes/-/packages">GitLab instance</a>, more information is available in the <a href="https://gitlab.archlinux.org/archlinux/arch-boxes/">README</a>.</p>
 
-    <h3>HTTP Direct Downloads</h3>
+    <h3 id="http-downloads">HTTP Direct Downloads</h3>
 
     <p>In addition to the BitTorrent links above, install images can also be
-    downloaded via HTTP from the mirror sites listed below. Please
+    downloaded via HTTP from the <a href="#download-mirrors">mirror sites listed below</a>. Please
     ensure the download image matches the checksum from the <code>sha256sums.txt</code> or <code>b2sums.txt</code> file linked below.</p>
 
     <h4 id="checksums">Checksums and signatures</h4>

templates/public/index.html

@@ -203,7 +203,7 @@
     </a>
 
     <a href="https://www.privateinternetaccess.com/" title="Private Internet Access">
-        <img src="{% static "pia_button.png" %}"
+        <img src="{% static "pia_logo.png" %}"
             title="" alt="Private Internet Access logo"/>
     </a>