diff options
author | Phil Sutter <phil@nwl.cc> | 2015-07-26 01:34:53 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-26 10:36:35 +0200 |
commit | e8a2e04315d138863b743ff3f51af167cbcdae37 (patch) | |
tree | 0a2f15efdac735cf0b284e3ee440e967219a2fb9 /package/maradns | |
parent | 6533c46eac76c4c7f48db9b66cc891bae7204d00 (diff) |
package/maradns: update to version 2.0.09
Additionally:
- Also minimize necessary patching. Still a bit hacky, but a lot less
intrusive at least.
- Allow enabling IPv6 support.
- Make sure /etc/maradns/logger exists, necessary for chroot operation
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'package/maradns')
23 files changed, 147 insertions, 1147 deletions
diff --git a/package/maradns/Makefile b/package/maradns/Makefile index 221341df1..524112900 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -4,17 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= maradns -PKG_VERSION:= 1.4.05 +PKG_VERSION:= 2.0.09 PKG_RELEASE:= 1 -PKG_HASH:= d23ca1301dfff220beed8847466785c077e94bed931cf81668c3a23ae461a680 +PKG_HASH:= e1ee80836f0fbc47b9b94ec839e112ea19c40bed0b70d672d231849a4dea1083 PKG_DESCR:= small and secure DNS server PKG_SECTION:= net/dns -PKG_DEPENDS:= libpthread +PKG_DEPENDS:= libpthread librt PKG_URL:= http://www.maradns.org -PKG_SITES:= http://www.maradns.org/download/1.4/${PKG_VERSION}/ +PKG_SITES:= http://maradns.samiam.org/download/2.0/${PKG_VERSION}/ PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +PKG_FLAVOURS_MARADNS:= WITH_IPV6 +PKGFD_WITH_IPV6:= enable IPv6 support include ${ADK_TOPDIR}/mk/package.mk @@ -24,14 +27,19 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= PREFIX="${WRKINST}/usr" \ RPM_BUILD_ROOT="${WRKINST}" +CONFIGURE_ARGS:= +ifneq (${ADK_PACKAGE_MARADNS_WITH_IPV6},) +CONFIGURE_ARGS+= --ipv6 +endif + pre-install: @mkdir -p ${WRKINST}/usr/{sbin,bin,man/man{1,5,8}} do-configure: - (cd ${WRKBUILD} && ./configure); + (cd ${WRKBUILD} && ./configure ${CONFIGURE_ARGS}); maradns-install: - ${INSTALL_DIR} ${IDIR_MARADNS}/etc/maradns + ${INSTALL_DIR} ${IDIR_MARADNS}/etc/maradns/logger ${INSTALL_DIR} ${IDIR_MARADNS}/usr/bin ${IDIR_MARADNS}/usr/sbin ${INSTALL_DATA} ./files/mararc ${IDIR_MARADNS}/etc/mararc ${INSTALL_DATA} ./files/sample.{zone,ptr} \ diff --git a/package/maradns/files/maradns.init b/package/maradns/files/maradns.init index 422728165..9b0e3b900 100644 --- a/package/maradns/files/maradns.init +++ b/package/maradns/files/maradns.init @@ -13,7 +13,7 @@ autostart) ;; start) [ -f /etc/mararc ] || exit - [ -d /etc/maradns ] || mkdir /etc/maradns + [ -d /etc/maradns/logger ] || mkdir -p /etc/maradns/logger /usr/sbin/maradns & ;; stop) diff --git a/package/maradns/patches/cross-compile-fix.patch b/package/maradns/patches/cross-compile-fix.patch deleted file mode 100644 index 384cd6936..000000000 --- a/package/maradns/patches/cross-compile-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urN maradns-1.0.26.old/rng/Makefile maradns-1.0.26.dev/rng/Makefile ---- maradns-1.4.05.orig/rng/Makefile 2006-01-02 17:59:33.000000000 +0100 -+++ maradns-1.4.05/rng/Makefile 2011-01-21 16:47:29.318658272 +0100 -@@ -19,13 +19,13 @@ superclean: - rm -f $(ROBJECTS) core make_32bit_tables $(TABLES) - - rng-alg-fst.o: rng-alg-fst.c rng-alg-fst.h $(TABLES) -- $(CC) -c $(FLAGS) -o rng-alg-fst.o rng-alg-fst.c -+ $(CC) -c $(CFLAGS) -o rng-alg-fst.o rng-alg-fst.c - - rng-api-fst.o: rng-alg-fst.o rng-api-fst.h -- $(CC) -c $(FLAGS) -o rng-api-fst.o rng-api-fst.c -+ $(CC) -c $(CFLAGS) -o rng-api-fst.o rng-api-fst.c - - make_32bit_tables: make_32bit_tables.c -- $(CC) -o make_32bit_tables make_32bit_tables.c -+ $(CC_FOR_BUILD) -o make_32bit_tables make_32bit_tables.c - - rng-32bit-tables.h: make_32bit_tables - ./make_32bit_tables > rng-32bit-tables.h diff --git a/package/maradns/patches/patch-Makefile b/package/maradns/patches/patch-Makefile deleted file mode 100644 index c06bf9a64..000000000 --- a/package/maradns/patches/patch-Makefile +++ /dev/null @@ -1,94 +0,0 @@ ---- maradns-1.4.05.orig/Makefile 2006-01-02 17:59:33.000000000 +0100 -+++ maradns-1.4.05/Makefile 2011-01-21 16:48:06.124913980 +0100 -@@ -1,15 +1,82 @@ --# This is a wrapper that runs "./configure ; make" --all: -- ./compile.sh -+VERSION=1.4.05 -+COMPILED="Linux system at Fri Jan 21 16:48:06 CET 2011" -+COMPILED_DEBUG="Linux system at Fri Jan 21 16:48:06 CET 2011 (Debug)" -+# Server objects -+SOBJECTS=server/MaraBigHash.o -+# js_string library (buffer overflow resistant string library) objects -+JOBJS=libs/JsStr.o libs/JsStrOS.o libs/JsStrCP.o -+# MaraHash (assosciative array) library objects -+MHOBJS=libs/MaraHash.o -+# Parser objects -+POBJECTS=parse/ParseMaraRc.o parse/ParseCsv1.o ../parse/ParseIpAcl.o -+# DNS query processing library objects -+DOBJECTS=dns/Queries.o dns/Compress.o dns/bobbit.o -+# Secure random number generator objects -+ROBJECTS=rng/rng-api-fst.o rng/rng-alg-fst.o -+OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS) -+EXECS=server/maradns - --debug: -- ./configure ; make debug -+# Uncomment the following three lines to get this to compile on Solaris -+# LDFLAGS=-lxnet -+# CC=gcc $(LDFLAGS) -DSELECT_PROBLEM -+# M="CC=$(CC)" -+# These are currently unused, but will be needed again if we use flock() again -+# CFLAGS=-I/usr/ucbinclude -+# L="CC=$(CC) $(CFLAGS)" -+# LDFLAGS=-L/usr/ucblib -lucb -lxnet -+# end the Solaris section -+# Non-Solaris version of "M" -+VER="VERSION=$(VERSION)" -+Q="DEFINES=-DSELECT_PROBLEM" -+ -+# Debug -+ -+CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM -+M="CC=$(CC)" -+D="CC=$(CC) -DDEBUG -DTHREADS" -+#FLAGS = -g -+ -+all: -+ cd libs ; make $(M) ; cd ../dns ; make $(M) ; \ -+ cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \ -+ cd ../qual ; make $(M) ; cd ../server ; \ -+ make $(M) $(VER) COMPILED=\"$(COMPILED)\" ; \ -+ cd ../tools ; make $(M) ; \ -+ cd ../tcp ; make $(M) $(VER) -+ -+debug: -+ cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \ -+ cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \ -+ cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \ -+ cd ../server ; \ -+ make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ -+ cd ../tools ; make $(D) ; \ -+ cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST - - clean: -- ./configure ; make clean -+ rm -f $(OBJECTS) core $(EXECS) ; \ -+ cp build/Makefile.w Makefile ; cd dns ; make clean ; \ -+ cd ../libs ; make clean ; cd ../parse ; make clean ; \ -+ cd ../qual ; make clean ; \ -+ cd ../server ; make clean ; \ -+ cp Makefile.recursive Makefile ; \ -+ cd ../test ; make clean ; \ -+ cd ../tools ; make clean ; \ -+ cd misc ; make clean ; \ -+ cd ../../utf8 ; make clean ; \ -+ cd ../tcp ; make clean ; \ -+ cd ../rng ; make clean ; \ -+ cd ../sqa ; make clean ; \ -+ # ; cd .. ; find . -type d | grep .deps | xargs rm -fr ; find . -name '*.o' | xargs rm - --uninstall: -- ./configure ; make uninstall -+strip: -+ cd server; strip maradns ; cd ../tcp ; \ -+ strip zoneserver getzone fetchzone ; \ -+ cd ../tools ; strip askmara - - install: -- echo Please compile MaraDNS first -+ VERSION=$(VERSION) ./build/install.sh -+ -+uninstall: -+ VERSION=$(VERSION) ./build/uninstall.sh -+ diff --git a/package/maradns/patches/patch-build_Makefile_linux b/package/maradns/patches/patch-build_Makefile_linux index 44b68b5a4..106efd2dd 100644 --- a/package/maradns/patches/patch-build_Makefile_linux +++ b/package/maradns/patches/patch-build_Makefile_linux @@ -1,6 +1,12 @@ ---- maradns-1.4.05.orig/build/Makefile.linux 2006-11-24 12:44:29.000000000 +0100 -+++ maradns-1.4.05/build/Makefile.linux 2011-01-21 16:36:23.968658279 +0100 -@@ -23,23 +23,23 @@ EXECS=server/maradns + - pass CFLAGS to compiler + - pass $(M) when compiling deadwood, no idea why that is missing originally + - do not pass $(M) when compiling in tcp/, as that would cause problems with + the implicit rules in there instead, pass CFLAGS explicitly otherwise + they're lost for some reason + - do not use V as variable name, conflicts with one from OpenADK +--- maradns-2.0.09.orig/build/Makefile.linux 2010-08-31 05:56:38.000000000 +0200 ++++ maradns-2.0.09/build/Makefile.linux 2014-06-19 03:16:54.570689574 +0200 +@@ -23,33 +23,33 @@ EXECS=server/maradns # LDFLAGS=-L/usr/ucblib -lucb -lxnet # end the Solaris section # Non-Solaris version of "M" @@ -10,12 +16,11 @@ # Debug --FLAGS = -O2 -Wall -DSELECT_PROBLEM + FLAGS = -O2 -Wall -DSELECT_PROBLEM -M="CC=$(CC) $(FLAGS)" -D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS" -+CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM -+M="CC=$(CC)" -+D="CC=$(CC) -DDEBUG -DTHREADS" ++M="CC=$(CC) $(CFLAGS) $(FLAGS)" ++D="CC=$(CC) $(CFLAGS) $(FLAGS) -DDEBUG -DTHREADS" #FLAGS = -g all: @@ -25,8 +30,21 @@ - make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ + make $(M) $(VER) COMPILED=\"$(COMPILED)\" ; \ cd ../tools ; make $(M) ; \ -- cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST -+ cd ../tcp ; make $(M) $(VER) +- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ +- cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST ++ cd ../deadwood-*/src/ ; make FLAGS=-O2 $(M) ; \ ++ cd ../../tcp ; make CFLAGS="$(CFLAGS)" $(VER) ; cat ../00README.FIRST debug: cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \ + cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \ + cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \ + cd ../server ; \ +- make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ ++ make $(D) $(Q) $(VER) COMPILED=\"$(COMPILED_DEBUG)\" ; \ + cd ../tools ; make $(D) ; \ +- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST ++ cd ../tcp ; make $(D) $(VER) ; cat ../00README.FIRST + + clean: + rm -f $(OBJECTS) core $(EXECS) ; \ diff --git a/package/maradns/patches/patch-configure b/package/maradns/patches/patch-configure deleted file mode 100644 index d6d698a78..000000000 --- a/package/maradns/patches/patch-configure +++ /dev/null @@ -1,19 +0,0 @@ ---- maradns-1.4.03.orig/configure 2007-10-19 15:54:14.000000000 +0200 -+++ maradns-1.4.03/configure 2010-02-06 00:22:18.533084157 +0100 -@@ -31,12 +31,12 @@ BUILDDIR=build - export BUILDDIR - - # Show them the disclaimer --cat 00README.FIRST --echo ----- --echo -+#cat 00README.FIRST -+#echo ----- -+#echo - - # Try to determine what kind of system we are running --UNAME=`uname -s` -+UNAME=Linux - - # Make sure the Makefile has the current version number of MaraDNS - # VERSION is a one line file in the form "VERSION=0.1.23" (without the diff --git a/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile b/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile new file mode 100644 index 000000000..a4d879c82 --- /dev/null +++ b/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile @@ -0,0 +1,22 @@ + - set HOSTCC to the right value for OpenADK + - maradns, y u no use HOSTCC when appropriate?! +--- maradns-2.0.09.orig/deadwood-3.2.05/src/Makefile 2011-12-21 20:44:37.000000000 +0100 ++++ maradns-2.0.09/deadwood-3.2.05/src/Makefile 2014-06-19 02:48:35.375046777 +0200 +@@ -5,7 +5,7 @@ + # compiling. When cross-compiling, we still need to compile and + # run programs on the build machine, so change the next line when + # cross-compiling. +-HOSTCC=$(CC) ++HOSTCC=$(CC_FOR_BUILD) + + OBJS=DwStr.o \ + DwMararc.o \ +@@ -68,7 +68,7 @@ DwSys.o: DwSys.c DwStr.h + $(CC) $(FLAGS) -Wall -c -o DwSys.o DwSys.c + + RandomPrime: RandomPrime.c +- $(CC) -O3 -o RandomPrime RandomPrime.c ++ $(HOSTCC) -O3 -o RandomPrime RandomPrime.c + + DwRandPrime.h: RandomPrime + if [ -e /dev/urandom ] ; then ./RandomPrime > DwRandPrime.h ; fi diff --git a/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile_ipv6 b/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile_ipv6 new file mode 100644 index 000000000..e3550df03 --- /dev/null +++ b/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile_ipv6 @@ -0,0 +1,22 @@ + - set HOSTCC to the right value for OpenADK + - maradns, y u no use HOSTCC when appropriate?! +--- maradns-2.0.09.orig/deadwood-3.2.05/src/Makefile.ipv6 2012-12-20 19:30:37.000000000 +0100 ++++ maradns-2.0.09/deadwood-3.2.05/src/Makefile.ipv6 2014-06-30 05:20:02.061294221 +0200 +@@ -5,7 +5,7 @@ + # compiling. When cross-compiling, we still need to compile and + # run programs on the build machine, so change the next line when + # cross-compiling. +-HOSTCC=$(CC) ++HOSTCC=$(CC_FOR_BUILD) + + OBJS=DwStr.o \ + DwMararc.o \ +@@ -68,7 +68,7 @@ DwSys.o: DwSys.c DwStr.h + $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwSys.o DwSys.c + + RandomPrime: RandomPrime.c +- $(CC) -O3 -o RandomPrime RandomPrime.c ++ $(HOSTCC) -O3 -o RandomPrime RandomPrime.c + + DwRandPrime.h: RandomPrime + if [ -e /dev/urandom ] ; then ./RandomPrime > DwRandPrime.h ; fi diff --git a/package/maradns/patches/patch-dns_Makefile b/package/maradns/patches/patch-dns_Makefile deleted file mode 100644 index 81855b3dc..000000000 --- a/package/maradns/patches/patch-dns_Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- maradns-1.4.05.orig/dns/Makefile 2005-12-20 11:10:40.000000000 +0100 -+++ maradns-1.4.05/dns/Makefile 2011-01-21 16:48:06.144914132 +0100 -@@ -3,7 +3,7 @@ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o - MHOBJS=../libs/MaraHash.o - OBJECTS=$(DOBJECTS) $(JOBJS) $(MHOBJS) - --FLAGS = -g -Wall $(DEBUG) -+#FLAGS = -g -Wall $(DEBUG) - #FLAGS = -g $(DEBUG) - - all: Queries.o Compress.o bobbit.o Decompress.o -@@ -12,14 +12,14 @@ clean: - rm -f Queries.o Compress.o bobbit.o Decompress.o - - Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Queries.o Queries.c -+ $(CC) -c $(CFLAGS) -o Queries.o Queries.c - - Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Compress.o Compress.c -+ $(CC) -c $(CFLAGS) -o Compress.o Compress.c - - Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Decompress.o Decompress.c -+ $(CC) -c $(CFLAGS) -o Decompress.o Decompress.c - - bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o bobbit.o bobbit.c -+ $(CC) -c $(CFLAGS) -o bobbit.o bobbit.c - diff --git a/package/maradns/patches/patch-dns_Makefile_recursive b/package/maradns/patches/patch-dns_Makefile_recursive deleted file mode 100644 index 3e8339140..000000000 --- a/package/maradns/patches/patch-dns_Makefile_recursive +++ /dev/null @@ -1,21 +0,0 @@ ---- maradns-1.4.05.orig/dns/Makefile.recursive 2006-01-02 17:59:33.000000000 +0100 -+++ maradns-1.4.05/dns/Makefile.recursive 2011-01-21 16:47:09.678658422 +0100 -@@ -12,14 +12,14 @@ clean: - rm -f Queries.o Compress.o bobbit.o Decompress.o - - Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Queries.o Queries.c -+ $(CC) -c $(CFLAGS) -o Queries.o Queries.c - - Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Compress.o Compress.c -+ $(CC) -c $(CFLAGS) -o Compress.o Compress.c - - Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Decompress.o Decompress.c -+ $(CC) -c $(CFLAGS) -o Decompress.o Decompress.c - - bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o bobbit.o bobbit.c -+ $(CC) -c $(CFLAGS) -o bobbit.o bobbit.c - diff --git a/package/maradns/patches/patch-libs_Makefile b/package/maradns/patches/patch-libs_Makefile deleted file mode 100644 index 4c8ec3255..000000000 --- a/package/maradns/patches/patch-libs_Makefile +++ /dev/null @@ -1,31 +0,0 @@ ---- maradns-1.4.05.orig/libs/Makefile 2006-01-02 17:59:33.000000000 +0100 -+++ maradns-1.4.05/libs/Makefile 2011-01-21 16:46:50.568579851 +0100 -@@ -9,22 +9,22 @@ clean: - rm -f core $(OBJECTS) tests mtest *.exe - - MaraHash.o: JsStr.h MaraHash.c -- $(CC) -c $(FLAGS) -o MaraHash.o MaraHash.c -+ $(CC) -c $(CFLAGS) -o MaraHash.o MaraHash.c - - JsStr.o: JsStr.h JsStr.c -- $(CC) -c $(FLAGS) -o JsStr.o JsStr.c -+ $(CC) -c $(CFLAGS) -o JsStr.o JsStr.c - - JsStrOS.o: JsStr.h JsStrOS.c -- $(CC) -c $(FLAGS) -o JsStrOS.o JsStrOS.c -+ $(CC) -c $(CFLAGS) -o JsStrOS.o JsStrOS.c - - JsStrCP.o: JsStr.h JsStrCP.c -- $(CC) -c $(FLAGS) -o JsStrCP.o JsStrCP.c -+ $(CC) -c $(CFLAGS) -o JsStrCP.o JsStrCP.c - - mtest: mtest.c $(OBJECTS) -- $(CC) $(FLAGS) -o mtest mtest.c $(OBJECTS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o mtest mtest.c $(OBJECTS) - - tests: tests.c $(OBJECTS) -- $(CC) $(FLAGS) -o tests tests.c $(OBJECTS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o tests tests.c $(OBJECTS) - - #onetime: $(OBJECTS) kiwi.h config.h onetime.c do_scramble.o cryptdate.o - # $(CC) $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o diff --git a/package/maradns/patches/patch-parse_Makefile b/package/maradns/patches/patch-parse_Makefile deleted file mode 100644 index b7098c969..000000000 --- a/package/maradns/patches/patch-parse_Makefile +++ /dev/null @@ -1,80 +0,0 @@ ---- maradns-1.4.05.orig/parse/Makefile 2006-07-18 05:50:44.000000000 +0200 -+++ maradns-1.4.05/parse/Makefile 2011-01-21 16:47:47.994913518 +0100 -@@ -8,8 +8,8 @@ DOBJECTS=../dns/Queries.o ../dns/Compres - OBJECTS=$(JOBJS) $(MHOBJS) $(POBJECTS) $(DOBJECTS) $(OUTOBJ) - EXECS=parsetest parsetest2 - --#FLAGS = -g -Wall $(DEBUG) --#FLAGS = -g $(DEBUG) -+#CFLAGS = -g -Wall $(DEBUG) -+#CFLAGS = -g $(DEBUG) - - all: $(POBJECTS) $(OUTOBJ) - -@@ -20,50 +20,50 @@ clean: - cd libs ; make - - ParseMaraRc.o: ParseMaraRc.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h ParseMaraRc_en.h -- $(CC) -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c -+ $(CC) -c $(CFLAGS) -o ParseMaraRc.o ParseMaraRc.c - - ParseCsv1.o: ParseCsv1.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c -+ $(CC) -c $(CFLAGS) -o ParseCsv1.o ParseCsv1.c - - ParseIpAcl.o: ParseIpAcl.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c -+ $(CC) -c $(CFLAGS) -o ParseIpAcl.o ParseIpAcl.c - - Parse_ipv6.o: Parse_ipv6.c ../libs/MaraHash.h -- $(CC) -c $(FLAGS) -o Parse_ipv6.o Parse_ipv6.c -+ $(CC) -c $(CFLAGS) -o Parse_ipv6.o Parse_ipv6.c - - Csv2_esc_txt.o: Csv2_esc_txt.c ../libs/JsStr.h -- $(CC) -c $(FLAGS) -o Csv2_esc_txt.o Csv2_esc_txt.c -+ $(CC) -c $(CFLAGS) -o Csv2_esc_txt.o Csv2_esc_txt.c - - Csv2_main.o: Csv2_main.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_main.o Csv2_main.c -+ $(CC) -c $(CFLAGS) -o Csv2_main.o Csv2_main.c - - Csv2_read.o: Csv2_read.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_read.o Csv2_read.c -+ $(CC) -c $(CFLAGS) -o Csv2_read.o Csv2_read.c - - Csv2_parse.o: Csv2_parse.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_parse.o Csv2_parse.c -+ $(CC) -c $(CFLAGS) -o Csv2_parse.o Csv2_parse.c - - Csv2_rr_aaaa.o: Csv2_rr_aaaa.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_rr_aaaa.o Csv2_rr_aaaa.c -+ $(CC) -c $(CFLAGS) -o Csv2_rr_aaaa.o Csv2_rr_aaaa.c - - Csv2_rr_wks.o: Csv2_rr_wks.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_rr_wks.o Csv2_rr_wks.c -+ $(CC) -c $(CFLAGS) -o Csv2_rr_wks.o Csv2_rr_wks.c - - Csv2_rr_a.o: Csv2_rr_a.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_rr_a.o Csv2_rr_a.c -+ $(CC) -c $(CFLAGS) -o Csv2_rr_a.o Csv2_rr_a.c - - Csv2_rr_soa.o: Csv2_rr_soa.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_rr_soa.o Csv2_rr_soa.c -+ $(CC) -c $(CFLAGS) -o Csv2_rr_soa.o Csv2_rr_soa.c - - Csv2_rr_txt.o: Csv2_rr_txt.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_rr_txt.o Csv2_rr_txt.c -+ $(CC) -c $(CFLAGS) -o Csv2_rr_txt.o Csv2_rr_txt.c - - Csv2_database.o: Csv2_database.c ../libs/JsStr.h Csv2_read.h -- $(CC) -c $(FLAGS) -o Csv2_database.o Csv2_database.c -+ $(CC) -c $(CFLAGS) -o Csv2_database.o Csv2_database.c - - parsetest: parsetest.c $(OBJECTS) -- $(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) -+ $(CC) $(CFLAGS) -o parsetest parsetest.c $(OBJECTS) - - parsetest2: parsetest2.c $(OBJECTS) -- $(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) -+ $(CC) $(CFLAGS) -o parsetest2 parsetest2.c $(OBJECTS) - diff --git a/package/maradns/patches/patch-qual_Makefile b/package/maradns/patches/patch-qual_Makefile deleted file mode 100644 index b78ce7096..000000000 --- a/package/maradns/patches/patch-qual_Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- maradns-1.4.03.orig/qual/Makefile 2006-01-02 17:59:33.000000000 +0100 -+++ maradns-1.4.03/qual/Makefile 2010-02-06 00:19:48.481829524 +0100 -@@ -2,9 +2,6 @@ DOBJECTS=qual_timestamp.o - JOBJS=../libs/JsStr.o ../libs/JsStrOS.o ../libs/JsStrCP.o - OBJECTS=$(DOBJECTS) - --#FLAGS = -g -Wall $(DEBUG) --#FLAGS = -g $(DEBUG) -- - all: qual_timestamp.o - - clean: diff --git a/package/maradns/patches/patch-qual_Makefile_threadsafe b/package/maradns/patches/patch-qual_Makefile_threadsafe deleted file mode 100644 index 81ef93c77..000000000 --- a/package/maradns/patches/patch-qual_Makefile_threadsafe +++ /dev/null @@ -1,9 +0,0 @@ ---- maradns-1.4.05.orig/qual/Makefile.threadsafe 2006-01-22 06:22:01.000000000 +0100 -+++ maradns-1.4.05/qual/Makefile.threadsafe 2011-01-21 16:48:40.348658539 +0100 -@@ -8,5 +8,5 @@ clean: - rm -f qual_timestamp.o - - qual_timestamp.o: qual_timestamp.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o qual_timestamp.o qual_timestamp.c -+ $(CC) -c $(CFLAGS) -o qual_timestamp.o qual_timestamp.c - diff --git a/package/maradns/patches/patch-rng_Makefile b/package/maradns/patches/patch-rng_Makefile new file mode 100644 index 000000000..7de1ad94b --- /dev/null +++ b/package/maradns/patches/patch-rng_Makefile @@ -0,0 +1,12 @@ + use host compiler to compile table generator +--- maradns-2.0.09.orig/rng/Makefile 2006-01-02 17:59:33.000000000 +0100 ++++ maradns-2.0.09/rng/Makefile 2014-06-19 02:40:59.777845739 +0200 +@@ -25,7 +25,7 @@ rng-api-fst.o: rng-alg-fst.o rng-api-fst + $(CC) -c $(FLAGS) -o rng-api-fst.o rng-api-fst.c + + make_32bit_tables: make_32bit_tables.c +- $(CC) -o make_32bit_tables make_32bit_tables.c ++ $(CC_FOR_BUILD) -o make_32bit_tables make_32bit_tables.c + + rng-32bit-tables.h: make_32bit_tables + ./make_32bit_tables > rng-32bit-tables.h diff --git a/package/maradns/patches/patch-rng_rng-32bit-tables_h b/package/maradns/patches/patch-rng_rng-32bit-tables_h deleted file mode 100644 index 2f4647940..000000000 --- a/package/maradns/patches/patch-rng_rng-32bit-tables_h +++ /dev/null @@ -1,655 +0,0 @@ ---- maradns-1.4.05.orig/rng/rng-32bit-tables.h 2010-09-25 16:14:04.000000000 +0200 -+++ maradns-1.4.05/rng/rng-32bit-tables.h 2011-01-21 16:25:33.324914221 +0100 -@@ -1,332 +1,332 @@ - /* This file is automatically generated by the program make_32bit_tables.c */ - - static const u32 Te0[256] = { --0xb3e2509bU, 0x63b4ca06U, 0x85e4a2d4U, 0x216c4602U, --0x3a6f3fa8U, 0xa616bd75U, 0x134d0610U, 0x4d60b99cU, --0x176ab44dU, 0x7f41f98eU, 0xe277da8fU, 0xcdec08c9U, --0x5a0a0dd1U, 0x1b0379aaU, 0x7b664bd3U, 0xa1e0f757U, --0xfaa55b5aU, 0xea39a535U, 0xc5a27773U, 0xb17c0938U, --0x2023e7deU, 0xd47128c0U, 0x7c9001f1U, 0x22bdbe7dU, --0xec804ecbU, 0xb9327682U, 0xbd15c4dfU, 0xc9cbba94U, --0xa488e4d6U, 0x014fa1dcU, 0x60653279U, 0xfe82e907U, --0x74de7e4bU, 0xa8e12931U, 0x0427b25dU, 0xe65068d2U, --0x898d6f33U, 0x928e1699U, 0x1202a7ccU, 0x7a29ea0fU, --0x1f24cbf7U, 0x64428024U, 0xdd70f6a6U, 0xbec43ca0U, --0x2d058be5U, 0x15f4edeeU, 0x572c61eaU, 0x1cf53388U, --0xf974a325U, 0x4046d5a7U, 0x2bbc601bU, 0xdea10ed9U, --0x42d88c04U, 0x8f3484cdU, 0x5f621e50U, 0x835d492aU, --0xf51d6ec2U, 0x2f9bd246U, 0xbf8b9d7cU, 0xee1e1768U, --0x6c0cff9eU, 0x16251591U, 0x37495393U, 0x5cb3e62fU, --0x3f072c29U, 0x4bd95262U, 0x05681381U, 0x90104f3aU, --0x03d1f87fU, 0x5244726bU, 0xd53e891cU, 0x9ac06923U, --0x51958a14U, 0x915feee6U, 0xdfeeaf05U, 0x79f81270U, --0xd2c8c33eU, 0x39bec7d7U, 0x764027e8U, 0x4808aa1dU, --0xcf72516aU, 0x269a0c20U, 0xab30d14eU, 0xc2543d51U, --0x770f8634U, 0xa0af568bU, 0x27d5adfcU, 0x4ffee03fU, --0xb4141ab9U, 0x8ce57cb2U, 0x2af3c1c7U, 0xdbc91d58U, --0xd6ef7163U, 0x3cd6d456U, 0x5b45ac0dU, 0x3e488df5U, --0x32214012U, 0xe1a622f0U, 0x9b8fc8ffU, 0x43972dd8U, --0xcca3a915U, 0x286d9864U, 0x31f0b86dU, 0x3498abecU, --0x73283469U, 0x6fdd07e1U, 0x682b4dc3U, 0x66dcd987U, --0x5663c036U, 0x62fb6bdaU, 0x95785cbbU, 0xe71fc90eU, --0x726795b5U, 0xcb55e337U, 0x5dfc47f3U, 0x70f9cc16U, --0xb68a431aU, 0x81c31089U, 0xe4ce3171U, 0x0d266c3bU, --0xacc69b6cU, 0x985e3080U, 0xda86bc84U, 0x6d435e42U, --0x6964ec1fU, 0x06b9ebfeU, 0x84ab0308U, 0xbae38efdU, --0x11d35fb3U, 0x00000000U, 0x0ef79444U, 0xfbeafa86U, --0xbbac2f21U, 0x650d21f8U, 0xae58c2cfU, 0x86355aabU, --0x612a93a5U, 0xf452cf1eU, 0x446167faU, 0x877afb77U, --0xf3a4853cU, 0xa7591ca9U, 0x7ddfa02dU, 0x58945472U, --0x9c7982ddU, 0xd818e527U, 0x336ee1ceU, 0x07f64a22U, --0xa5c7450aU, 0x808cb155U, 0xb7c5e2c6U, 0xef51b6b4U, --0x3606f24fU, 0xffcd48dbU, 0x55b23849U, 0x6bfab5bcU, --0x4eb141e3U, 0x8e7b2511U, 0x6ab51460U, 0xfd531178U, --0x18d281d5U, 0xd38762e2U, 0xf2eb24e0U, 0xca1a42ebU, --0xdc3f577aU, 0x88c2ceefU, 0x8daadd6eU, 0x029e59a3U, --0x199d2009U, 0xb033a8e4U, 0x0901de66U, 0x0c69cde7U, --0x0fb83598U, 0xf7833761U, 0xf6cc96bdU, 0x78b7b3acU, --0x7591df97U, 0x49470bc1U, 0xe58190adU, 0x97e60518U, --0xd7a0d0bfU, 0x4a96f3beU, 0x9fa87aa2U, 0xe9e85d4aU, --0x0b9f87c5U, 0x452ec626U, 0xbc5a6503U, 0xd95744fbU, --0x9911915cU, 0x96a9a4c4U, 0x46ff3e59U, 0x4c2f1840U, --0x9437fd67U, 0xe3387b53U, 0x3d99758aU, 0xc73c2ed0U, --0x2c4a2a39U, 0x254bf45fU, 0x23f21fa1U, 0x1a4cd876U, --0xd0569a9dU, 0xb87dd75eU, 0x1dba9254U, 0x38f1660bU, --0xa2310f28U, 0x5e2dbf8cU, 0x47b09f85U, 0x14bb4c32U, --0xa9ae88edU, 0x50da2bc8U, 0x24045583U, 0xeb7604e9U, --0xb55bbb65U, 0x1e6b6a2bU, 0x8212e8f6U, 0xf13adc9fU, --0xc0ca64f2U, 0x084e7fbaU, 0xa37eaef4U, 0x35d70a30U, --0xedcfef17U, 0xe0e9832cU, 0x30bf19b1U, 0x9ee7db7eU, --0xe8a7fc96U, 0x93c1b745U, 0xfc1cb0a4U, 0xb2adf147U, --0x109cfe6fU, 0xad893ab0U, 0xaf176313U, 0x2ed4739aU, --0x6e92a63dU, 0x9d362301U, 0xf83b02f9U, 0xc6738f0cU, --0xc185c52eU, 0xc8841b48U, 0x6793785bU, 0xaa7f7092U, --0x4109747bU, 0xc31b9c8dU, 0x71b66dcaU, 0x8b133690U, --0xd1193b41U, 0x54fd9995U, 0xc4edd6afU, 0x7e0e5852U, --0x3b209e74U, 0x8a5c974cU, 0xf0757d43U, 0x59dbf5aeU, --0xce3df0b6U, 0x530bd3b7U, 0x0ad02619U, 0x292239b8U, -+0xb3e2509bU, 0x63b4ca06U, 0x85e4a2d4U, 0x216c4602U, -+0x3a6f3fa8U, 0xa616bd75U, 0x134d0610U, 0x4d60b99cU, -+0x176ab44dU, 0x7f41f98eU, 0xe277da8fU, 0xcdec08c9U, -+0x5a0a0dd1U, 0x1b0379aaU, 0x7b664bd3U, 0xa1e0f757U, -+0xfaa55b5aU, 0xea39a535U, 0xc5a27773U, 0xb17c0938U, -+0x2023e7deU, 0xd47128c0U, 0x7c9001f1U, 0x22bdbe7dU, -+0xec804ecbU, 0xb9327682U, 0xbd15c4dfU, 0xc9cbba94U, -+0xa488e4d6U, 0x014fa1dcU, 0x60653279U, 0xfe82e907U, -+0x74de7e4bU, 0xa8e12931U, 0x0427b25dU, 0xe65068d2U, -+0x898d6f33U, 0x928e1699U, 0x1202a7ccU, 0x7a29ea0fU, -+0x1f24cbf7U, 0x64428024U, 0xdd70f6a6U, 0xbec43ca0U, -+0x2d058be5U, 0x15f4edeeU, 0x572c61eaU, 0x1cf53388U, -+0xf974a325U, 0x4046d5a7U, 0x2bbc601bU, 0xdea10ed9U, -+0x42d88c04U, 0x8f3484cdU, 0x5f621e50U, 0x835d492aU, -+0xf51d6ec2U, 0x2f9bd246U, 0xbf8b9d7cU, 0xee1e1768U, -+0x6c0cff9eU, 0x16251591U, 0x37495393U, 0x5cb3e62fU, -+0x3f072c29U, 0x4bd95262U, 0x05681381U, 0x90104f3aU, -+0x03d1f87fU, 0x5244726bU, 0xd53e891cU, 0x9ac06923U, -+0x51958a14U, 0x915feee6U, 0xdfeeaf05U, 0x79f81270U, -+0xd2c8c33eU, 0x39bec7d7U, 0x764027e8U, 0x4808aa1dU, -+0xcf72516aU, 0x269a0c20U, 0xab30d14eU, 0xc2543d51U, -+0x770f8634U, 0xa0af568bU, 0x27d5adfcU, 0x4ffee03fU, -+0xb4141ab9U, 0x8ce57cb2U, 0x2af3c1c7U, 0xdbc91d58U, -+0xd6ef7163U, 0x3cd6d456U, 0x5b45ac0dU, 0x3e488df5U, -+0x32214012U, 0xe1a622f0U, 0x9b8fc8ffU, 0x43972dd8U, -+0xcca3a915U, 0x286d9864U, 0x31f0b86dU, 0x3498abecU, -+0x73283469U, 0x6fdd07e1U, 0x682b4dc3U, 0x66dcd987U, -+0x5663c036U, 0x62fb6bdaU, 0x95785cbbU, 0xe71fc90eU, -+0x726795b5U, 0xcb55e337U, 0x5dfc47f3U, 0x70f9cc16U, -+0xb68a431aU, 0x81c31089U, 0xe4ce3171U, 0x0d266c3bU, -+0xacc69b6cU, 0x985e3080U, 0xda86bc84U, 0x6d435e42U, -+0x6964ec1fU, 0x06b9ebfeU, 0x84ab0308U, 0xbae38efdU, -+0x11d35fb3U, 0x00000000U, 0x0ef79444U, 0xfbeafa86U, -+0xbbac2f21U, 0x650d21f8U, 0xae58c2cfU, 0x86355aabU, -+0x612a93a5U, 0xf452cf1eU, 0x446167faU, 0x877afb77U, -+0xf3a4853cU, 0xa7591ca9U, 0x7ddfa02dU, 0x58945472U, -+0x9c7982ddU, 0xd818e527U, 0x336ee1ceU, 0x07f64a22U, -+0xa5c7450aU, 0x808cb155U, 0xb7c5e2c6U, 0xef51b6b4U, -+0x3606f24fU, 0xffcd48dbU, 0x55b23849U, 0x6bfab5bcU, -+0x4eb141e3U, 0x8e7b2511U, 0x6ab51460U, 0xfd531178U, -+0x18d281d5U, 0xd38762e2U, 0xf2eb24e0U, 0xca1a42ebU, -+0xdc3f577aU, 0x88c2ceefU, 0x8daadd6eU, 0x029e59a3U, -+0x199d2009U, 0xb033a8e4U, 0x0901de66U, 0x0c69cde7U, -+0x0fb83598U, 0xf7833761U, 0xf6cc96bdU, 0x78b7b3acU, -+0x7591df97U, 0x49470bc1U, 0xe58190adU, 0x97e60518U, -+0xd7a0d0bfU, 0x4a96f3beU, 0x9fa87aa2U, 0xe9e85d4aU, -+0x0b9f87c5U, 0x452ec626U, 0xbc5a6503U, 0xd95744fbU, -+0x9911915cU, 0x96a9a4c4U, 0x46ff3e59U, 0x4c2f1840U, -+0x9437fd67U, 0xe3387b53U, 0x3d99758aU, 0xc73c2ed0U, -+0x2c4a2a39U, 0x254bf45fU, 0x23f21fa1U, 0x1a4cd876U, -+0xd0569a9dU, 0xb87dd75eU, 0x1dba9254U, 0x38f1660bU, -+0xa2310f28U, 0x5e2dbf8cU, 0x47b09f85U, 0x14bb4c32U, -+0xa9ae88edU, 0x50da2bc8U, 0x24045583U, 0xeb7604e9U, -+0xb55bbb65U, 0x1e6b6a2bU, 0x8212e8f6U, 0xf13adc9fU, -+0xc0ca64f2U, 0x084e7fbaU, 0xa37eaef4U, 0x35d70a30U, -+0xedcfef17U, 0xe0e9832cU, 0x30bf19b1U, 0x9ee7db7eU, -+0xe8a7fc96U, 0x93c1b745U, 0xfc1cb0a4U, 0xb2adf147U, -+0x109cfe6fU, 0xad893ab0U, 0xaf176313U, 0x2ed4739aU, -+0x6e92a63dU, 0x9d362301U, 0xf83b02f9U, 0xc6738f0cU, -+0xc185c52eU, 0xc8841b48U, 0x6793785bU, 0xaa7f7092U, -+0x4109747bU, 0xc31b9c8dU, 0x71b66dcaU, 0x8b133690U, -+0xd1193b41U, 0x54fd9995U, 0xc4edd6afU, 0x7e0e5852U, -+0x3b209e74U, 0x8a5c974cU, 0xf0757d43U, 0x59dbf5aeU, -+0xce3df0b6U, 0x530bd3b7U, 0x0ad02619U, 0x292239b8U, - }; - static const u32 Te1[256] = { --0x9bb3e250U, 0x0663b4caU, 0xd485e4a2U, 0x02216c46U, --0xa83a6f3fU, 0x75a616bdU, 0x10134d06U, 0x9c4d60b9U, --0x4d176ab4U, 0x8e7f41f9U, 0x8fe277daU, 0xc9cdec08U, --0xd15a0a0dU, 0xaa1b0379U, 0xd37b664bU, 0x57a1e0f7U, --0x5afaa55bU, 0x35ea39a5U, 0x73c5a277U, 0x38b17c09U, --0xde2023e7U, 0xc0d47128U, 0xf17c9001U, 0x7d22bdbeU, --0xcbec804eU, 0x82b93276U, 0xdfbd15c4U, 0x94c9cbbaU, --0xd6a488e4U, 0xdc014fa1U, 0x79606532U, 0x07fe82e9U, --0x4b74de7eU, 0x31a8e129U, 0x5d0427b2U, 0xd2e65068U, --0x33898d6fU, 0x99928e16U, 0xcc1202a7U, 0x0f7a29eaU, --0xf71f24cbU, 0x24644280U, 0xa6dd70f6U, 0xa0bec43cU, --0xe52d058bU, 0xee15f4edU, 0xea572c61U, 0x881cf533U, --0x25f974a3U, 0xa74046d5U, 0x1b2bbc60U, 0xd9dea10eU, --0x0442d88cU, 0xcd8f3484U, 0x505f621eU, 0x2a835d49U, --0xc2f51d6eU, 0x462f9bd2U, 0x7cbf8b9dU, 0x68ee1e17U, --0x9e6c0cffU, 0x91162515U, 0x93374953U, 0x2f5cb3e6U, --0x293f072cU, 0x624bd952U, 0x81056813U, 0x3a90104fU, --0x7f03d1f8U, 0x6b524472U, 0x1cd53e89U, 0x239ac069U, --0x1451958aU, 0xe6915feeU, 0x05dfeeafU, 0x7079f812U, --0x3ed2c8c3U, 0xd739bec7U, 0xe8764027U, 0x1d4808aaU, --0x6acf7251U, 0x20269a0cU, 0x4eab30d1U, 0x51c2543dU, --0x34770f86U, 0x8ba0af56U, 0xfc27d5adU, 0x3f4ffee0U, --0xb9b4141aU, 0xb28ce57cU, 0xc72af3c1U, 0x58dbc91dU, --0x63d6ef71U, 0x563cd6d4U, 0x0d5b45acU, 0xf53e488dU, --0x12322140U, 0xf0e1a622U, 0xff9b8fc8U, 0xd843972dU, --0x15cca3a9U, 0x64286d98U, 0x6d31f0b8U, 0xec3498abU, --0x69732834U, 0xe16fdd07U, 0xc3682b4dU, 0x8766dcd9U, --0x365663c0U, 0xda62fb6bU, 0xbb95785cU, 0x0ee71fc9U, --0xb5726795U, 0x37cb55e3U, 0xf35dfc47U, 0x1670f9ccU, --0x1ab68a43U, 0x8981c310U, 0x71e4ce31U, 0x3b0d266cU, --0x6cacc69bU, 0x80985e30U, 0x84da86bcU, 0x426d435eU, --0x1f6964ecU, 0xfe06b9ebU, 0x0884ab03U, 0xfdbae38eU, --0xb311d35fU, 0x00000000U, 0x440ef794U, 0x86fbeafaU, --0x21bb |