[pkgsrc/pkgsrc-2005Q1]: pkgsrc/net/maradns Pullup ticket 501 - requested by L...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/net/maradns Pullup ticket 501 - requested by L...
From: snj <snj%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:32:02 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ddf2cc68ff2
branches:  pkgsrc-2005Q1
changeset: 491047:6ddf2cc68ff2
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat May 14 06:00:25 2005 +0000

description:
Pullup ticket 501 - requested by Lubomir Sedlacik
security fix for maradns

Revisions pulled up:
- pkgsrc/net/maradns/DESCR              1.2
- pkgsrc/net/maradns/Makefile           1.14
- pkgsrc/net/maradns/PLIST              1.4
- pkgsrc/net/maradns/distinfo           1.6
- pkgsrc/net/maradns/patches/patch-aa   1.3
- pkgsrc/net/maradns/patches/patch-ae   1.1
- pkgsrc/net/maradns/patches/patch-af   1.1
- pkgsrc/net/maradns/patches/patch-ag   1.1
- pkgsrc/net/maradns/patches/patch-ah   1.1
- pkgsrc/net/maradns/patches/patch-ai   1.1
- pkgsrc/net/maradns/patches/patch-aj   1.1

    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Fri May 13 13:25:55 UTC 2005

    Modified Files:
            pkgsrc/net/maradns: DESCR Makefile PLIST distinfo
            pkgsrc/net/maradns/patches: patch-aa
    Added Files:
            pkgsrc/net/maradns/patches: patch-ae patch-af patch-ag patch-ah
                patch-ai patch-aj

    Log Message:
    Update to version 1.0.28

    Too many changes to list, see CHANGELOG within the source tarball.
    This update was prompted by an issue with random number generator,
    see the following url for details:

     http://www.maradns.org/download/patches/maradns-1.0.26-rekey_rng

diffstat:

 net/maradns/DESCR            |   2 +-
 net/maradns/Makefile         |  11 +++++------
 net/maradns/PLIST            |  22 ++++++++++++----------
 net/maradns/distinfo         |  16 +++++++++++-----
 net/maradns/patches/patch-aa |  16 ++++++++--------
 net/maradns/patches/patch-ae |  13 +++++++++++++
 net/maradns/patches/patch-af |  11 +++++++++++
 net/maradns/patches/patch-ag |  13 +++++++++++++
 net/maradns/patches/patch-ah |  13 +++++++++++++
 net/maradns/patches/patch-ai |  13 +++++++++++++
 net/maradns/patches/patch-aj |  30 ++++++++++++++++++++++++++++++
 11 files changed, 130 insertions(+), 30 deletions(-)

diffs (272 lines):

diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/DESCR
--- a/net/maradns/DESCR Sat May 14 05:49:55 2005 +0000
+++ b/net/maradns/DESCR Sat May 14 06:00:25 2005 +0000
@@ -2,7 +2,7 @@
 essential internet service. MaraDNS is intended for environments where a DNS
 server must be secure and where the server must use the absolute minimum
 number of resources possible. MaraDNS was created in response to issues
-people had with the DNS servers available in early 2001; and has the 
+people had with the DNS servers available in early 2001; and has the
 following design goals:
 
 Security-aware programming. A DNS server needs to be secure. I have a number
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/Makefile
--- a/net/maradns/Makefile      Sat May 14 05:49:55 2005 +0000
+++ b/net/maradns/Makefile      Sat May 14 06:00:25 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2005/03/14 23:41:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2005/05/14 06:00:25 snj Exp $
 
-DISTNAME=      maradns-1.0.18
-PKGREVISION=   3
+DISTNAME=      maradns-1.0.28
 CATEGORIES=    net
 MASTER_SITES=  http://www.maradns.org/download/
 EXTRACT_SUFX=  .tar.bz2
@@ -24,12 +23,12 @@
 LDFLAGS+=      ${PTHREAD_LIBS}
 
 post-patch:
-       ${SED} -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},                        \
+       @${SED} -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},                       \
            ${WRKSRC}/parse/ParseMaraRc.c > ${WRKSRC}/parse/ParseMaraRc.sed
-       ${MV} ${WRKSRC}/parse/ParseMaraRc.sed ${WRKSRC}/parse/ParseMaraRc.c
+       @${MV} ${WRKSRC}/parse/ParseMaraRc.sed ${WRKSRC}/parse/ParseMaraRc.c
 
 post-install:
-       ${MV} ${PREFIX}/share/doc/maradns/examples \
+       @${MV} ${PREFIX}/share/doc/maradns/examples \
                ${PREFIX}/share/examples/maradns
 
 .include "../../mk/bsd.pkg.mk"
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/PLIST
--- a/net/maradns/PLIST Sat May 14 05:49:55 2005 +0000
+++ b/net/maradns/PLIST Sat May 14 06:00:25 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/23 22:07:56 reed Exp $
+@comment $NetBSD: PLIST,v 1.3.8.1 2005/05/14 06:00:25 snj Exp $
 bin/askmara
 bin/getzone
 man/man1/askmara.1
@@ -15,7 +15,6 @@
 share/doc/maradns/changelog.html
 share/doc/maradns/changelog.txt
 share/doc/maradns/credits.txt
-share/doc/maradns/download.html
 share/doc/maradns/faq.html
 share/doc/maradns/faq.txt
 share/doc/maradns/files.txt
@@ -32,6 +31,10 @@
 share/doc/maradns/maradns.pgp.key
 share/doc/maradns/misc/0README
 share/doc/maradns/misc/RFC1035.compliance
+share/doc/maradns/misc/TODO.done
+share/doc/maradns/misc/TODO.first
+share/doc/maradns/misc/TODO.second
+share/doc/maradns/misc/TODO.third
 share/doc/maradns/misc/cache.poison.protection
 share/doc/maradns/misc/decompress_api.abw
 share/doc/maradns/misc/decompress_api.html
@@ -121,7 +124,6 @@
 share/doc/maradns/source/credits.embed
 share/doc/maradns/source/csv1.ej
 share/doc/maradns/source/data_structures.ej
-share/doc/maradns/source/download.ej
 share/doc/maradns/source/ej.doc.format
 share/doc/maradns/source/ej.template
 share/doc/maradns/source/example_auth_mararc
@@ -163,14 +165,14 @@
 share/examples/maradns/example_mararc
 share/examples/maradns/example_recursive_mararc.txt
 @dirrm share/examples/maradns
-@dirrm share/doc/maradns/man
-@dirrm share/doc/maradns/misc/js-manpages
-@dirrm share/doc/maradns/misc/man_macros
-@dirrm share/doc/maradns/misc/rfc
+@dirrm share/doc/maradns/tutorial
+@dirrm share/doc/maradns/source
+@dirrm share/doc/maradns/ps
 @dirrm share/doc/maradns/misc/spammers/hiddenonline
 @dirrm share/doc/maradns/misc/spammers
+@dirrm share/doc/maradns/misc/rfc
+@dirrm share/doc/maradns/misc/man_macros
+@dirrm share/doc/maradns/misc/js-manpages
 @dirrm share/doc/maradns/misc
-@dirrm share/doc/maradns/ps
-@dirrm share/doc/maradns/source
-@dirrm share/doc/maradns/tutorial
+@dirrm share/doc/maradns/man
 @dirrm share/doc/maradns
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/distinfo
--- a/net/maradns/distinfo      Sat May 14 05:49:55 2005 +0000
+++ b/net/maradns/distinfo      Sat May 14 06:00:25 2005 +0000
@@ -1,9 +1,15 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:52 agc Exp $
+$NetBSD: distinfo,v 1.5.2.1 2005/05/14 06:00:25 snj Exp $
 
-SHA1 (maradns-1.0.18.tar.bz2) = 788b875bed781f11dea8f4d38209e4bd49dc42d8
-RMD160 (maradns-1.0.18.tar.bz2) = 6d7abffa321d093a3ab59ab8e3497fec589016a1
-Size (maradns-1.0.18.tar.bz2) = 414047 bytes
-SHA1 (patch-aa) = c33101aacf39c6cf4fe361d82c7e48882a33e37c
+SHA1 (maradns-1.0.28.tar.bz2) = 3f691dc293dba83569ece6e372ac2fd22b8ddd5c
+RMD160 (maradns-1.0.28.tar.bz2) = 8a72bf66e05dc9509e6567d953808de8e42cfa00
+Size (maradns-1.0.28.tar.bz2) = 477588 bytes
+SHA1 (patch-aa) = b3d7aa88885167f53b2a956ea0563a58455172ca
 SHA1 (patch-ab) = 664188f15cc8068fb8d7572d2fef7870cd998ab7
 SHA1 (patch-ac) = 62bc0b967a16cf4a452b3132e11851078ee73af1
 SHA1 (patch-ad) = c824827384ab30aafb6a110daabb3f38f58b9599
+SHA1 (patch-ae) = 2bc8c94f70d6bc0e4ef91338c94c199f169f2724
+SHA1 (patch-af) = a3e1159c32c1a3de754d15b319589b931a29ea83
+SHA1 (patch-ag) = 08e706dd2847ba4b1104664d320cc969f8432e6a
+SHA1 (patch-ah) = 727d35feb4861746800be5d61610a1c24cd87cc4
+SHA1 (patch-ai) = 626d6a29e1f0286efd2b2b6acd25fbfcfde42272
+SHA1 (patch-aj) = c8c93bc419c8dd337fcdd45451e85138a5d020d3
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/patches/patch-aa
--- a/net/maradns/patches/patch-aa      Sat May 14 05:49:55 2005 +0000
+++ b/net/maradns/patches/patch-aa      Sat May 14 06:00:25 2005 +0000
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2003/11/14 21:19:03 cube Exp $
+$NetBSD: patch-aa,v 1.2.12.1 2005/05/14 06:00:25 snj Exp $
 
---- server/Makefile.orig       2002-08-27 05:11:46.000000000 +0200
-+++ server/Makefile
-@@ -15,7 +15,7 @@ EXECS=maradns
+--- server/Makefile.orig       2005-05-07 04:52:38.000000000 +0200
++++ server/Makefile    2005-05-13 14:46:01.000000000 +0200
+@@ -15,7 +15,7 @@
  #FLAGS = -g $(DEBUG) -DNOTHREAD -DDEBUG
  #FLAGS = -g -DDEBUG_MEMORY $(DEBUG) 
  #FLAGS = -g $(DEBUG) 
--FLAGS = -O2 -Wall $(DEBUG)
-+FLAGS = -O2 -Wall $(DEBUG) ${CFLAGS}
+-FLAGS = -g -O2 -Wall $(DEBUG) $(DEFINES)
++FLAGS = -g -O2 -Wall $(DEBUG) $(DEFINES) $(CFLAGS)
  
  all: $(EXECS)
  
-@@ -35,5 +35,5 @@ timestamp.o: timestamp.c MaraDNS_locale.
+@@ -35,5 +35,5 @@
        $(CC) -c $(FLAGS) -o timestamp.o timestamp.c
  
  maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
 -      $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
-+      $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) ${LDFLAGS}
++      $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) $(LDFLAGS)
  
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/maradns/patches/patch-ae      Sat May 14 06:00:25 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.2.2 2005/05/14 06:00:25 snj Exp $
+
+--- dns/Makefile.orig  2003-08-02 21:39:36.000000000 +0200
++++ dns/Makefile       2005-05-13 14:52:40.000000000 +0200
+@@ -3,7 +3,7 @@
+ MJOBJS=../libs/MaraHash.o
+ OBJECTS=$(DOBJECTS) $(JOBJS) $(MJOBJS)
+ 
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: Queries.o Compress.o bobbit.o Decompress.o
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/maradns/patches/patch-af      Sat May 14 06:00:25 2005 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-af,v 1.1.2.2 2005/05/14 06:00:25 snj Exp $
+
+--- libs/Makefile.orig 2003-08-02 21:39:36.000000000 +0200
++++ libs/Makefile      2005-05-13 14:53:39.000000000 +0200
+@@ -1,5 +1,5 @@
+ OBJECTS = JsStr.o JsStrOS.o JsStrCP.o MaraHash.o
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS)
+ #FLAGS = -g -DDEBUG -DTHREADS
+ #FLAGS = -g $(DEBUG)
+ 
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/maradns/patches/patch-ag      Sat May 14 06:00:25 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.2.2 2005/05/14 06:00:25 snj Exp $
+
+--- rng/Makefile.orig  2003-08-02 21:39:36.000000000 +0200
++++ rng/Makefile       2005-05-13 14:54:31.000000000 +0200
+@@ -5,7 +5,7 @@
+ OBJECTS=$(ROBJECTS)
+ TABLES=rng-32bit-tables.h
+ 
+-FLAGS = -g -O2 -Wall
++FLAGS = -g -O2 -Wall $(CFLAGS)
+ #FLAGS = -g
+ 
+ all: $(ROBJECTS) 
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/maradns/patches/patch-ah      Sat May 14 06:00:25 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.2.2 2005/05/14 06:00:25 snj Exp $
+
+--- tools/Makefile.orig        2003-08-02 21:39:36.000000000 +0200
++++ tools/Makefile     2005-05-13 14:56:09.000000000 +0200
+@@ -7,7 +7,7 @@
+ POBJECTS=../parse/ParseCsv1.o ../parse/ParseMaraRc.o
+ EXECS=askmara strip.control benchmark 
+ 
+-FLAGS = -g -O2 $(DEBUG)
++FLAGS = -g -O2 $(DEBUG) $(CFLAGS) $(LDFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: $(EXECS)
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/maradns/patches/patch-ai      Sat May 14 06:00:25 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.2.2 2005/05/14 06:00:25 snj Exp $
+
+--- tuzona/Makefile.orig       2003-08-02 21:39:36.000000000 +0200
++++ tuzona/Makefile    2005-05-13 14:57:53.000000000 +0200
+@@ -6,7 +6,7 @@
+ OBJECTS=$(JOBJS) $(MJOBJS) $(DOBJECTS) $(POBJECTS) $(SOBJECTS)
+ EXECS=getzone zoneserver
+ 
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS) $(LDFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: $(EXECS)
diff -r becd54630c98 -r 6ddf2cc68ff2 net/maradns/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/maradns/patches/patch-aj      Sat May 14 06:00:25 2005 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-aj,v 1.1.2.2 2005/05/14 06:00:25 snj Exp $
+
+--- parse/Makefile.orig        2003-08-02 21:39:36.000000000 +0200
++++ parse/Makefile     2005-05-13 15:02:44.000000000 +0200
+@@ -5,10 +5,12 @@
+ OBJECTS=$(JOBJS) $(MJOBJS) $(POBJECTS) $(DOBJECTS)
+ EXECS=parsetest parsetest2
+ 
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+-all: $(EXECS)
++all: $(POBJECTS)
++
++test: $(EXECS)
+ 
+ clean:
+       rm -f $(POBJECTS) core $(EXECS) 
+@@ -26,8 +28,8 @@
+       $(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
+ 
+ parsetest: parsetest.c $(OBJECTS) 
+-      $(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
++      $(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) $(LDFLAGS)
+ 
+ parsetest2: parsetest2.c $(OBJECTS) 
+-      $(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
++      $(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) $(LDFLAGS)
+
Prev by Date: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/graphics/libexif Pullup ticket 500 - requested...
Next by Date: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/doc Tickets 500-502.
Previous by Thread: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/graphics/libexif Pullup ticket 500 - requested...
Next by Thread: [pkgsrc/pkgsrc-2005Q1]: pkgsrc/doc Tickets 500-502.
Indexes:
Home | Main Index | Thread Index | Old Index