rpms/hesiod/devel hesiod-3.1.0-env.patch, NONE, 1.1 hesiod-3.1.0-dnsparse.patch, 1.2, 1.3 hesiod.spec, 1.29, 1.30 hesiod-3.0.2-env.patch, 1.2, NONE

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/hesiod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17484

Modified Files:
	hesiod-3.1.0-dnsparse.patch hesiod.spec 
Added Files:
	hesiod-3.1.0-env.patch 
Removed Files:
	hesiod-3.0.2-env.patch 
Log Message:
rebuild

hesiod-3.1.0-env.patch:

--- NEW FILE hesiod-3.1.0-env.patch ---
Ignore environment variables in setuid or setgid programs.  The glibc-internal
copy of the library already implements a similar check.

--- hesiod-3.0.2/hesiod.c	Wed Oct  3 14:53:37 2001
+++ hesiod-3.0.2/hesiod.c	Wed Oct  3 14:55:02 2001
@@ -52,6 +52,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <ctype.h>
 #include "hesiod.h"

@@ -79,13 +80,13 @@
   if (ctx)
     {
       *context = ctx;
-      configname = getenv("HESIOD_CONFIG");
+      configname = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HESIOD_CONFIG") : NULL;
       if (!configname)
 	configname = SYSCONFDIR "/hesiod.conf";
       if (read_config_file(ctx, configname) >= 0)
 	{
 	  /* The default rhs can be overridden by an environment variable. */
-	  p = getenv("HES_DOMAIN");
+	  p = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HES_DOMAIN") : NULL;
 	  if (p)
 	    {
 	      if (ctx->rhs)

hesiod-3.1.0-dnsparse.patch:

Index: hesiod-3.1.0-dnsparse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hesiod/devel/hesiod-3.1.0-dnsparse.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hesiod-3.1.0-dnsparse.patch	30 Mar 2006 22:15:59 -0000	1.2
+++ hesiod-3.1.0-dnsparse.patch	22 Jul 2008 20:09:39 -0000	1.3
@@ -2,17 +2,18 @@
 
 --- hesiod-3.1.0/hesiod.c	2006-03-30 13:22:57.000000000 -0500
 +++ hesiod-3.1.0/hesiod.c	2006-03-30 13:28:16.000000000 -0500
-@@ -327,7 +327,8 @@
+@@ -327,8 +327,9 @@
   */
  static char **get_txt_records(struct hesiod_p *ctx, const char *name)
  {
 -  unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP];
+-  int n;
 +  unsigned char qbuf[PACKETSZ], *abuf;
 +  char **tmp;
--  int n;
 +  int n, i, len;
  
    /* Make sure the resolver is initialized. */
+   if ((_res.options & RES_INIT) == 0 && res_init() == -1)
 @@ -343,14 +344,36 @@
      }
  


Index: hesiod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hesiod/devel/hesiod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- hesiod.spec	12 Jun 2008 22:45:06 -0000	1.29
+++ hesiod.spec	22 Jul 2008 20:09:39 -0000	1.30
@@ -1,9 +1,9 @@
 Name: hesiod
 Version: 3.1.0
-Release: 12
+Release: 13
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz
 Patch0: hesiod-3.1.0-classes.patch
-Patch1: hesiod-3.0.2-env.patch
+Patch1: hesiod-3.1.0-env.patch
 Patch2: hesiod-3.1.0-str.patch
 Patch3: hesiod-3.1.0-dnsparse.patch
 Patch4: hesiod-3.1.0-libresolv.patch
@@ -34,6 +34,9 @@
 the header files and libraries required for building programs which use Hesiod.
 
 %changelog
+* Tue Jul 22 2008 Nalin Dahyabhai <nalin at fedoraproject.org> - 3.1.0-13
+- rebuild
+
 * Thu Jun 12 2008 Nalin Dahyabhai <nalin at fedoraproject.org> - 3.1.0-12
 - call aclocal directly, because autoreconf didn't see the magic comment in
   the distributed version of aclocal.m4 which made it look like it was safe


--- hesiod-3.0.2-env.patch DELETED ---