diff --git a/nsd-unbound-update.org b/nsd-unbound-update.org index 9d9f05e..f88bf16 100644 --- a/nsd-unbound-update.org +++ b/nsd-unbound-update.org @@ -8,11 +8,11 @@ upstream. git clone from the upstream repository on [[https://github.com/NLnetLabs/nsd][github]]. #+begin_src shell git pull - git diff NSD_4_3_6_REL..NSD_4_3_7_REL . ':!.cirrus.yml' ':!tpkg/*' \ - ':!contrib/*' ':!compat/' ':!README.md' ':!.gitignore' \ - ':!.buildkite/*' ':!makedist.sh' > ~/nsd_4.3.7_upstream.diff + git diff NSD_4_6_1_REL..NSD_4_7_0_REL . ':!.cirrus.yml' ':!tpkg/*' \ + ':!contrib/*' ':!compat/' ':!.gitignore' ':!doc/README.svn' + ':!.buildkite/*' ':!makedist.sh' > ~/nsd_4.7.0_upstream.diff cd /usr/src/usr.sbin/nsd - patch -Ep0 < ~/nsd_4.3.7_upstream.diff + patch -Ep0 < ~/nsd_4.7.0_upstream.diff autoheader-2.69 autoconf-2.69 make -f Makefile.bsd-wrapper obj @@ -22,7 +22,7 @@ git clone from the upstream repository on [[https://github.com/NLnetLabs/nsd][gi We also need to update the version numbers in the man pages. For that we download the release tar ball and generate a diff: #+begin_src shell - diff -ru . /home/florian/nsd-4.3.7/ | fgrep -v Only > sync.diff + diff -ru . /home/florian/nsd-4.7.0/ | fgrep -v Only > sync.diff #+end_src The diff then needs to be partially applied, some changes are intentional.