mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 14:35:26 +00:00
Remove idnkit-1.0 copy from BIND sources
This commit is contained in:
@@ -133,80 +133,6 @@ release.
|
||||
|
||||
find lib -name '*.h' -print | xargs perl util/check-includes.pl
|
||||
|
||||
- Ensure that the JPNIC patch applies cleanly (9.2 and 9.3):
|
||||
|
||||
If you don't have the "iconv" library, you need to get it from
|
||||
http://clisp.cons.org/~haible/packages-libiconv.html and install it.
|
||||
|
||||
If you're reading this part of these instructions in order to generate
|
||||
a version of the patch for a new release, you'll need to pick a
|
||||
version of the patch from some prior release to use as a starting
|
||||
point. In general, the patch corresponding to the most recent
|
||||
prior release will be the best starting point.
|
||||
|
||||
$ patch -p0 < contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.x.y-patch \
|
||||
> patch.out 2>&1
|
||||
$ egrep Hunk patch.out
|
||||
|
||||
All hunks should have applied successfully with no offset or fuzz.
|
||||
If all succeeded but some were offset or had fuzz, the patch will be
|
||||
regenerated at the end of this stage.
|
||||
|
||||
Note that two of the files which the patch attempts to update
|
||||
(configure and config.h.in) are generated automatically. When
|
||||
generating a new patch, the old version of the patch may not apply
|
||||
correctly to these files, but that's ok so long as the patch does
|
||||
apply correctly to the source files from which these files are
|
||||
generated. The steps below will regenerate these files.
|
||||
|
||||
$ cd contrib/idn/idnkit-1.0-src
|
||||
|
||||
[ Sample on netbsd ... ]
|
||||
$ CFLAGS=-I/usr/local/include ./configure '--with-iconv=-L/usr/local/lib -liconv'
|
||||
|
||||
[ Sample on freebsd -- formerly used giconv, now uses iconv ]
|
||||
./configure --with-iconv-include=/usr/local/include \
|
||||
'--with-iconv=-L/usr/local/lib -liconv'
|
||||
|
||||
$ make
|
||||
$ cd ../../.. ; : cd back to top level
|
||||
$ autoheader ; : regenerate config.h.in
|
||||
$ autoconf ; : regenerate configure
|
||||
$ ./configure
|
||||
$ make
|
||||
... should cleanly compile
|
||||
$ (cd bin/dig ; rm host.1 dig.1 ; make host.1 dig.1 ; cvs update host.1 dig.1 )
|
||||
$ make distclean
|
||||
$ rm -rf /tmp/idn
|
||||
$ mkdir -p /tmp/idn/lib /tmp/idn/include
|
||||
$ idn=contrib/idn/idnkit-1.0-src
|
||||
$ cp $idn/lib/.libs/libidnkit.so* /tmp/idn/lib
|
||||
$ cp -r $idn/include/mdn $idn/include/idn /tmp/idn/include
|
||||
$ ./configure --with-idn=/tmp/idn --with-iconv="-L/usr/local/lib -liconv"
|
||||
$ LD_LIBRARY_PATH=/usr/local/lib:/tmp/idn/lib:/usr/lib make
|
||||
... should cleanly compile
|
||||
|
||||
[ Some tests will be added to bin/tests/system to validate operation. ]
|
||||
|
||||
Generate a fresh copy of the diffs:
|
||||
|
||||
$ patchd=$idn/patch/bind9
|
||||
$ old_patch=bind-9.x.y-patch
|
||||
$ new_patch=bind-9.x.z-patch
|
||||
$ files=`awk '/^Index:/ && NF == 2 {print $2}' $patchd/$old_patch`
|
||||
$ missing=`cvs status $files | awk '/Status: Unknown/ { print $2; }'`
|
||||
$ sed '/^Index:/,$d' $patchd/$old_patch > $patchd/$new_patch
|
||||
$ for i in $missing; \
|
||||
do echo Index: $i; diff -u /dev/null $i; done >> $patchd/$new_patch
|
||||
$ cvs -f diff -U 2 -N $files >> $patchd/$new_patch
|
||||
|
||||
$ cvs add -ko $patchd/$new_patch
|
||||
$ cvs ci $patchd/$new_patch
|
||||
|
||||
$ cvs update -C
|
||||
$ rm README.idnkit
|
||||
$ make distclean
|
||||
|
||||
- Add a marker line like " --- 9.0.0rc10 released ---"
|
||||
to the CHANGES file.
|
||||
|
||||
|
Reference in New Issue
Block a user