diff options
author | Raúl Porcel <armin76@gentoo.org> | 2008-03-07 18:36:33 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2008-03-07 18:36:33 +0000 |
commit | 964bc679f37472aebda6dde1c13f78a6fcf52b6f (patch) | |
tree | 6510784b6e990a80a1e7baf993eab28b7282a5d5 /net-dns/hesiod/files | |
parent | QA cleanup: Shorten DESCRIPTION. (diff) | |
download | gentoo-2-964bc679f37472aebda6dde1c13f78a6fcf52b6f.tar.gz gentoo-2-964bc679f37472aebda6dde1c13f78a6fcf52b6f.tar.bz2 gentoo-2-964bc679f37472aebda6dde1c13f78a6fcf52b6f.zip |
cleanup
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-dns/hesiod/files')
-rw-r--r-- | net-dns/hesiod/files/hesiod-3.0.2-env.patch | 27 | ||||
-rw-r--r-- | net-dns/hesiod/files/hesiod-3.0.2-shlib.patch | 50 | ||||
-rw-r--r-- | net-dns/hesiod/files/hesiod-3.0.2-str.patch | 68 |
3 files changed, 0 insertions, 145 deletions
diff --git a/net-dns/hesiod/files/hesiod-3.0.2-env.patch b/net-dns/hesiod/files/hesiod-3.0.2-env.patch deleted file mode 100644 index 444cc3b539f0..000000000000 --- a/net-dns/hesiod/files/hesiod-3.0.2-env.patch +++ /dev/null @@ -1,27 +0,0 @@ -Ignore environment variables in setuid or setgid programs. ---- 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" - #include "hesiod_p.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) diff --git a/net-dns/hesiod/files/hesiod-3.0.2-shlib.patch b/net-dns/hesiod/files/hesiod-3.0.2-shlib.patch deleted file mode 100644 index 128db5a24dbf..000000000000 --- a/net-dns/hesiod/files/hesiod-3.0.2-shlib.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- hesiod-3.0.2/Makefile.in Fri Oct 5 15:43:35 2001 -+++ hesiod-3.0.2/Makefile.in Fri Oct 5 15:47:42 2001 -@@ -21,20 +21,24 @@ - CFLAGS=@CFLAGS@ - LDFLAGS=@LDFLAGS@ - LIBS=@LIBS@ --ALL_CFLAGS=-I. -DSYSCONFDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} -+ALL_CFLAGS=-I. -DSYSCONFDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} -fPIC - OBJS=hesiod.o hesmailhost.o hespwnam.o hesservbyname.o hescompat.o -+SOVERSION=0 - --all: libhesiod.a hesinfo hestest -+all: libhesiod.a hesinfo hestest libhesiod.so.$(SOVERSION) -+ -+libhesiod.so.$(SOVERSION): ${OBJS} -+ $(LD) -G -o $@ -soname=$@ ${OBJS} ${LIBS} -lc - - libhesiod.a: ${OBJS} - ar cru $@ ${OBJS} - ${RANLIB} $@ - --hesinfo: hesinfo.o libhesiod.a -- ${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.a ${LIBS} -+hesinfo: hesinfo.o libhesiod.so.$(SOVERSION) -+ ${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.so.$(SOVERSION) ${LIBS} - --hestest: hestest.o libhesiod.a -- ${CC} ${LDFLAGS} -o $@ hestest.o libhesiod.a ${LIBS} -+hestest: hestest.o libhesiod.so.$(SOVERSION) -+ ${CC} ${LDFLAGS} -o $@ hestest.o libhesiod.so.$(SOVERSION) ${LIBS} - - ${OBJS}: hesiod.h resscan.h - -@@ -42,6 +46,7 @@ - ${CC} -c ${ALL_CFLAGS} $< - - check: -+ LD_LIBRARY_PATH="`pwd`":"$(LD_LIBRARY_PATH)" \ - HESIOD_CONFIG=${srcdir}/hesiod.config.sample \ - ./hestest ${srcdir}/hestest.conf - -@@ -55,6 +60,8 @@ - ${INSTALL} -c -m 644 libhesiod.a ${DESTDIR}${libdir} - ${RANLIB} ${DESTDIR}${libdir}/libhesiod.a - chmod u-w ${DESTDIR}${libdir}/libhesiod.a -+ ${INSTALL} -c -m 755 libhesiod.so.$(SOVERSION) ${DESTDIR}${libdir} -+ ln -s libhesiod.so.$(SOVERSION) ${DESTDIR}${libdir}/libhesiod.so - ${INSTALL_PROGRAM} -c -m 555 hesinfo ${DESTDIR}${lbindir} - ${INSTALL} -c -m 444 ${srcdir}/hesiod.h ${DESTDIR}${includedir} - ${INSTALL} -c -m 444 ${srcdir}/hesinfo.1 ${DESTDIR}${mandir}/man1 diff --git a/net-dns/hesiod/files/hesiod-3.0.2-str.patch b/net-dns/hesiod/files/hesiod-3.0.2-str.patch deleted file mode 100644 index a763e539105d..000000000000 --- a/net-dns/hesiod/files/hesiod-3.0.2-str.patch +++ /dev/null @@ -1,68 +0,0 @@ -There are a few places where untrusted information could cause problems. -There's a bug in the configuration file parser that might result in an -LHS= modifying the rhs setting. -The case-insensitive comparison routine is probably called safely (with the -second argument at least as long as the first), but it looks weird. ---- hesiod-3.0.2/hesiod.c Wed Oct 3 15:16:17 2001 -+++ hesiod-3.0.2/hesiod.c Wed Oct 3 15:33:41 2001 -@@ -138,7 +138,8 @@ - const char *rhs; - int len; - -- strcpy(bindname, name); -+ strncpy(bindname, name, sizeof(bindname) - 1); -+ bindname[sizeof(bindname) - 1] = 0; - - /* Find the right right hand side to use, possibly truncating bindname. */ - p = strchr(bindname, '@'); -@@ -288,7 +289,7 @@ - - if (cistrcmp(key, "lhs") == 0 || cistrcmp(key, "rhs") == 0) - { -- which = (strcmp(key, "lhs") == 0) ? &ctx->lhs : &ctx->rhs; -+ which = (cistrcmp(key, "lhs") == 0) ? &ctx->lhs : &ctx->rhs; - *which = malloc(strlen(data) + 1); - if (!*which) - { -@@ -462,7 +463,7 @@ - - static int cistrcmp(const char *s1, const char *s2) - { -- while (*s1 && tolower(*s1) == tolower(*s2)) -+ while (*s1 && *s2 && tolower(*s1) == tolower(*s2)) - { - s1++; - s2++; ---- hesiod-3.0.2/hespwnam.c Wed Oct 3 15:29:40 2001 -+++ hesiod-3.0.2/hespwnam.c Wed Oct 3 15:29:43 2001 -@@ -39,9 +39,16 @@ - - struct passwd *hesiod_getpwuid(void *context, uid_t uid) - { -- char uidstr[16]; -+ char uidstr[32]; - -- sprintf(uidstr, "%d", uid); -- return getpwcommon(context, uidstr, 1); -+ if (snprintf(uidstr, sizeof(uidstr), "%ld", (long)uid) < sizeof(uidstr)) -+ { -+ return getpwcommon(context, uidstr, 1); -+ } -+ else -+ { -+ errno = ERANGE; -+ return NULL; -+ } - } - ---- hesiod-3.0.2/hesservbyname.c Wed Oct 3 15:33:25 2001 -+++ hesiod-3.0.2/hesservbyname.c Wed Oct 3 15:33:22 2001 -@@ -188,7 +188,7 @@ - - static int cistrcmp(const char *s1, const char *s2) - { -- while (*s1 && tolower(*s1) == tolower(*s2)) -+ while (*s1 && *s2 && tolower(*s1) == tolower(*s2)) - { - s1++; - s2++; |