Adjust ignore list, update to newer nsd version while here.

This commit is contained in:
Florian Obser 2023-06-07 13:10:57 +02:00
parent 3f45aea85f
commit e5933409ef
1 changed files with 5 additions and 5 deletions

View File

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