Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (5b4ad09806a1f08fca94cff83975bf6051da32c6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (5b4ad09806a1f08fca94cff83975bf6051da32c6)
  • Date: Fri, 20 May 2011 15:14:06 -0500

GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:

net/maradns/BUILD | 12 ++----------
net/maradns/CONFIGURE | 4 ++--
net/maradns/DETAILS | 12 ++++++++----
net/maradns/HISTORY | 7 +++++++
net/maradns/INSTALL | 26 ++++----------------------
net/maradns/PREPARE | 8 ++++----
6 files changed, 27 insertions(+), 42 deletions(-)

New commits:
commit 5b4ad09806a1f08fca94cff83975bf6051da32c6
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

maradns: fixing documentation install

More appropriate documentation directory and don't auto-install docs

commit 341fc1bcf121c7b7f098d89a8bd3a933173a5475
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

maradns: Getting it to build and using appropriate variables

commit 762d8e4dc7e3d1ec94eeded9be79d77eb1bc751f
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

maradns: to version 2.0.02 various warnings and such

Will require manual intervention to actually update, if coming from 1.x

diff --git a/net/maradns/BUILD b/net/maradns/BUILD
index 5ceed33..f7aa716 100755
--- a/net/maradns/BUILD
+++ b/net/maradns/BUILD
@@ -1,10 +1,2 @@
-./configure $MARADNS_AUTHONLY &&
-
-# Always nagging about no jobserver
-make_single &&
-
-if list_find "$MARADNS_AUTHONLY" "--authonly"; then
- make FLAGS="$CFLAGS -Wall -DSELECT_PROBLEM -DAUTHONLY"
-else
- make FLAGS="$CFLAGS -Wall -DSELECT_PROBLEM"
-fi
+./configure $MARADNS_IPV6 &&
+make
diff --git a/net/maradns/CONFIGURE b/net/maradns/CONFIGURE
index d050369..ca32e4e 100755
--- a/net/maradns/CONFIGURE
+++ b/net/maradns/CONFIGURE
@@ -1,2 +1,2 @@
-config_query_option MARADNS_AUTHONLY "Do you want a authoritative-only build
of $SPELL?" n \
- "--authonly" ""
+config_query_option MARADNS_IPV6 "Include IPv6 Support?" n \
+ "--ipv6" ""
diff --git a/net/maradns/DETAILS b/net/maradns/DETAILS
index a872a64..539a8ef 100755
--- a/net/maradns/DETAILS
+++ b/net/maradns/DETAILS
@@ -1,5 +1,5 @@
SPELL=maradns
- VERSION=1.4.06
+ VERSION=2.0.02
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -9,11 +9,15 @@
SOURCE_GPG="maradns.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.maradns.org/
- SECURITY_PATCH=2
LICENSE[0]=BSD
ENTERED=20021019
- SHORT="MaraDNS is a authoritative and recursive DNS server."
+ DOC_DIRS=""
+ DOCS=""
+ SHORT="MaraDNS is a authoritative DNS server. Deadwood is a
recursive DNS server."
cat << EOF
-MaraDNS is a authoritative and recursive DNS server. It is written with
+MaraDNS is a authoritative DNS server. It is written with
security, simplicity, and performance in mind.
+
+In MaraDNS 2.x the recursive nameserver has been moved into deadwood.
+This spell provides both.
EOF
diff --git a/net/maradns/HISTORY b/net/maradns/HISTORY
index 240820a..eb12cfe 100644
--- a/net/maradns/HISTORY
+++ b/net/maradns/HISTORY
@@ -1,3 +1,10 @@
+2011-05-20 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: Version to 2.0.02
+ * PREPARE: Big fat upgrade warning
+ * CONFIGURE: enable ipv6 question only
+ * INSTALL: use the upstream provided install, setting the prefix
+ * BUILD: can't use any FLAGS, it fails. also, doesn't seem to care
about multiple make jobs anymore
+
2011-02-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.06, SECURITY_PATCH=2, CVE-2011-0520

diff --git a/net/maradns/INSTALL b/net/maradns/INSTALL
index fc194a2..76a2a47 100755
--- a/net/maradns/INSTALL
+++ b/net/maradns/INSTALL
@@ -1,22 +1,4 @@
-# Copy binaries
-if list_find "$MARADNS_AUTHONLY" "--authonly"; then
- install -v -m 750 server/maradns.authonly $INSTALL_ROOT/usr/sbin/maradns
-else
- install -v -m 750 server/maradns $INSTALL_ROOT/usr/sbin
-fi &&
-
-install -v -m 755 tools/askmara $INSTALL_ROOT/usr/bin &&
-install -v -m 755 tools/duende $INSTALL_ROOT/usr/bin &&
-install -v -m 755 tcp/getzone $INSTALL_ROOT/usr/bin &&
-install -v -m 755 tcp/fetchzone $INSTALL_ROOT/usr/bin &&
-install -v -m 750 tcp/zoneserver $INSTALL_ROOT/usr/sbin &&
-
-install_config_file doc/en/examples/example_full_mararc
$INSTALL_ROOT/etc/mararc &&
-install_config_file doc/en/examples/example_csv1
$INSTALL_ROOT/etc/maradns/db.example1.com &&
-install_config_file doc/en/examples/example_csv2
$INSTALL_ROOT/etc/maradns/db.example2.com &&
-mkdir -vp $INSTALL_ROOT/etc/maradns/logger
&&
-
-# Copy man pages
-for i in $( seq 1 8 ) ; do
- install -v -m 644 doc/en/man/*.$i $INSTALL_ROOT/usr/share/man/man$i >
/dev/null 2>&1
-done
+# this sets the appropriate prefix for installation
+# fix the docs installing stupidity
+sedit s/DOCS=.*/DOCS="\$PREFIX/share/doc/maradns-\$VERSION"/
build/install.locations &&
+PREFIX=${INSTALL_ROOT}/usr make install
diff --git a/net/maradns/PREPARE b/net/maradns/PREPARE
index 147f487..15b905d 100755
--- a/net/maradns/PREPARE
+++ b/net/maradns/PREPARE
@@ -1,10 +1,10 @@
-if [[ "$(installed_version maradns)" == "1.0.32" ]]
+if spell_ok maradns && [[ $(installed_version maradns) < 2 ]]
then
- message "This is possibly an ${WARNING_COLOR}INCOMPATIBLE${DEFAULT_COLOR}
upgrade to maradns." &&
- message "Please check:
${WARNING_COLOR}http://www.maradns.org/tutorial/1.2/update.html${DEFAULT_COLOR}";
&&
+ message "This is an ${WARNING_COLOR}INCOMPATIBLE${DEFAULT_COLOR} upgrade
to maradns." &&
+ message "Please check:
${WARNING_COLOR}http://www.maradns.org/tutorial/update.html#2.0${DEFAULT_COLOR}";
&&
message "for more information." &&

- if ! query "Do you wish to procede with this upgrade?" n ; then
+ if ! query "Do you wish to proceed with this upgrade?" n ; then
return 1
fi
fi



  • [SM-Commit] GIT changes to master grimoire by David Kowis (5b4ad09806a1f08fca94cff83975bf6051da32c6), David Kowis, 05/20/2011

Archive powered by MHonArc 2.6.24.

Top of Page