rpms/authd/devel authd-1.4.3-jiffies64.patch, 1.1, 1.2 authd.spec, 1.49, 1.50

[Roman Rakus (rrakus)]

Author: rrakus

Update of /cvs/extras/rpms/authd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24552

Modified Files:
	authd-1.4.3-jiffies64.patch authd.spec 
Log Message:
corrected jiffies64 patch

authd-1.4.3-jiffies64.patch:

Index: authd-1.4.3-jiffies64.patch
===================================================================
RCS file: /cvs/extras/rpms/authd/devel/authd-1.4.3-jiffies64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- authd-1.4.3-jiffies64.patch	27 Feb 2008 14:15:17 -0000	1.1
+++ authd-1.4.3-jiffies64.patch	26 Mar 2008 09:26:55 -0000	1.2
@@ -1,28 +1,30 @@
---- 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
+diff -up authd-1.4.3/authd.c.jiffies64 authd-1.4.3/authd.c
+--- authd-1.4.3/authd.c.jiffies64	2004-11-16 00:25:24.000000000 +0100
++++ authd-1.4.3/authd.c	2008-03-25 11:22:35.000000000 +0100
+@@ -347,6 +347,22 @@ 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;
++    unsigned long 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))
++        if ((errno == ERANGE && ull == ULLONG_MAX) || 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
+@@ -643,7 +659,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)


Index: authd.spec
===================================================================
RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- authd.spec	6 Mar 2008 14:44:17 -0000	1.49
+++ authd.spec	26 Mar 2008 09:26:55 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: https://fedorahosted.org/authd/
@@ -73,6 +73,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Wed Mar 26 2008 Roman Rakus <rrakus at redhat.cz> - 1.4.3-19
+- corrected jiffies64 patch
+
 * Thu Mar  6 2008 Roman Rakus <rrakus at redhat.cz> - 1.4.3-18
 - corrected Source0
 - corrected link in URL