Package: mydns-pgsql
Version: 1:1.1.0-7
Severity: wishlist
Tags: patch
Hi,
I was having some problems with mydns-pgsql 1:1.1.0-7 running under
OpenVZ hitting various memory limits. While trying to debug it, I've
tried installing the new version 1.2.4 which may be a fork, see
http://sourceforge.net/mailarchive/forum.php?thread_name=4729b36f.9rlxdwZYEPt6ppb2%25mjr%40phonecoop.coop&forum_name=mydns-users
The changes to the debian directory from 1:1.1.0-7 are attached.
Feel free to ping me if you want to know whether it solved the
limits-hitting. Initial signs are good.
Dependencies of mydns-pgsql:
ii libc6 2.3.6.ds1-13et GNU C Library: Shared libraries
ii libpq4 8.1.9-0etch1 PostgreSQL C client library
ii postgresql-cli 7.5.22 front-end programs for PostgreSQL (transitio
Hope that helps someone,
--
MJR/slef
My Opinion Only: see http://people.debian.org/~mjr/
Please follow http://www.uk.debian.org/MailingLists/#codeofconduct
diff -ruN mydns-1.1.0/debian/changelog mydns-1.2.4/debian/changelog
--- mydns-1.1.0/debian/changelog 2007-11-12 13:56:50.000000000 +0000
+++ mydns-1.2.4/debian/changelog 2007-11-12 15:06:40.000000000 +0000
@@ -1,3 +1,14 @@
+mydns (1:1.2.4-1) unstable; urgency=low
+
+ * Port debian patches to new upstream's new version 1.2.4
+ * Update debian/patches/01-nogroup-fix.dpatch to match new source
+ * Remove debian/patches/03-mydnscheck-alias.dpatch due to upstream
+ inclusion
+ * Add libecpg-dev to Build-Depends due to cidr.c:21 wanting
+ pgtypes_timestamp.h
+
+ -- MJ Ray (Debian) <[EMAIL PROTECTED]> Mon, 12 Nov 2007 15:06:34 +0000
+
mydns (1:1.1.0-7) unstable; urgency=low
* Added new translations, l10n-only update
diff -ruN mydns-1.1.0/debian/control mydns-1.2.4/debian/control
--- mydns-1.1.0/debian/control 2007-11-12 13:56:50.000000000 +0000
+++ mydns-1.2.4/debian/control 2007-11-12 14:56:39.000000000 +0000
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Philipp Kern <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.68), libmysqlclient15-dev, zlib1g-dev,
texinfo, po-debconf, libpq-dev, dpatch, autoconf, automake1.9
+Build-Depends: debhelper (>= 4.1.68), libmysqlclient15-dev, zlib1g-dev,
texinfo, po-debconf, libpq-dev, dpatch, autoconf, automake1.9, libecpg-dev
Build-Conflicts: autoconf2.13, automake1.4
Standards-Version: 3.6.2
diff -ruN mydns-1.1.0/debian/patches/00list mydns-1.2.4/debian/patches/00list
--- mydns-1.1.0/debian/patches/00list 2007-11-12 13:56:50.000000000 +0000
+++ mydns-1.2.4/debian/patches/00list 2007-11-12 14:29:10.000000000 +0000
@@ -1,3 +1,2 @@
01-nogroup-fix.dpatch
02-disable-static-build.dpatch
-03-mydnscheck-alias.dpatch
diff -ruN mydns-1.1.0/debian/patches/01-nogroup-fix.dpatch
mydns-1.2.4/debian/patches/01-nogroup-fix.dpatch
--- mydns-1.1.0/debian/patches/01-nogroup-fix.dpatch 2007-11-12
13:56:50.000000000 +0000
+++ mydns-1.2.4/debian/patches/01-nogroup-fix.dpatch 2007-11-12
14:20:56.000000000 +0000
@@ -4,14 +4,14 @@
## DP: Debian uses `nogroup' instead of `nobody' as the low-priviledge group
@DPATCH@
---- mydns/src/mydns/conf.c.orig 2006-04-07 20:51:31.000000000 +0200
-+++ mydns/src/mydns/conf.c 2006-04-07 20:51:42.000000000 +0200
-@@ -68,7 +68,7 @@
- { "-", NULL,
N_("GENERAL OPTIONS")},
+--- mydns/src/mydns/conf.c.orig 2007-11-12 14:18:32.000000000 +0000
++++ mydns/src/mydns/conf.c 2007-11-12 14:18:44.000000000 +0000
+@@ -80,7 +80,7 @@
+ { "-", NULL, N_("GENERAL
OPTIONS")},
- { "user", "nobody",
N_("Run with the permissions of this user")},
--{ "group", "nobody",
N_("Run with the permissions of this group")},
-+{ "group", "nogroup",
N_("Run with the permissions of this group")},
- { "listen", "*",
N_("Listen on these addresses ('*' for all)"), "bind"},
- { "no-listen", "",
N_("Do not listen on these addresses")},
+ { "user", "nobody", N_("Run with
the permissions of this user")},
+-{ "group", "nobody", N_("Run with
the permissions of this group")},
++{ "group", "nogroup", N_("Run with
the permissions of this group")},
+ { "listen", "*", N_("Listen on
these addresses ('*' for all)"), "bind"},
+ { "no-listen", "", N_("Do not
listen on these addresses")},
diff -ruN mydns-1.1.0/debian/patches/03-mydnscheck-alias.dpatch
mydns-1.2.4/debian/patches/03-mydnscheck-alias.dpatch
--- mydns-1.1.0/debian/patches/03-mydnscheck-alias.dpatch 2007-11-12
13:56:50.000000000 +0000
+++ mydns-1.2.4/debian/patches/03-mydnscheck-alias.dpatch 1970-01-01
01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-mydnscheck-alias.dpatch by Philipp Kern <[EMAIL PROTECTED]>
-##
-## DP: Fix mydnscheck's ALIAS handling (Patch by Patrick Coleman)
-
[EMAIL PROTECTED]@
-diff -ur mydns-1.1.0-clean/src/util/check.c mydns-1.1.0/src/util/check.c
---- mydns-1.1.0-clean/src/util/check.c 2005-05-05 00:49:59.000000000 +0800
-+++ mydns-1.1.0/src/util/check.c 2006-04-10 20:33:59.000000000 +0800
-@@ -248,19 +248,20 @@
-
/**************************************************************************************************
- SHORTNAME
- Removes the origin from a name if it is present.
-+ If empty_name_is_ok is nonzero, then return "" if the empty string
matches the origin.
-
**************************************************************************************************/
- static char *
- shortname(char *name_to_shorten, int empty_name_is_ok)
- {
- size_t nlen = strlen(name_to_shorten), olen = strlen(soa->origin);
-
-- if (nlen < olen)
-+ if (nlen < olen)
- return (name_to_shorten);
- if (!strcasecmp(soa->origin, name_to_shorten))
- {
-- if (empty_name_is_ok)
-+ if (empty_name_is_ok)
- return ("");
-- else
-+ else
- return (name_to_shorten);
- }
- if (!strcasecmp(name_to_shorten + nlen - olen, soa->origin))
-@@ -396,18 +397,19 @@
- if (!(xname = calloc(strlen(name) * 2 + 1, sizeof(unsigned char))))
- Err(_("out of memory"));
- sql_escstr(sql, xname, (unsigned char *)name, strlen(name));
-- found = sql_count(sql, "SELECT COUNT(*) FROM %s WHERE zone=%u AND
name='%s' AND type != 'CNAME'",
-+ found = sql_count(sql, "SELECT COUNT(*) FROM %s WHERE zone=%u AND
name='%s' AND type != 'CNAME' AND type != 'ALIAS'",
-
mydns_rr_table_name, rr->zone, xname);
-
- /* If not found that way, check short name */
- if (!found)
- {
- Free(xname);
-- shortname(name, 1);
-- if (!(xname = calloc(strlen(name) * 2 + 1, sizeof(unsigned
char))))
-+
-+ if (!(xname = calloc(strlen(shortname(name, 1)) * 2 + 1,
sizeof(unsigned char))))
- Err(_("out of memory"));
-- sql_escstr(sql, xname, (unsigned char *)name, strlen(name));
-- found = sql_count(sql, "SELECT COUNT(*) FROM %s WHERE zone=%u
AND name='%s' AND type != 'CNAME'",
-+
-+ sql_escstr(sql, xname, (unsigned char *)shortname(name, 1),
strlen(shortname(name, 1)));
-+ found = sql_count(sql, "SELECT COUNT(*) FROM %s WHERE zone=%u
AND name='%s' AND type != 'CNAME' AND type != 'ALIAS'",
-
mydns_rr_table_name, rr->zone, xname);
- EXPAND_DATA(name);
- }
diff -ruN mydns-1.1.0/debian/watch mydns-1.2.4/debian/watch
--- mydns-1.1.0/debian/watch 2007-11-12 13:56:50.000000000 +0000
+++ mydns-1.2.4/debian/watch 2007-11-12 15:07:26.000000000 +0000
@@ -1,3 +1,3 @@
version=2
-http://mydns.bboy.net/download/mydns-(.*)\.tar\.gz
+http://mydns.grid.net.ru/mydns-(.*)\.tar\.gz
