diff options
| -rw-r--r-- | package/maradns/Makefile | 6 | ||||
| -rw-r--r-- | package/maradns/patches/patch-deadwood-3_2_05_src_Makefile | 22 | ||||
| -rw-r--r-- | package/maradns/patches/patch-deadwood-3_2_09_src_Makefile | 72 | ||||
| -rw-r--r-- | package/maradns/patches/patch-deadwood-3_2_09_src_Makefile_ipv6 (renamed from package/maradns/patches/patch-deadwood-3_2_05_src_Makefile_ipv6) | 6 | ||||
| -rw-r--r-- | package/maradns/patches/patch-tcp_Makefile | 13 |
5 files changed, 88 insertions, 31 deletions
diff --git a/package/maradns/Makefile b/package/maradns/Makefile index df558019d..81cb67343 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= maradns -PKG_VERSION:= 2.0.09 -PKG_RELEASE:= 2 -PKG_HASH:= e1ee80836f0fbc47b9b94ec839e112ea19c40bed0b70d672d231849a4dea1083 +PKG_VERSION:= 2.0.13 +PKG_RELEASE:= 1 +PKG_HASH:= 661ea06fb18df6d2469b2bf824ffd93545a091af185362cbc738d1aa408210c3 PKG_DESCR:= small and secure DNS server PKG_SECTION:= net/dns PKG_DEPENDS:= libpthread librt duende diff --git a/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile b/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile deleted file mode 100644 index a4d879c82..000000000 --- a/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile +++ /dev/null @@ -1,22 +0,0 @@ - - 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_09_src_Makefile b/package/maradns/patches/patch-deadwood-3_2_09_src_Makefile new file mode 100644 index 000000000..b61b368dd --- /dev/null +++ b/package/maradns/patches/patch-deadwood-3_2_09_src_Makefile @@ -0,0 +1,72 @@ +--- maradns-2.0.13.orig/deadwood-3.2.09/src/Makefile 2015-01-24 09:09:04.000000000 +0100 ++++ maradns-2.0.13/deadwood-3.2.09/src/Makefile 2015-10-22 15:56:39.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Makefile for Deadwood-2 (CentOS 5; may work with other other Linux and ++# Makefile for Deadwood-3 (CentOS 5; may work with other other Linux and + # *NIX systems) + + # The compiler that makes programs designed to run on the machine +@@ -41,31 +41,31 @@ version.h: + ./make.version.h + + DwStr.o: DwStr.c DwStr.h +- $(CC) $(FLAGS) -Wall -c -o DwStr.o DwStr.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwStr.o DwStr.c + + DwCompress.o: DwCompress.c DwStr.h +- $(CC) $(FLAGS) -Wall -c -o DwCompress.o DwCompress.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwCompress.o DwCompress.c + + DwDnsStr.o: DwDnsStr.c DwStr.h DwRecurse.h +- $(CC) $(FLAGS) -Wall -c -o DwDnsStr.o DwDnsStr.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwDnsStr.o DwDnsStr.c + + DwMararc.o: DwMararc.c DwMararc.h +- $(CC) $(FLAGS) -Wall -c -o DwMararc.o DwMararc.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwMararc.o DwMararc.c + + DwRadioGatun.o: DwRadioGatun.c DwRadioGatun.h DwStr.h +- $(CC) $(FLAGS) -Wall -c -o DwRadioGatun.o DwRadioGatun.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwRadioGatun.o DwRadioGatun.c + + DwTcpSocket.o: DwTcpSocket.c DwStr.h DwSocket.h +- $(CC) $(FLAGS) -Wall -c -o DwTcpSocket.o DwTcpSocket.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwTcpSocket.o DwTcpSocket.c + + DwUdpSocket.o: DwUdpSocket.c DwStr.h DwSocket.h +- $(CC) $(FLAGS) -Wall -c -o DwUdpSocket.o DwUdpSocket.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwUdpSocket.o DwUdpSocket.c + + DwSocket.o: DwSocket.c DwStr.h DwSocket.h +- $(CC) $(FLAGS) -Wall -c -o DwSocket.o DwSocket.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwSocket.o DwSocket.c + +-DwSys.o: DwSys.c DwStr.h version.h +- $(CC) $(FLAGS) -Wall -c -o DwSys.o DwSys.c ++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 +@@ -74,17 +74,17 @@ DwRandPrime.h: RandomPrime + if [ -e /dev/urandom ] ; then ./RandomPrime > DwRandPrime.h ; fi + + DwHash.o: DwHash.c DwStr.h DwRandPrime.h DwHash.h +- $(CC) $(FLAGS) -Wall -c -o DwHash.o DwHash.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwHash.o DwHash.c + + DwRecurse.o: DwRecurse.c DwRecurse.h +- $(CC) $(FLAGS) -Wall -c -o DwRecurse.o DwRecurse.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwRecurse.o DwRecurse.c + + DwDict.o: DwDict.c DwStr.h DwRandPrime.h DwDict.h +- $(CC) $(FLAGS) -Wall -c -o DwDict.o DwDict.c ++ $(CC) $(FLAGS) -DIPV6 -Wall -c -o DwDict.o DwDict.c + + Test: Test.c DwStr.o DwStr.h DwStr_functions.h $(OBJS) + $(CC) $(FLAGS) -Wall -o Test Test.c $(OBJS) + + Deadwood: DwMain.c $(OBJS) DwStr_functions.h version.h +- $(CC) $(FLAGS) -Wall -o Deadwood DwMain.c $(OBJS) -lrt ++ $(CC) $(FLAGS) -DIPV6 -Wall -o Deadwood DwMain.c $(OBJS) -lrt + diff --git a/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile_ipv6 b/package/maradns/patches/patch-deadwood-3_2_09_src_Makefile_ipv6 index e3550df03..08c3d8baa 100644 --- a/package/maradns/patches/patch-deadwood-3_2_05_src_Makefile_ipv6 +++ b/package/maradns/patches/patch-deadwood-3_2_09_src_Makefile_ipv6 @@ -1,7 +1,5 @@ - - 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 +--- maradns-2.0.13.orig/deadwood-3.2.09/src/Makefile.ipv6 2012-12-20 19:30:37.000000000 +0100 ++++ maradns-2.0.13/deadwood-3.2.09/src/Makefile.ipv6 2015-10-22 15:58:40.000000000 +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 diff --git a/package/maradns/patches/patch-tcp_Makefile b/package/maradns/patches/patch-tcp_Makefile index 8bd3778b8..5759f96a0 100644 --- a/package/maradns/patches/patch-tcp_Makefile +++ b/package/maradns/patches/patch-tcp_Makefile @@ -1,8 +1,17 @@ - pass CFLAGS manually to CC calls, since using the $(M) from top-level Makefile would lead to double CFLAGS passing in implicit rules ---- maradns-2.0.09.orig/tcp/Makefile 2010-09-09 22:21:09.000000000 +0200 -+++ maradns-2.0.09/tcp/Makefile 2014-06-19 02:57:49.658775453 +0200 +--- maradns-2.0.13.orig/tcp/Makefile 2010-09-09 22:21:09.000000000 +0200 ++++ maradns-2.0.13/tcp/Makefile 2015-10-22 15:46:26.000000000 +0200 +@@ -17,7 +17,7 @@ OBJECTS=$(JOBJS) $(MHOBJS) $(MJOBJS) $(D + $(TCPOBJS) + EXECS=getzone zoneserver fetchzone + +-FLAGS = -DAUTHONLY ++FLAGS = -DAUTHONLY -DIPV6 + + all: $(EXECS) + @@ -25,11 +25,11 @@ clean: rm -f core $(EXECS) $(TCPOBJS) *.exe |