[Dnsmasq-discuss] Picking up the patches

[Geert Stappers]

For what it is worth,
another attempt for picking up the patches.


At https://lists.sr.ht/~stappers/dnsmasqmlpc/patches?search=status%3Aproposed
are currently six patches.

One of those six is "Removed empty trailing lines"
( https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q4/017819.html
also https://lists.sr.ht/~stappers/dnsmasqmlpc/patches/55894 ). That
patch was not checked for "does it still apply cleanly?".

The other 5 were. 3 applied cleanly, 1 needed minor editing.
The fifth didn't fit `git am`.


The gory details:

stappers at paddy:~/src/mlpc
$ git clone http://thekelleys.org.uk/git/dnsmasq.git 
Cloning into 'dnsmasq'...
warning: redirecting to https://thekelleys.org.uk/git/dnsmasq.git/
remote: Enumerating objects: 14070, done.
remote: Counting objects: 100% (14070/14070), done.
remote: Compressing objects: 100% (4412/4412), done.
remote: Total 14070 (delta 10682), reused 12649 (delta 9588)
Receiving objects: 100% (14070/14070), 4.67 MiB | 893.00 KiB/s, done.
Resolving deltas: 100% (10682/10682), done.
stappers at paddy:~/src/mlpc
$ cd dnsmasq/
stappers at paddy:~/src/mlpc/dnsmasq
$ git switch --create january2025
Switched to a new branch 'january2025'
stappers at paddy:~/src/mlpc/dnsmasq
$ curl -s https://lists.sr.ht/~stappers/dnsmasqmlpc/patches/50265/mbox | git am -3
Applying: Quieten DHCPv6 log when in static mode.
stappers at paddy:~/src/mlpc/dnsmasq
$ curl -s https://lists.sr.ht/~stappers/dnsmasqmlpc/patches/53348/mbox | git am -3
Applying: Add support for --dhcp-allowed-srvids option.
Using index info to reconstruct a base tree...
M	man/dnsmasq.8
M	src/dnsmasq.h
M	src/option.c
M	src/rfc2131.c
Falling back to patching base and 3-way merge...
Auto-merging src/rfc2131.c
Auto-merging src/option.c
CONFLICT (content): Merge conflict in src/option.c
Auto-merging src/dnsmasq.h
Auto-merging man/dnsmasq.8
error: Failed to merge in the changes.
Patch failed at 0001 Add support for --dhcp-allowed-srvids option.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
stappers at paddy:~/src/mlpc/dnsmasq
$ git status
On branch silent
You are in the middle of an am session.
  (fix conflicts and then run "git am --continue")
  (use "git am --skip" to skip this patch)
  (use "git am --abort" to restore the original branch)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	modified:   man/dnsmasq.8
	modified:   src/dnsmasq.h
	modified:   src/rfc2131.c

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
	both modified:   src/option.c

stappers at paddy:~/src/mlpc/dnsmasq
$ git diff src/option.c
diff --cc src/option.c
index 8fd7b41,eafcf54..0000000
--- a/src/option.c
+++ b/src/option.c
@@@ -192,7 -192,7 +192,11 @@@ struct myoption 
  #define LOPT_NO_DHCP4      383
  #define LOPT_MAX_PROCS     384
  #define LOPT_DNSSEC_LIMITS 385
++<<<<<<< HEAD
 +#define LOPT_PXE_OPT       386
++=======
+ #define LOPT_DHCP_AL_SVID  386
++>>>>>>> Add support for --dhcp-allowed-srvids option.
  
  #ifdef HAVE_GETOPT_LONG
  static const struct option opts[] =  
stappers at paddy:~/src/mlpc/dnsmasq
$ vi +195 src/option.c
stappers at paddy:~/src/mlpc/dnsmasq
$ git add src/option.c
stappers at paddy:~/src/mlpc/dnsmasq
$ git am --continue
Applying: Add support for --dhcp-allowed-srvids option.
stappers at paddy:~/src/mlpc/dnsmasq
$ curl -s https://lists.sr.ht/~stappers/dnsmasqmlpc/patches/55346/mbox | git am -3
Applying: dhcp.c: Updated comment lines
stappers at paddy:~/src/mlpc/dnsmasq
$ curl -s https://lists.sr.ht/~stappers/dnsmasqmlpc/patches/56840/mbox | git am -3
Applying: Clean up some of the man page formatting.
stappers at paddy:~/src/mlpc/dnsmasq
$ curl -s https://lists.sr.ht/~stappers/dnsmasqmlpc/patches/56898/mbox | git am -3
Applying: Improve "no upstream servers configured" when D-Bus is enabled
error: sha1 information is lacking or useless (src/dnsmasq.c).
error: could not build fake ancestor
Patch failed at 0001 Improve "no upstream servers configured" when D-Bus is enabled
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
stappers at paddy:~/src/mlpc/dnsmasq
$


Time will tell how many further reminders on these patches follow.


Groeten
Geert Stappers
-- 
Silence is hard to parse