diff --git a/authd-1.4.3-jiffies64.patch b/authd-1.4.3-jiffies64.patch new file mode 100644 index 0000000..0b830c4 --- /dev/null +++ b/authd-1.4.3-jiffies64.patch @@ -0,0 +1,33 @@ +--- authd-1.4.3/authd.c.jiffies64 2007-03-27 16:45:50.000000000 -0400 ++++ authd-1.4.3/authd.c 2007-03-27 17:47:33.000000000 -0400 +@@ -347,6 +347,21 @@ static void create_opt(int argc, char *a + + static const char *const DELIM = ",: \t\r\n\v\f"; + ++static unsigned long long get_tok_ullong(char *s, unsigned base) { ++ unsigned long ull = ULLONG_MAX; ++ ++ assert(base <= 36); ++ if ((s = strtok(s, DELIM)) != NULL) { ++ char *endptr; ++ ++ ull = strtoull(s, &endptr, (int) base); ++ if (is_bad_strto(s, endptr)) ++ errno = EINVAL; ++ } ++ else errno = EINVAL; ++ return ull; ++} ++ + static unsigned long get_tok_uint(char *s, unsigned base) { + unsigned long ul = ULONG_MAX; + +@@ -654,7 +669,7 @@ static bool get_info(reply_t *out, reque + (void) get_tok_uint(NULL, 16); // tx_queue + (void) get_tok_uint(NULL, 16); // rx_queue + (void) get_tok_uint(NULL, 16); // tr (boolean) +- (void) get_tok_uint(NULL, 16); // tm->when (unit: jiffies) ++ (void) get_tok_ullong(NULL, 16); // tm->when (unit: jiffies) + strtok(NULL, DELIM); // retrnsmt + uid = get_tok_uint(NULL, 10); // uid (base 10 uint) + strtok(NULL, DELIM); // timeout diff --git a/authd.spec b/authd.spec index c3ff6c2..20c2757 100644 --- a/authd.spec +++ b/authd.spec @@ -1,7 +1,7 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 13 +Release: 14 License: GPLv2+ Group: System Environment/Daemons Obsoletes: pidentd <= 3.2 @@ -13,6 +13,7 @@ Patch1: authd-1.4.3-disable.patch Patch2: authd-1.4.3-ipv6-mapping.patch Patch3: authd-1.4.3-locale.patch Patch4: authd-1.4.3-longopt-identifier.patch +Patch5: authd-1.4.3-jiffies64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: openssl-devel gettext Requires: xinetd @@ -30,6 +31,7 @@ of pidentd. %patch2 -p1 -b .ipv6map %patch3 -p1 -b .locale %patch4 -p1 +%patch5 -p1 sed -i -e "s|/etc|%{_sysconfdir}|" config.h %build @@ -70,6 +72,9 @@ service xinetd reload %{_sbindir}/in.authd %changelog +* Tue Feb 26 2008 Roman Rakus - 1.4.3-14 +- fix 234262 bug + * Wed Feb 13 2008 Jan Safranek - 1.4.3-13 - fix rpmlint errors