add patches

diff --git a/Dockerfile b/Dockerfile
index 2eb9a1afcff038a5044082d8437e255ec8378cae..8e1adf38b869c19955120bbd709c58d52eaed679 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ COPY header.html .
 COPY footer.html .
 COPY img/ img/
 COPY css/ css/
+COPY patches/ patches/
 COPY lang/ lang/
 COPY generate.sh .
 

diff --git a/generate.sh b/generate.sh
index ad432a25a9a08740c35975b45afc3cee885effea..d92fc02c366cd429ca146b61168e30ed70487d11 100755 (executable)
--- a/generate.sh
+++ b/generate.sh
@@ -23,7 +23,7 @@ set -e
 # liste des fichiers html à générer
 langDir="lang"
 tmpHeader="/tmp/header.html"
-annexes="css img"
+annexes="css img patches"
 
 pathLinks="/home/site/a/"
 target="www"

diff --git a/lang/en/header.link b/lang/en/header.link
index 335cde0695573aa7d2ec7d8dd8186ade26a29a65..2923071075768e0e56aeeddd59561aff7fd0d9e2 100644 (file)
--- a/lang/en/header.link
+++ b/lang/en/header.link
@@ -6,6 +6,7 @@ rick's website
 where.html : where to find me
 friends.html : friends & co
 projects.html : projects
+patches.html : patches
 #a/ : annuaire
 rss.html : my rss feeds
 others.html : others

diff --git a/lang/en/patches.html b/lang/en/patches.html
new file mode 100644 (file)
index 0000000..b77b14c
--- /dev/null
+++ b/lang/en/patches.html
@@ -0,0 +1,35 @@
+%link%
+rel="stylesheet" href="/css/projets.css"
+%endlink%
+
+        <div id="main">
+            <p>You can find here a list of patches which I've written on some softwares. They are small and/or only fix some issues for me. If they are integrated or become useless (because of an update), they will be removed from this page.</p>
+
+            <div class="tableau">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Software</th>
+                            <th>Patch description</th>
+                            <th>Patch</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                            <tr>
+                                <td><a href="https://github.com/lxc/distrobuilder">distrobuilder</a></td>
+                                <td>Use <code>mkisofs</code> instead of <code>genisoimage</code>.</td>
+                                <td><a href="/patches/distrobuilder-mkisofs.patch"><code>distrobuilder-mkisofs.patch</code></a></td>
+                            </tr>
+
+                        <!--
+                            <tr>
+                                <td><a href=""></a></td>
+                                <td></td>
+                                <td><a href="/patches/"></a></td>
+                            </tr>
+                        -->
+
+                    </tbody>
+                </table>
+            </div>
+        </div>

diff --git a/lang/fr/header.link b/lang/fr/header.link
index 988565f77564eca49f17b9e11cb7f82f840a4659..66ed833ac6c4213d392dad3826a059edfcd3b404 100644 (file)
--- a/lang/fr/header.link
+++ b/lang/fr/header.link
@@ -6,6 +6,7 @@ le site de rick
 ou.html : où me retrouver
 copaings.html : copains & co
 projets.html : projets
+patches.html : patches
 #a/ : annuaire
 rss.html : mes flux rss
 autres.html : autres

diff --git a/lang/fr/patches.html b/lang/fr/patches.html
new file mode 100644 (file)
index 0000000..52498a3
--- /dev/null
+++ b/lang/fr/patches.html
@@ -0,0 +1,35 @@
+%link%
+rel="stylesheet" href="/css/projets.css"
+%endlink%
+
+        <div id="main">
+            <p>Vous pouvez retrouver ici une liste de patches que j'ai pu faire sur différents logiciels. Ils sont minimes ou ne règlent un problème qui ne concerne que moi. S'ils sont intégrés dans le logiciel ou deviennent inutiles, ils seront supprimés de cette page.</p>
+
+            <div class="tableau">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Logiciel</th>
+                            <th>Description du patch</th>
+                            <th>Patch</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                            <tr>
+                                <td><a href="https://github.com/lxc/distrobuilder">distrobuilder</a></td>
+                                <td>Utilisation de <code>mkisofs</code> au lieu de <code>genisoimage</code>.</td>
+                                <td><a href="/patches/distrobuilder-mkisofs.patch"><code>distrobuilder-mkisofs.patch</code></a></td>
+                            </tr>
+
+                        <!--
+                            <tr>
+                                <td><a href=""></a></td>
+                                <td></td>
+                                <td><a href="/patches/"></a></td>
+                            </tr>
+                        -->
+
+                    </tbody>
+                </table>
+            </div>
+        </div>

diff --git a/patches/distrobuilder-mkisofs.patch b/patches/distrobuilder-mkisofs.patch
new file mode 100644 (file)
index 0000000..8c658b0
--- /dev/null
+++ b/patches/distrobuilder-mkisofs.patch
@@ -0,0 +1,47 @@
+From 91ab435f54d1665e5f5c0497568ae7985c6b8b38 Mon Sep 17 00:00:00 2001
+From: rick <rick@gnous.eu>
+Date: Wed, 25 Oct 2023 15:49:14 +0200
+Subject: [PATCH] change genisoimage for mkisofs
+
+---
+ distrobuilder/main_repack-windows.go | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/distrobuilder/main_repack-windows.go b/distrobuilder/main_repack-windows.go
+index 76735f2..cbeae34 100644
+--- a/distrobuilder/main_repack-windows.go
++++ b/distrobuilder/main_repack-windows.go
+@@ -327,17 +327,17 @@ func (c *cmdRepackWindows) run(cmd *cobra.Command, args []string, overlayDir str
+       logger.Info("Generating new ISO")
+       var stdout strings.Builder
+ 
+-      err = shared.RunCommand(c.global.ctx, nil, &stdout, "genisoimage", "--version")
++      err = shared.RunCommand(c.global.ctx, nil, &stdout, "mkisofs", "--version")
+       if err != nil {
+-              return fmt.Errorf("Failed to determine version of genisoimage: %w", err)
++              return fmt.Errorf("Failed to determine version of mkisofs: %w", err)
+       }
+ 
+       version := strings.Split(stdout.String(), "\n")[0]
+ 
+       if strings.HasPrefix(version, "mkisofs") {
+-              err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
++              err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+       } else {
+-              err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "--allow-limited-size", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
++              err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+       }
+ 
+       if err != nil {
+@@ -413,7 +413,7 @@ func (c *cmdRepackWindows) modifyWim(path string, index int) error {
+ }
+ 
+ func (c *cmdRepackWindows) checkDependencies() error {
+-      dependencies := []string{"genisoimage", "hivexregedit", "rsync", "wimlib-imagex"}
++      dependencies := []string{"mkisofs", "hivexregedit", "rsync", "wimlib-imagex"}
+ 
+       for _, dep := range dependencies {
+               _, err := exec.LookPath(dep)
+-- 
+2.42.0
+