From c917f32434779a8f952e26b40eeedd0d5c576ffc Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 2 Dec 2008 15:42:29 +0000 Subject: [PATCH 01/30] - adjust the package summary --- hesiod.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hesiod.spec b/hesiod.spec index 467fc4b..7f0a346 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 13 +Release: 14 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch0: hesiod-3.1.0-classes.patch Patch1: hesiod-3.1.0-env.patch @@ -8,7 +8,7 @@ Patch2: hesiod-3.1.0-str.patch Patch3: hesiod-3.1.0-dnsparse.patch Patch4: hesiod-3.1.0-libresolv.patch Patch5: hesiod-3.1.0-perms.patch -Summary: Hesiod libraries. +Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries License: MIT Buildroot: %{_tmppath}/hesiod-root @@ -34,6 +34,9 @@ ensure synchronize the files among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Tue Dec 2 2008 Nalin Dahyabhai - 3.1.0-14 +- adjust the package summary + * Tue Jul 22 2008 Nalin Dahyabhai - 3.1.0-13 - rebuild From 1da1de905c6c88ef1c18a79e801fba6b300e1561 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 2 Dec 2008 20:44:20 +0000 Subject: [PATCH 02/30] fixup building --- hesiod.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hesiod.spec b/hesiod.spec index 7f0a346..cf0db4f 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -201,10 +201,9 @@ the header files and libraries required for building programs which use Hesiod. %patch3 -p1 -b .dnsparse %patch4 -p1 -b .libresolv %patch5 -p1 -b .perms -# We call aclocal here because autoreconf doesn't see a 'generated by aclocal' -# comment in the already-present aclocal.m4 file, so it doesn't run it for us. +libtoolize -f -i aclocal -autoreconf -f -i -v +autoconf -f -i %build %configure From aedd6b17bca74cf3f69600f470b983d74e19a04a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 03:41:12 +0000 Subject: [PATCH 03/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index cf0db4f..71fa9c0 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 14 +Release: 15 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch0: hesiod-3.1.0-classes.patch Patch1: hesiod-3.1.0-env.patch @@ -34,6 +34,9 @@ ensure synchronize the files among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 3.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Dec 2 2008 Nalin Dahyabhai - 3.1.0-14 - adjust the package summary From a034795a14f356d9726992a7dbc40057637749a4 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 02:07:48 +0000 Subject: [PATCH 04/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 71fa9c0..90fc725 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 15 +Release: 16 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch0: hesiod-3.1.0-classes.patch Patch1: hesiod-3.1.0-env.patch @@ -34,6 +34,9 @@ ensure synchronize the files among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 3.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 73b38e00742042b802e8c5eb8822373b68dbc946 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 13 Oct 2009 15:54:35 +0000 Subject: [PATCH 05/30] add a disttag --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 90fc725..9d359c0 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 16 +Release: 17%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch0: hesiod-3.1.0-classes.patch Patch1: hesiod-3.1.0-env.patch @@ -34,6 +34,9 @@ ensure synchronize the files among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Tue Oct 13 2009 Nalin Dahyabhai - 3.1.0-17 +- add a disttag + * Fri Jul 24 2009 Fedora Release Engineering - 3.1.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 7cc3eee109261d9599fdd112438dabdd7556460b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:54:52 +0000 Subject: [PATCH 06/30] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 85998f2..f9b3b1b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: hesiod -# $Id: Makefile,v 1.1 2004/09/09 06:05:47 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:51:55 notting Exp $ NAME := hesiod SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From df88dda0bfc2d22aa56b946d67d360cdd17605d8 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Wed, 13 Jan 2010 22:35:47 +0000 Subject: [PATCH 07/30] - adjust buildroot location (guidelines) - disable static libraries (guidelines) - tweak default payload attributes (guidelines) --- hesiod.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hesiod.spec b/hesiod.spec index 9d359c0..0e63cce 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 17%{?dist} +Release: 18%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch0: hesiod-3.1.0-classes.patch Patch1: hesiod-3.1.0-env.patch @@ -11,7 +11,7 @@ Patch5: hesiod-3.1.0-perms.patch Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries License: MIT -Buildroot: %{_tmppath}/hesiod-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool %description @@ -34,6 +34,11 @@ ensure synchronize the files among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Jan 13 2010 Nalin Dahyabhai - 3.1.0-15 +- adjust buildroot location (guidelines) +- disable static libraries (guidelines) +- tweak default payload attributes (guidelines) + * Tue Oct 13 2009 Nalin Dahyabhai - 3.1.0-17 - add a disttag @@ -215,11 +220,11 @@ aclocal autoconf -f -i %build -%configure +%configure --disable-static make %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la @@ -231,14 +236,13 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc README NEWS %{_libdir}/libhesiod.so.* %{_mandir}/man5/* %files devel -%defattr(-,root,root) -%{_libdir}/libhesiod.a +%defattr(-,root,root,-) %{_libdir}/libhesiod.so %{_includedir}/hesiod.h %{_mandir}/man3/* From 26683149ff3e78148b445816b5983b2d786444a8 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Fri, 19 Feb 2010 21:32:10 +0000 Subject: [PATCH 08/30] - fix the release number noted for the previous changelog entry (#225884) - remove unapplied "classes" patch (#225884) - tweak the description text a bit --- hesiod-3.1.0-classes.patch | 161 ------------------------------------- hesiod.spec | 12 +-- 2 files changed, 7 insertions(+), 166 deletions(-) delete mode 100644 hesiod-3.1.0-classes.patch diff --git a/hesiod-3.1.0-classes.patch b/hesiod-3.1.0-classes.patch deleted file mode 100644 index b1823b4..0000000 --- a/hesiod-3.1.0-classes.patch +++ /dev/null @@ -1,161 +0,0 @@ -Add support for the "classes" configuration file directive back in. - ---- hesiod-3.1.0/hesiod.conf.5 2006-03-30 11:22:11.000000000 -0500 -+++ hesiod-3.1.0/hesiod.conf.5 2006-03-30 16:04:11.000000000 -0500 -@@ -43,7 +43,7 @@ - still used by some sites). You may specify both classes separated by - a comma to try one class first and then the other if no entry is - available in the first class. The default value of the classes --variable is ``IN,HS''. -+variable is ``IN''. - .SH SEE ALSO - hesiod(3) - .SH BUGS ---- hesiod-3.1.0/hesiod.c 2006-03-30 11:22:11.000000000 -0500 -+++ hesiod-3.1.0/hesiod.c 2006-03-30 16:13:54.000000000 -0500 -@@ -71,12 +71,16 @@ - struct hesiod_p { - char *lhs; /* normally ".ns" */ - char *rhs; /* AKA the default hesiod domain */ -+ int n_classes, *classes; /* query classes */ - }; - - char **hesiod__uidresolve(void *context, const char *uidstr); - static int read_config_file(struct hesiod_p *ctx, const char *filename); - static char **get_txt_records(struct hesiod_p *ctx, const char *name); -+static char **get_txt_records_for_class(struct hesiod_p *ctx, const char *name, -+ int class); - static int cistrcmp(const char *s1, const char *s2); -+static int cistrncmp(const char *s1, const char *s2, size_t n); - - /* This function is called to initialize a hesiod_p. */ - int hesiod_init(void **context) -@@ -133,6 +137,7 @@ - free(ctx->rhs); - if (ctx->lhs) - free(ctx->lhs); -+ free(ctx->classes); - free(ctx); - } - -@@ -252,8 +257,18 @@ - * ctx->rhs which need to be freed by the caller. */ - static int read_config_file(struct hesiod_p *ctx, const char *filename) - { -- char *key, *data, *p, **which; -+ char *key, *data, *p, *q, **which; - char buf[MAXDNAME + 7]; -+ unsigned int i; -+ int *tmpclass; -+ struct { -+ char name[3]; -+ int class; -+ } class_names[] = { -+ {"in", C_IN}, -+ {"hs", C_HS}, -+ {"any", C_ANY}, -+ }; - FILE *fp; - - /* Try to open the configuration file. */ -@@ -263,6 +278,8 @@ - /* Use compiled in default domain names. */ - ctx->lhs = malloc(strlen(DEF_LHS) + 1); - ctx->rhs = malloc(strlen(DEF_RHS) + 1); -+ ctx->n_classes = 0; -+ ctx->classes = NULL; - if (ctx->lhs && ctx->rhs) - { - strcpy(ctx->lhs, DEF_LHS); -@@ -278,6 +295,8 @@ - - ctx->lhs = NULL; - ctx->rhs = NULL; -+ ctx->n_classes = 0; -+ ctx->classes = NULL; - while (fgets(buf, sizeof(buf), fp) != NULL) - { - p = buf; -@@ -308,6 +327,32 @@ - } - strcpy(*which, data); - } -+ if (cistrcmp(key, "classes") == 0) -+ { -+ p = data; -+ while ((p != NULL) && (*p != '\0') && (*p != '#') && -+ (*p != '\r') && (*p != '\n')) -+ { -+ q = p + strcspn(p, ",# \t\r\n"); -+ for (i = 0; i < sizeof(class_names) / sizeof(class_names[0]); i++) -+ { -+ if ((strlen(class_names[i].name) == (q - p)) && -+ (cistrncmp(p, class_names[i].name, q - p) == 0)) -+ { -+ tmpclass = realloc(ctx->classes, -+ (sizeof(int) * ctx->n_classes + 1)); -+ if (tmpclass != NULL) -+ { -+ ctx->classes = tmpclass; -+ ctx->classes[ctx->n_classes] = class_names[i].class; -+ ctx->n_classes++; -+ } -+ break; -+ } -+ } -+ p = q + strspn(q, ", \t\r\n"); -+ } -+ } - } - fclose(fp); - -@@ -326,6 +371,25 @@ - */ - static char **get_txt_records(struct hesiod_p *ctx, const char *name) - { -+ char **tmp; -+ int i; -+ if (ctx->n_classes > 0) -+ { -+ for (i = 0; i < ctx->n_classes; i++) -+ { -+ tmp = get_txt_records_for_class(ctx, name, ctx->classes[i]); -+ if (tmp != NULL) -+ return tmp; -+ } -+ return NULL; -+ } -+ else -+ return get_txt_records_for_class(ctx, name, C_IN); -+} -+ -+static char **get_txt_records_for_class(struct hesiod_p *ctx, const char *name, -+ int class) -+{ - unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP]; - int n; - -@@ -334,7 +398,7 @@ - return NULL; - - /* Construct the query. */ -- n = res_mkquery(QUERY, name, C_IN, T_TXT, NULL, 0, NULL, qbuf, PACKETSZ); -+ n = res_mkquery(QUERY, name, class, T_TXT, NULL, 0, NULL, qbuf, PACKETSZ); - if (n < 0) - { - errno = EMSGSIZE; -@@ -471,3 +534,14 @@ - } - return tolower(*s1) - tolower(*s2); - } -+ -+static int cistrncmp(const char *s1, const char *s2, size_t n) -+{ -+ while (*s1 && *s2 && (tolower(*s1) == tolower(*s2)) && (n > 0)) -+ { -+ s1++; -+ s2++; -+ n--; -+ } -+ return n ? (tolower(*s1) - tolower(*s2)) : 0; -+} diff --git a/hesiod.spec b/hesiod.spec index 0e63cce..2bd84eb 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,8 +1,7 @@ Name: hesiod Version: 3.1.0 -Release: 18%{?dist} +Release: 19%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz -Patch0: hesiod-3.1.0-classes.patch Patch1: hesiod-3.1.0-env.patch Patch2: hesiod-3.1.0-str.patch Patch3: hesiod-3.1.0-dnsparse.patch @@ -30,11 +29,15 @@ Hesiod is a system which uses existing DNS functionality to provide access to databases of information that changes infrequently. It is often used to distribute information which might otherwise kept in the /etc/passwd, /etc/group, and /etc/printcap files over a network, eliminating the need to -ensure synchronize the files among multiple hosts. This package contains +ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog -* Wed Jan 13 2010 Nalin Dahyabhai - 3.1.0-15 +* Fri Feb 19 2010 Nalin Dahyabhai - 3.1.0-19 +- fix the release number noted for the previous changelog entry (#225884) +- remove unapplied "classes" patch (#225884) + +* Wed Jan 13 2010 Nalin Dahyabhai - 3.1.0-18 - adjust buildroot location (guidelines) - disable static libraries (guidelines) - tweak default payload attributes (guidelines) @@ -209,7 +212,6 @@ the header files and libraries required for building programs which use Hesiod. %prep %setup -q -#%patch0 -p1 -b .classes %patch1 -p1 -b .env %patch2 -p1 -b .str %patch3 -p1 -b .dnsparse From 760a7f89344dcacb8e80b29fc7bd68e48c35c51b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 17:42:44 +0000 Subject: [PATCH 09/30] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f9b3b1b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: hesiod -# $Id: Makefile,v 1.2 2007/10/15 18:51:55 notting Exp $ -NAME := hesiod -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 6d3a4a4802536758d780d46d0aa356733c4104a0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 03:07:27 -0600 Subject: [PATCH 10/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 2bd84eb..a69ac24 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 19%{?dist} +Release: 20%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch1: hesiod-3.1.0-env.patch Patch2: hesiod-3.1.0-str.patch @@ -33,6 +33,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 3.1.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Feb 19 2010 Nalin Dahyabhai - 3.1.0-19 - fix the release number noted for the previous changelog entry (#225884) - remove unapplied "classes" patch (#225884) From 64ac0dd343e361c2eef139dce33fec09a32143b4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 22:51:52 -0600 Subject: [PATCH 11/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index a69ac24..3239a76 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 20%{?dist} +Release: 21%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch1: hesiod-3.1.0-env.patch Patch2: hesiod-3.1.0-str.patch @@ -33,6 +33,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 3.1.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Feb 09 2011 Fedora Release Engineering - 3.1.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 126e431d6aeb89724ba7980187a2b9b6e1de2fea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 07:45:00 -0500 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 3239a76..a07ab31 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 21%{?dist} +Release: 22%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch1: hesiod-3.1.0-env.patch Patch2: hesiod-3.1.0-str.patch @@ -33,6 +33,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 3.1.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 3.1.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 8a805efc431280149873f4972a1d047a9905f0a4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 19:04:29 -0600 Subject: [PATCH 13/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index a07ab31..2f2a303 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.1.0 -Release: 22%{?dist} +Release: 23%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Patch1: hesiod-3.1.0-env.patch Patch2: hesiod-3.1.0-str.patch @@ -33,6 +33,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 3.1.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 3.1.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 13ffbf9323890af20675f4d1be3f8dcbf7069e7c Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Wed, 3 Apr 2013 18:04:04 -0400 Subject: [PATCH 14/30] update to 3.2.1 - update to 3.2.1 (whoops, missed 3.2 completely) - merged all patches or equivalents - re-merged hesinfo, so we obsolete it now - adds a pkgconfig configuration file for libhesiod - correct inconsistent changelog dates, assuming day-of-week is correct --- .gitignore | 1 + hesiod-3.1.0-dnsparse.patch | 56 ------------------------------------ hesiod-3.1.0-env.patch | 29 ------------------- hesiod-3.1.0-libresolv.patch | 20 ------------- hesiod-3.1.0-perms.patch | 14 --------- hesiod-3.1.0-str.patch | 25 ---------------- hesiod.spec | 32 +++++++++++---------- sources | 2 +- 8 files changed, 19 insertions(+), 160 deletions(-) delete mode 100644 hesiod-3.1.0-dnsparse.patch delete mode 100644 hesiod-3.1.0-env.patch delete mode 100644 hesiod-3.1.0-libresolv.patch delete mode 100644 hesiod-3.1.0-perms.patch delete mode 100644 hesiod-3.1.0-str.patch diff --git a/.gitignore b/.gitignore index ef07409..1af4815 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ hesiod-3.0.2.tar.gz hesiod-3.1.0.tar.gz +/hesiod-3.2.1.tar.gz diff --git a/hesiod-3.1.0-dnsparse.patch b/hesiod-3.1.0-dnsparse.patch deleted file mode 100644 index 35d657e..0000000 --- a/hesiod-3.1.0-dnsparse.patch +++ /dev/null @@ -1,56 +0,0 @@ -If the response is larger than 1024 bytes, go ahead and retry. - ---- 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,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, i, len; - - /* Make sure the resolver is initialized. */ - if ((_res.options & RES_INIT) == 0 && res_init() == -1) -@@ -343,14 +344,36 @@ - } - - /* Send the query. */ -- n = res_send(qbuf, n, abuf, MAX_HESRESP); -- if (n < 0) -+ abuf = NULL; -+ len = 1024; -+ i = n; -+ do -+ { -+ abuf = realloc(abuf, len); -+ if (abuf == NULL) -+ { -+ n = -1; -+ break; -+ } -+ n = res_send(qbuf, i, abuf, len); -+ if (n < len) -+ { -+ break; -+ } -+ len = n + 1024; -+ } while(1); -+ if (n < (ssize_t) sizeof(HEADER)) - { - errno = ECONNREFUSED; -+ free(abuf); - return NULL; - } - -- return hesiod_parse_result(ctx, abuf, n); -+ tmp = hesiod_parse_result(ctx, abuf, n); -+ -+ free(abuf); -+ -+ return tmp; - } - - char **hesiod_parse_result(void *ctx, const unsigned char *abuf, int alen) diff --git a/hesiod-3.1.0-env.patch b/hesiod-3.1.0-env.patch deleted file mode 100644 index 10dab06..0000000 --- a/hesiod-3.1.0-env.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - #include - #include -+#include - #include - #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) diff --git a/hesiod-3.1.0-libresolv.patch b/hesiod-3.1.0-libresolv.patch deleted file mode 100644 index 9487b7e..0000000 --- a/hesiod-3.1.0-libresolv.patch +++ /dev/null @@ -1,20 +0,0 @@ -Try to correctly find res_mkquery in libresolv, even in cases where a -preprocessor-based rename in may screw us up. ---- hesiod-3.1.0/configure.in 2006-03-30 11:22:11.000000000 -0500 -+++ hesiod-3.1.0/configure.in 2006-03-30 13:31:02.000000000 -0500 -@@ -12,7 +12,14 @@ - AC_EGREP_HEADER(pw_change, pwd.h, AC_DEFINE(HAVE_PW_CHANGE)) - AC_EGREP_HEADER(pw_expire, pwd.h, AC_DEFINE(HAVE_PW_EXPIRE)) - --AC_CHECK_FUNC(res_mkquery, :, [AC_CHECK_LIB(resolv, res_mkquery)]) -+AC_CHECK_FUNC(res_mkquery, :, [AC_CHECK_LIB(resolv, res_mkquery,,[ -+saveLIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+AC_MSG_CHECKING([if res_mkquery is provided by libresolv]) -+AC_TRY_LINK([#include ],[res_mkquery(0,NULL,0,0,NULL,0,NULL,NULL,0);],[AC_DEFINE(HAVE_RES_MKQUERY,1,[Define if your libresolv provides res_mkquery.]) -+AC_MSG_RESULT(yes)],[LIBS="$saveLIBS" -+AC_MSG_RESULT(no)]) -+])]) - - AC_CONFIG_HEADER(config.h) - AC_OUTPUT(Makefile) diff --git a/hesiod-3.1.0-perms.patch b/hesiod-3.1.0-perms.patch deleted file mode 100644 index e8f2776..0000000 --- a/hesiod-3.1.0-perms.patch +++ /dev/null @@ -1,14 +0,0 @@ -Let libtool decide the install mode for the libtool archive and the real files -which it tracks. - ---- hesiod-3.1.0/Makefile.in 2006-06-20 14:24:10.000000000 -0400 -+++ hesiod-3.1.0/Makefile.in 2006-06-20 14:24:05.000000000 -0400 -@@ -48,7 +48,7 @@ - ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir} - ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3 - ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5 -- ${LIBTOOL} --mode=install ${INSTALL} -m 644 libhesiod.la \ -+ ${LIBTOOL} --mode=install ${INSTALL} libhesiod.la \ - ${DESTDIR}${libdir} - ${INSTALL} -m 444 ${srcdir}/hesiod.h ${DESTDIR}${includedir} - ${INSTALL} -m 444 ${srcdir}/hesiod.3 ${DESTDIR}${mandir}/man3 diff --git a/hesiod-3.1.0-str.patch b/hesiod-3.1.0-str.patch deleted file mode 100644 index f243e85..0000000 --- a/hesiod-3.1.0-str.patch +++ /dev/null @@ -1,25 +0,0 @@ -One or both strings is supplied through a configuration file, so we have no -guarantees about its length. - ---- hesiod-3.1.0/hesservbyname.c 2006-03-30 11:22:11.000000000 -0500 -+++ hesiod-3.1.0/hesservbyname.c 2006-03-30 13:13:50.000000000 -0500 -@@ -187,7 +187,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.1.0/hesiod.c 2006-03-30 13:13:50.000000000 -0500 -+++ hesiod-3.1.0/hesiod.c 2006-03-30 13:19:03.000000000 -0500 -@@ -465,7 +465,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++; diff --git a/hesiod.spec b/hesiod.spec index 2f2a303..e8ac506 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,17 +1,13 @@ Name: hesiod -Version: 3.1.0 -Release: 23%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz -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 -Patch5: hesiod-3.1.0-perms.patch Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries License: MIT Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool +Obsoletes: hesinfo < 3.2 %description Hesiod is a system which uses existing DNS functionality to provide access @@ -33,6 +29,13 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Apr 3 2013 Nalin Dahyabhai - 3.2.1-1 +- update to 3.2.1 + - merged all patches or equivalents + - re-merged hesinfo, so we obsolete it now + - adds a pkgconfig configuration file for libhesiod +- correct inconsistent changelog dates, assuming day-of-week is correct + * Thu Feb 14 2013 Fedora Release Engineering - 3.1.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -80,7 +83,7 @@ the header files and libraries required for building programs which use Hesiod. * Tue Feb 19 2008 Fedora Release Engineering - 3.1.0-10 - Autorebuild for GCC 4.3 -* Wed Aug 22 2006 Nalin Dahyabhai - 3.1.0-9 +* Wed Aug 23 2006 Nalin Dahyabhai - 3.1.0-9 - rebuild * Mon Jul 17 2006 Nalin Dahyabhai - 3.1.0-8 @@ -151,7 +154,7 @@ the header files and libraries required for building programs which use Hesiod. * Fri Jan 10 2003 Phil Knirsch 3.0.2-23 - Build shared lib correctly on s390 and s390x (with gcc -shared -fPIC). -* Wed Sep 24 2002 Nalin Dahyabhai 3.0.2-22 +* Wed Sep 25 2002 Nalin Dahyabhai 3.0.2-22 - look harder for res_mkquery() in libresolv * Wed Aug 21 2002 Nalin Dahyabhai @@ -189,7 +192,7 @@ the header files and libraries required for building programs which use Hesiod. - remove the shared library patch -- different packages with shared libraries tend to use different sonames, so we'd run inevitably run into problems -* Thu Aug 21 2001 Nalin Dahyabhai +* Thu Aug 23 2001 Nalin Dahyabhai - remove pre and post scripts -- authconfig handles that stuff now - add the hesiod man page back in, as bind-devel doesn't provide it any more @@ -224,13 +227,9 @@ the header files and libraries required for building programs which use Hesiod. %prep %setup -q -%patch1 -p1 -b .env -%patch2 -p1 -b .str -%patch3 -p1 -b .dnsparse -%patch4 -p1 -b .libresolv -%patch5 -p1 -b .perms libtoolize -f -i aclocal +automake -f -a autoconf -f -i %build @@ -252,11 +251,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README NEWS +%{_bindir}/* %{_libdir}/libhesiod.so.* +%{_mandir}/man1/* %{_mandir}/man5/* %files devel %defattr(-,root,root,-) %{_libdir}/libhesiod.so +%{_libdir}/pkgconfig/* %{_includedir}/hesiod.h %{_mandir}/man3/* diff --git a/sources b/sources index a408e3e..9148a7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89c785d350e75d6628754659ee4583e8 hesiod-3.1.0.tar.gz +d8fe6d7d081c9c14d5d3d8a466998eeb hesiod-3.2.1.tar.gz From 08fc0f130b175ac5de6a99274369912b72f85e15 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Wed, 3 Apr 2013 18:13:45 -0400 Subject: [PATCH 15/30] add a missing buildrequires: - add build requirement on libidn-devel - package the license --- hesiod.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hesiod.spec b/hesiod.spec index e8ac506..d9eb812 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -6,7 +6,7 @@ Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries License: MIT Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, automake, libtool +BuildRequires: autoconf, automake, libtool, libidn-devel Obsoletes: hesinfo < 3.2 %description @@ -35,6 +35,8 @@ the header files and libraries required for building programs which use Hesiod. - re-merged hesinfo, so we obsolete it now - adds a pkgconfig configuration file for libhesiod - correct inconsistent changelog dates, assuming day-of-week is correct +- add build requirement on libidn-devel +- package the license * Thu Feb 14 2013 Fedora Release Engineering - 3.1.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -250,7 +252,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README NEWS +%doc README NEWS COPYING %{_bindir}/* %{_libdir}/libhesiod.so.* %{_mandir}/man1/* From b238912eb047fa189cee093a1289b4520f51016c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 12:39:03 -0500 Subject: [PATCH 16/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index d9eb812..7b3617d 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Apr 3 2013 Nalin Dahyabhai - 3.2.1-1 - update to 3.2.1 - merged all patches or equivalents From eb7c07786147a1847648172ee838e7e0d6399ad8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 15:01:52 -0500 Subject: [PATCH 17/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 7b3617d..ea3efa9 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 2d34029daa48bcf5364e6d7cc2b2cb4c5151213a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 20:24:29 +0000 Subject: [PATCH 18/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index ea3efa9..d9b803b 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 72a41d582fd7870d48fd2a899a75fbfbca5cec03 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 10:23:27 +0000 Subject: [PATCH 19/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index d9b803b..ff279a5 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Aug 16 2014 Fedora Release Engineering - 3.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From fa1ec14824eedd88b6570a58777b4b37fe525af4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 23:46:27 +0000 Subject: [PATCH 20/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index ff279a5..f515945 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 5f762c4cdf1be166837780795601751bfc24cfab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 12:36:43 +0000 Subject: [PATCH 21/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index f515945..8bb8d19 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 3.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 6aadf3960f04b08b26a8373bd9923786bf12d30d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 12:38:22 +0000 Subject: [PATCH 22/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 8bb8d19..1579f8e 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 3.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From bf322c8d9c0dea5436f5e873d7c8c48c3a36d436 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 23:26:32 +0000 Subject: [PATCH 23/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 1579f8e..6db4756 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 8%{?dist} +Release: 9%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e9115d623c596ff2c521a729c8d9dc28a7beb62a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 16:14:16 +0000 Subject: [PATCH 24/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 6db4756..e2c12cf 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz Summary: Shared libraries for querying the Hesiod naming service Group: System Environment/Libraries @@ -29,6 +29,9 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.2.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 3.2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From c50e649d667fb97b203e4d3d82030ebffbdd043d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:06:42 +0100 Subject: [PATCH 25/30] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- hesiod.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/hesiod.spec b/hesiod.spec index e2c12cf..3f74732 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -270,9 +270,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From 97576be0cd7a3bd51bf24a3563a7747cbafd0aa3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 2 Apr 2018 08:51:40 +0100 Subject: [PATCH 26/30] Cleanup and modernise spec --- hesiod.spec | 79 ++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/hesiod.spec b/hesiod.spec index 3f74732..3e36d6d 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,11 +1,10 @@ Name: hesiod Version: 3.2.1 -Release: 10%{?dist} -Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz -Summary: Shared libraries for querying the Hesiod naming service -Group: System Environment/Libraries +Release: 11%{?dist} License: MIT -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: Shared libraries for querying the Hesiod naming service + +Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz BuildRequires: autoconf, automake, libtool, libidn-devel Obsoletes: hesinfo < 3.2 @@ -17,7 +16,6 @@ files, among others. %package devel Summary: Development libraries and headers for Hesiod -Group: Development/Libraries Requires: hesiod = %{version}-%{release} %description devel @@ -28,7 +26,41 @@ distribute information which might otherwise kept in the /etc/passwd, ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. +%prep +%setup -q +autoreconf -vif + +%build +%configure --disable-static +make + +%install +make install DESTDIR=$RPM_BUILD_ROOT +# Remove libtool archives and static libs +find %{buildroot} -type f -name "*.la" -delete + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%license COPYING +%doc README NEWS +%{_bindir}/* +%{_libdir}/libhesiod.so.* +%{_mandir}/man1/* +%{_mandir}/man5/* + +%files devel +%{_libdir}/libhesiod.so +%{_libdir}/pkgconfig/* +%{_includedir}/hesiod.h +%{_mandir}/man3/* + %changelog +* Mon Apr 2 2018 Peter Robinson 3.2.1-11 +- Cleanup and modernise spec + * Wed Feb 07 2018 Fedora Release Engineering - 3.2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -253,38 +285,3 @@ the header files and libraries required for building programs which use Hesiod. no longer use a separate libnss_hesiod.so - changed requires: caching-nameserver to nscd - added post-install script snippet to activate nscd on install - -%prep -%setup -q -libtoolize -f -i -aclocal -automake -f -a -autoconf -f -i - -%build -%configure --disable-static -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc README NEWS COPYING -%{_bindir}/* -%{_libdir}/libhesiod.so.* -%{_mandir}/man1/* -%{_mandir}/man5/* - -%files devel -%defattr(-,root,root,-) -%{_libdir}/libhesiod.so -%{_libdir}/pkgconfig/* -%{_includedir}/hesiod.h -%{_mandir}/man3/* From 4cb59e49ac55bffa0a9c9125865f0bb57521c5a1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 18 May 2018 15:09:58 -0700 Subject: [PATCH 27/30] Rebuild for new libidn --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index 3e36d6d..cf1baf4 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT Summary: Shared libraries for querying the Hesiod naming service @@ -58,6 +58,9 @@ find %{buildroot} -type f -name "*.la" -delete %{_mandir}/man3/* %changelog +* Fri May 18 2018 Adam Williamson - 3.2.1-12 +- Rebuild for new libidn + * Mon Apr 2 2018 Peter Robinson 3.2.1-11 - Cleanup and modernise spec From 6c07b4de0d72cb1a29832567c336532b033f2155 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 04:56:35 +0000 Subject: [PATCH 28/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hesiod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hesiod.spec b/hesiod.spec index cf1baf4..cb8bfd9 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,6 +1,6 @@ Name: hesiod Version: 3.2.1 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT Summary: Shared libraries for querying the Hesiod naming service @@ -58,6 +58,9 @@ find %{buildroot} -type f -name "*.la" -delete %{_mandir}/man3/* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.2.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri May 18 2018 Adam Williamson - 3.2.1-12 - Rebuild for new libidn From e013e4889c7fe9cdd034c8f13bd48c1314566def Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Thu, 11 Oct 2018 14:16:38 -0400 Subject: [PATCH 29/30] New management Fix CVE-2016-10152 (hardcoded DNS fallback) Fix CVE-2016-10151 (weak SUID check) Move package to autosetup Resolves: #1332509 Resolves: #1332494 --- ...-hard-coded-defaults-for-LHS-and-RHS.patch | 67 +++++++++++++++++ Use-secure_getenv-when-it-s-available.patch | 75 +++++++++++++++++++ hesiod.spec | 14 +++- 3 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 Remove-hard-coded-defaults-for-LHS-and-RHS.patch create mode 100644 Use-secure_getenv-when-it-s-available.patch diff --git a/Remove-hard-coded-defaults-for-LHS-and-RHS.patch b/Remove-hard-coded-defaults-for-LHS-and-RHS.patch new file mode 100644 index 0000000..316957c --- /dev/null +++ b/Remove-hard-coded-defaults-for-LHS-and-RHS.patch @@ -0,0 +1,67 @@ +From 40fb2973fde5cefd1687637e208f2877865b4c5f Mon Sep 17 00:00:00 2001 +From: Nalin Dahyabhai +Date: Tue, 3 May 2016 13:34:32 -0400 +Subject: [PATCH] Remove hard-coded defaults for LHS and RHS + +Don't fall back to using a default LHS or RHS when the configuration +file can't be read. Instead, return an error. +Original report from https://bugzilla.redhat.com/show_bug.cgi?id=1332493 + +(cherry picked from commit 247e2ce1f2aff40040657acaae7f1a1d673d6618) +--- + src/lib/Makefile.am | 2 +- + src/lib/hesiod.c | 21 +-------------------- + 2 files changed, 2 insertions(+), 21 deletions(-) + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index d092565..e6324b1 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -15,7 +15,7 @@ noinst_PROGRAMS = hestest + hestest_SOURCES = hestest.c + hestest_LDADD = libhesiod.la + +-TESTS_ENVIRONMENT = ./hestest ++TESTS_ENVIRONMENT = HESIOD_CONFIG=$(srcdir)/hesiod.conf.sample ./hestest + TESTS = hestest.conf + + EXTRA_DIST = hesiod.conf.sample hestest.conf +diff --git a/src/lib/hesiod.c b/src/lib/hesiod.c +index 2738713..e69a8ca 100644 +--- a/src/lib/hesiod.c ++++ b/src/lib/hesiod.c +@@ -81,10 +81,6 @@ static const char rcsid[] = "$Id: hesiod.c,v 1.30 2002-04-03 21:40:55 ghudson Ex + #define T_TXT 16 + #endif + +-/* Defaults if the configuration file is not present. */ +-#define DEF_RHS ".athena.mit.edu" +-#define DEF_LHS ".ns" +- + /* Maximum size of a Hesiod response from the DNS. */ + #define MAX_HESRESP 1024 + +@@ -301,22 +297,7 @@ static int read_config_file(struct hesiod_p *ctx, const char *filename) + /* Try to open the configuration file. */ + fp = fopen(filename, "r"); + if (!fp) +- { +- /* Use compiled in default domain names. */ +- ctx->lhs = malloc(strlen(DEF_LHS) + 1); +- ctx->rhs = malloc(strlen(DEF_RHS) + 1); +- if (ctx->lhs && ctx->rhs) +- { +- strcpy(ctx->lhs, DEF_LHS); +- strcpy(ctx->rhs, DEF_RHS); +- return 0; +- } +- else +- { +- errno = ENOMEM; +- return -1; +- } +- } ++ return -1; + + ctx->lhs = NULL; + ctx->rhs = NULL; diff --git a/Use-secure_getenv-when-it-s-available.patch b/Use-secure_getenv-when-it-s-available.patch new file mode 100644 index 0000000..7b607e1 --- /dev/null +++ b/Use-secure_getenv-when-it-s-available.patch @@ -0,0 +1,75 @@ +From 5e8ee67228ae97ce00feba1139d406f12b2b66f3 Mon Sep 17 00:00:00 2001 +From: Nalin Dahyabhai +Date: Tue, 3 May 2016 13:32:25 -0400 +Subject: [PATCH] Use secure_getenv() when it's available + +Factor out logic that attempts to only consult the environment when it's +safe to do so into its own function, and use secure_getenv() instead of +getenv() if it's available. Original report from +https://bugzilla.redhat.com/show_bug.cgi?id=1332508 + +(cherry picked from commit 39b21dac9bc6473365de04d94be0da94941c7c73) +--- + configure.ac | 3 ++- + src/lib/hesiod.c | 15 +++++++++++++-- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e5e94d4..9098afa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,6 +9,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([src/lib/hesiod.h]) + AC_CONFIG_HEADERS([config.h]) ++AC_USE_SYSTEM_EXTENSIONS + + # Checks for programs. + AC_PROG_CC +@@ -80,7 +81,7 @@ AC_EGREP_HEADER([pw_expire], [pwd.h], + # Checks for library functions. + AC_FUNC_MALLOC + AC_FUNC_REALLOC +-AC_CHECK_FUNCS([strchr strdup]) ++AC_CHECK_FUNCS([strchr strdup secure_getenv]) + + AC_CONFIG_FILES([ + Makefile +diff --git a/src/lib/hesiod.c b/src/lib/hesiod.c +index c96aebe..2738713 100644 +--- a/src/lib/hesiod.c ++++ b/src/lib/hesiod.c +@@ -99,6 +99,17 @@ static int read_config_file(struct hesiod_p *ctx, const char *filename); + static char **get_txt_records(struct hesiod_p *ctx, const char *name); + static int cistrcmp(const char *s1, const char *s2); + ++static const char *hesiod_getenv(const char *e) ++{ ++ if ((getuid() != geteuid()) || (getgid() != getegid())) ++ return NULL; ++#ifdef HAVE_SECURE_GETENV ++ return secure_getenv(e); ++#else ++ return getenv(e); ++#endif ++} ++ + /* This function is called to initialize a hesiod_p. */ + int hesiod_init(void **context) + { +@@ -109,13 +120,13 @@ int hesiod_init(void **context) + if (ctx) + { + *context = ctx; +- configname = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HESIOD_CONFIG") : NULL; ++ configname = hesiod_getenv("HESIOD_CONFIG"); + if (!configname) + configname = SYSCONFDIR "/hesiod.conf"; + if (read_config_file(ctx, configname) >= 0) + { + /* The default rhs can be overridden by an environment variable. */ +- p = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HES_DOMAIN") : NULL; ++ p = hesiod_getenv("HES_DOMAIN"); + if (p) + { + if (ctx->rhs) diff --git a/hesiod.spec b/hesiod.spec index cb8bfd9..1b7ecfa 100644 --- a/hesiod.spec +++ b/hesiod.spec @@ -1,11 +1,14 @@ Name: hesiod Version: 3.2.1 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT Summary: Shared libraries for querying the Hesiod naming service Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz -BuildRequires: autoconf, automake, libtool, libidn-devel +Patch0: Use-secure_getenv-when-it-s-available.patch +Patch1: Remove-hard-coded-defaults-for-LHS-and-RHS.patch + +BuildRequires: autoconf, automake, libtool, libidn-devel, git Obsoletes: hesinfo < 3.2 %description @@ -27,7 +30,7 @@ ensure the files are synchronized among multiple hosts. This package contains the header files and libraries required for building programs which use Hesiod. %prep -%setup -q +%autosetup -S git autoreconf -vif %build @@ -58,6 +61,11 @@ find %{buildroot} -type f -name "*.la" -delete %{_mandir}/man3/* %changelog +* Thu Oct 11 2018 Robbie Harwood - 3.2.1-14 +- Fix CVE-2016-10152 (hardcoded DNS fallback) +- Fix CVE-2016-10151 (weak SUID check) +- Move package to autosetup + * Fri Jul 13 2018 Fedora Release Engineering - 3.2.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 84bda9e5547cbdac5f6c56e922a592014c3df557 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Mon, 5 Nov 2018 17:37:24 +0000 Subject: [PATCH 30/30] Unmaintained upstream; not used by any other packages --- .gitignore | 3 - ...-hard-coded-defaults-for-LHS-and-RHS.patch | 67 ---- Use-secure_getenv-when-it-s-available.patch | 75 ----- dead.package | 1 + hesiod.spec | 301 ------------------ sources | 1 - 6 files changed, 1 insertion(+), 447 deletions(-) delete mode 100644 .gitignore delete mode 100644 Remove-hard-coded-defaults-for-LHS-and-RHS.patch delete mode 100644 Use-secure_getenv-when-it-s-available.patch create mode 100644 dead.package delete mode 100644 hesiod.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1af4815..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -hesiod-3.0.2.tar.gz -hesiod-3.1.0.tar.gz -/hesiod-3.2.1.tar.gz diff --git a/Remove-hard-coded-defaults-for-LHS-and-RHS.patch b/Remove-hard-coded-defaults-for-LHS-and-RHS.patch deleted file mode 100644 index 316957c..0000000 --- a/Remove-hard-coded-defaults-for-LHS-and-RHS.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 40fb2973fde5cefd1687637e208f2877865b4c5f Mon Sep 17 00:00:00 2001 -From: Nalin Dahyabhai -Date: Tue, 3 May 2016 13:34:32 -0400 -Subject: [PATCH] Remove hard-coded defaults for LHS and RHS - -Don't fall back to using a default LHS or RHS when the configuration -file can't be read. Instead, return an error. -Original report from https://bugzilla.redhat.com/show_bug.cgi?id=1332493 - -(cherry picked from commit 247e2ce1f2aff40040657acaae7f1a1d673d6618) ---- - src/lib/Makefile.am | 2 +- - src/lib/hesiod.c | 21 +-------------------- - 2 files changed, 2 insertions(+), 21 deletions(-) - -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index d092565..e6324b1 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -15,7 +15,7 @@ noinst_PROGRAMS = hestest - hestest_SOURCES = hestest.c - hestest_LDADD = libhesiod.la - --TESTS_ENVIRONMENT = ./hestest -+TESTS_ENVIRONMENT = HESIOD_CONFIG=$(srcdir)/hesiod.conf.sample ./hestest - TESTS = hestest.conf - - EXTRA_DIST = hesiod.conf.sample hestest.conf -diff --git a/src/lib/hesiod.c b/src/lib/hesiod.c -index 2738713..e69a8ca 100644 ---- a/src/lib/hesiod.c -+++ b/src/lib/hesiod.c -@@ -81,10 +81,6 @@ static const char rcsid[] = "$Id: hesiod.c,v 1.30 2002-04-03 21:40:55 ghudson Ex - #define T_TXT 16 - #endif - --/* Defaults if the configuration file is not present. */ --#define DEF_RHS ".athena.mit.edu" --#define DEF_LHS ".ns" -- - /* Maximum size of a Hesiod response from the DNS. */ - #define MAX_HESRESP 1024 - -@@ -301,22 +297,7 @@ static int read_config_file(struct hesiod_p *ctx, const char *filename) - /* Try to open the configuration file. */ - fp = fopen(filename, "r"); - if (!fp) -- { -- /* Use compiled in default domain names. */ -- ctx->lhs = malloc(strlen(DEF_LHS) + 1); -- ctx->rhs = malloc(strlen(DEF_RHS) + 1); -- if (ctx->lhs && ctx->rhs) -- { -- strcpy(ctx->lhs, DEF_LHS); -- strcpy(ctx->rhs, DEF_RHS); -- return 0; -- } -- else -- { -- errno = ENOMEM; -- return -1; -- } -- } -+ return -1; - - ctx->lhs = NULL; - ctx->rhs = NULL; diff --git a/Use-secure_getenv-when-it-s-available.patch b/Use-secure_getenv-when-it-s-available.patch deleted file mode 100644 index 7b607e1..0000000 --- a/Use-secure_getenv-when-it-s-available.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5e8ee67228ae97ce00feba1139d406f12b2b66f3 Mon Sep 17 00:00:00 2001 -From: Nalin Dahyabhai -Date: Tue, 3 May 2016 13:32:25 -0400 -Subject: [PATCH] Use secure_getenv() when it's available - -Factor out logic that attempts to only consult the environment when it's -safe to do so into its own function, and use secure_getenv() instead of -getenv() if it's available. Original report from -https://bugzilla.redhat.com/show_bug.cgi?id=1332508 - -(cherry picked from commit 39b21dac9bc6473365de04d94be0da94941c7c73) ---- - configure.ac | 3 ++- - src/lib/hesiod.c | 15 +++++++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e5e94d4..9098afa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,6 +9,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR([src/lib/hesiod.h]) - AC_CONFIG_HEADERS([config.h]) -+AC_USE_SYSTEM_EXTENSIONS - - # Checks for programs. - AC_PROG_CC -@@ -80,7 +81,7 @@ AC_EGREP_HEADER([pw_expire], [pwd.h], - # Checks for library functions. - AC_FUNC_MALLOC - AC_FUNC_REALLOC --AC_CHECK_FUNCS([strchr strdup]) -+AC_CHECK_FUNCS([strchr strdup secure_getenv]) - - AC_CONFIG_FILES([ - Makefile -diff --git a/src/lib/hesiod.c b/src/lib/hesiod.c -index c96aebe..2738713 100644 ---- a/src/lib/hesiod.c -+++ b/src/lib/hesiod.c -@@ -99,6 +99,17 @@ static int read_config_file(struct hesiod_p *ctx, const char *filename); - static char **get_txt_records(struct hesiod_p *ctx, const char *name); - static int cistrcmp(const char *s1, const char *s2); - -+static const char *hesiod_getenv(const char *e) -+{ -+ if ((getuid() != geteuid()) || (getgid() != getegid())) -+ return NULL; -+#ifdef HAVE_SECURE_GETENV -+ return secure_getenv(e); -+#else -+ return getenv(e); -+#endif -+} -+ - /* This function is called to initialize a hesiod_p. */ - int hesiod_init(void **context) - { -@@ -109,13 +120,13 @@ int hesiod_init(void **context) - if (ctx) - { - *context = ctx; -- configname = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HESIOD_CONFIG") : NULL; -+ configname = hesiod_getenv("HESIOD_CONFIG"); - if (!configname) - configname = SYSCONFDIR "/hesiod.conf"; - if (read_config_file(ctx, configname) >= 0) - { - /* The default rhs can be overridden by an environment variable. */ -- p = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HES_DOMAIN") : NULL; -+ p = hesiod_getenv("HES_DOMAIN"); - if (p) - { - if (ctx->rhs) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..cd55faa --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Unmaintained upstream; not used by any other packages diff --git a/hesiod.spec b/hesiod.spec deleted file mode 100644 index 1b7ecfa..0000000 --- a/hesiod.spec +++ /dev/null @@ -1,301 +0,0 @@ -Name: hesiod -Version: 3.2.1 -Release: 14%{?dist} -License: MIT -Summary: Shared libraries for querying the Hesiod naming service - -Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz -Patch0: Use-secure_getenv-when-it-s-available.patch -Patch1: Remove-hard-coded-defaults-for-LHS-and-RHS.patch - -BuildRequires: autoconf, automake, libtool, libidn-devel, git -Obsoletes: hesinfo < 3.2 - -%description -Hesiod is a system which uses existing DNS functionality to provide access -to databases of information that changes infrequently. It is often used to -distribute information kept in the /etc/passwd, /etc/group, and /etc/printcap -files, among others. - -%package devel -Summary: Development libraries and headers for Hesiod -Requires: hesiod = %{version}-%{release} - -%description devel -Hesiod is a system which uses existing DNS functionality to provide access -to databases of information that changes infrequently. It is often used to -distribute information which might otherwise kept in the /etc/passwd, -/etc/group, and /etc/printcap files over a network, eliminating the need to -ensure the files are synchronized among multiple hosts. This package contains -the header files and libraries required for building programs which use Hesiod. - -%prep -%autosetup -S git -autoreconf -vif - -%build -%configure --disable-static -make - -%install -make install DESTDIR=$RPM_BUILD_ROOT -# Remove libtool archives and static libs -find %{buildroot} -type f -name "*.la" -delete - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%license COPYING -%doc README NEWS -%{_bindir}/* -%{_libdir}/libhesiod.so.* -%{_mandir}/man1/* -%{_mandir}/man5/* - -%files devel -%{_libdir}/libhesiod.so -%{_libdir}/pkgconfig/* -%{_includedir}/hesiod.h -%{_mandir}/man3/* - -%changelog -* Thu Oct 11 2018 Robbie Harwood - 3.2.1-14 -- Fix CVE-2016-10152 (hardcoded DNS fallback) -- Fix CVE-2016-10151 (weak SUID check) -- Move package to autosetup - -* Fri Jul 13 2018 Fedora Release Engineering - 3.2.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 18 2018 Adam Williamson - 3.2.1-12 -- Rebuild for new libidn - -* Mon Apr 2 2018 Peter Robinson 3.2.1-11 -- Cleanup and modernise spec - -* Wed Feb 07 2018 Fedora Release Engineering - 3.2.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 3.2.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 3.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 3.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 3.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Apr 3 2013 Nalin Dahyabhai - 3.2.1-1 -- update to 3.2.1 - - merged all patches or equivalents - - re-merged hesinfo, so we obsolete it now - - adds a pkgconfig configuration file for libhesiod -- correct inconsistent changelog dates, assuming day-of-week is correct -- add build requirement on libidn-devel -- package the license - -* Thu Feb 14 2013 Fedora Release Engineering - 3.1.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 3.1.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 3.1.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 3.1.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Feb 19 2010 Nalin Dahyabhai - 3.1.0-19 -- fix the release number noted for the previous changelog entry (#225884) -- remove unapplied "classes" patch (#225884) - -* Wed Jan 13 2010 Nalin Dahyabhai - 3.1.0-18 -- adjust buildroot location (guidelines) -- disable static libraries (guidelines) -- tweak default payload attributes (guidelines) - -* Tue Oct 13 2009 Nalin Dahyabhai - 3.1.0-17 -- add a disttag - -* Fri Jul 24 2009 Fedora Release Engineering - 3.1.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 3.1.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 2 2008 Nalin Dahyabhai - 3.1.0-14 -- adjust the package summary - -* Tue Jul 22 2008 Nalin Dahyabhai - 3.1.0-13 -- rebuild - -* Thu Jun 12 2008 Nalin Dahyabhai - 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 - to generate a new one (#449550) - -* Mon Jun 2 2008 Nalin Dahyabhai - 3.1.0-11 -- force autoreconf to overwrite files (should fix #449550) - -* Tue Feb 19 2008 Fedora Release Engineering - 3.1.0-10 -- Autorebuild for GCC 4.3 - -* Wed Aug 23 2006 Nalin Dahyabhai - 3.1.0-9 -- rebuild - -* Mon Jul 17 2006 Nalin Dahyabhai - 3.1.0-8 -- rebuild - -* Fri Jul 7 2006 Nalin Dahyabhai - 3.1.0-7 -- use the system libtool to consistently link libhesiod.la with libresolv - -* Fri Jul 7 2006 Nalin Dahyabhai - 3.1.0-6 -- run autoreconf instead of autoconf after untarring so that we get a - config.h.in which suits the changes we make to configure.in (part of #197938) - -* Tue Jun 20 2006 Nalin Dahyabhai - 3.1.0-5 -- don't override libtool's defaults for permissions on its .la file, because - we don't get debuginfo if the execute bit isn't set (pjones, in #190219) - -* Wed Jun 7 2006 Jeremy Katz - 3.1.0-4 -- rebuild for -devel deps - -* Thu Mar 30 2006 Nalin Dahyabhai - 3.1.0-3 -- no, we really did need that patch - -* Thu Mar 30 2006 Nalin Dahyabhai - 3.1.0-2 -- drop a no-longer-needed patch for detecting libresolv properly - -* Thu Mar 30 2006 Nalin Dahyabhai - 3.1.0-1 -- update to 3.1.0 (#187372) - -* Fri Feb 10 2006 Jesse Keating - 3.0.2-31.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 3.0.2-31.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Mar 16 2005 Nalin Dahyabhai 3.0.2-31 -- rebuild - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Sun Oct 19 2003 Florian La Roche -- add a %%clean specfile target - -* Mon Jun 16 2003 Nalin Dahyabhai 3.0.2-28 -- rebuild - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Mon Jan 27 2003 Nalin Dahyabhai 3.0.2-26 -- link libhesiod with libresolv on all platforms - -* Wed Jan 22 2003 Tim Powers 3.0.2-25 -- rebuilt - -* Fri Jan 10 2003 Phil Knirsch 3.0.2-24 -- Fixed wrong .so name for s390/s390x. - -* Fri Jan 10 2003 Phil Knirsch 3.0.2-23 -- Build shared lib correctly on s390 and s390x (with gcc -shared -fPIC). - -* Wed Sep 25 2002 Nalin Dahyabhai 3.0.2-22 -- look harder for res_mkquery() in libresolv - -* Wed Aug 21 2002 Nalin Dahyabhai -- don't choke on large response packets - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Sun May 26 2002 Tim Powers -- automated rebuild - -* Thu May 16 2002 Nalin Dahyabhai 3.0.2-19 -- rebuild in new environment - -* Mon Apr 15 2002 Nalin Dahyabhai 3.0.2-18 -- add missing post/postun calls to ldconfig - -* Wed Feb 20 2002 Nalin Dahyabhai 3.0.2-17 -- rebuild in new environment - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Fri Oct 26 2001 Nalin Dahyabhai 3.0.2-15 -- actually set the soname in the shared library (ld doesn't automatically - set the soname to the output file's name, oops) - -* Fri Oct 5 2001 Nalin Dahyabhai 3.0.2-14 -- on second thought, put the shared library back in, using a soversion of 0 - to have a chance at providing compatibility with apps linked dynamically - on other distributions -- make -devel depend on the same version of the main package - -* Wed Oct 3 2001 Nalin Dahyabhai -- remove the shared library patch -- different packages with shared libraries - tend to use different sonames, so we'd run inevitably run into problems - -* Thu Aug 23 2001 Nalin Dahyabhai -- remove pre and post scripts -- authconfig handles that stuff now -- add the hesiod man page back in, as bind-devel doesn't provide it any more - -* Wed Jan 17 2001 Jeremy Katz -- hesiod-devel requires hesiod (bug #128) - -* Thu Sep 14 2000 Jeremy Katz -- remove hesiod man page from hesiod-devel as it conflicts with the one - from bind-devel - -* Thu Sep 14 2000 Jeremy Katz -- use rpm macros where possible and FHS-ify -- split into main and devel packages -- add back requires for nscd - -* Fri Jul 28 2000 Jeremy Katz -- rebuild in new environment - -* Thu Mar 16 2000 Jeremy Katz -- rebuild in new environment - -* Thu Sep 2 1999 Nalin Dahyabhai -- removed dependency on nscd -- changed requires: nscd back to caching-nameserver - -* Mon May 17 1999 Nalin Dahyabhai -- started changelog -- moved addition of hesiod to nsswitch.conf to this package because we - no longer use a separate libnss_hesiod.so -- changed requires: caching-nameserver to nscd -- added post-install script snippet to activate nscd on install diff --git a/sources b/sources deleted file mode 100644 index 9148a7f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -d8fe6d7d081c9c14d5d3d8a466998eeb hesiod-3.2.1.tar.gz