rpms/tftp/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 tftp-0.40-remap.patch, 1.1, 1.2 tftp-hpa-0.39-tzfix.patch, 1.1, 1.2 tftp.spec, 1.46, 1.47
Tom Callaway
spot at fedoraproject.org
Tue Nov 25 16:56:02 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/tftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21024
Modified Files:
.cvsignore sources tftp-0.40-remap.patch
tftp-hpa-0.39-tzfix.patch tftp.spec
Log Message:
0.49
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tftp/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 22 Jan 2008 13:24:19 -0000 1.16
+++ .cvsignore 25 Nov 2008 16:55:31 -0000 1.17
@@ -1 +1 @@
-tftp-hpa-0.48.tar.gz
+tftp-hpa-0.49.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tftp/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 22 Jan 2008 13:24:19 -0000 1.16
+++ sources 25 Nov 2008 16:55:31 -0000 1.17
@@ -1 +1 @@
-73dd29dfa9062a174163f6a267e0b5f7 tftp-hpa-0.48.tar.gz
+64b7db6525b189831a7df0565cdfab67 tftp-hpa-0.49.tar.bz2
tftp-0.40-remap.patch:
Index: tftp-0.40-remap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tftp/devel/tftp-0.40-remap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tftp-0.40-remap.patch 19 Apr 2005 11:42:25 -0000 1.1
+++ tftp-0.40-remap.patch 25 Nov 2008 16:55:31 -0000 1.2
@@ -1,18 +1,19 @@
---- tftp-hpa-0.40/tftpd/remap.c.old 2005-03-16 16:34:34.000000000 -0500
-+++ tftp-hpa-0.40/tftpd/remap.c 2005-03-16 16:22:49.000000000 -0500
-@@ -275,6 +275,7 @@
- int lineno = 0;
- int err = 0;
+diff -up tftp-hpa-0.49/tftpd/remap.c.zero tftp-hpa-0.49/tftpd/remap.c
+--- tftp-hpa-0.49/tftpd/remap.c.zero 2008-10-20 18:08:31.000000000 -0400
++++ tftp-hpa-0.49/tftpd/remap.c 2008-11-25 11:41:09.000000000 -0500
+@@ -286,6 +286,7 @@ struct rule *parserulefile(FILE * f)
+ int lineno = 0;
+ int err = 0;
-+ memset(this_rule, '\0', sizeof(struct rule));
- while ( lineno++, fgets(line, MAXLINE, f) ) {
- rv = parseline(line, this_rule, lineno);
- if ( rv < 0 )
-@@ -283,6 +284,7 @@
- *last_rule = this_rule;
- last_rule = &this_rule->next;
- this_rule = tfmalloc(sizeof(struct rule));
-+ memset(this_rule, '\0', sizeof(struct rule));
++ memset(this_rule, '\0', sizeof(struct rule));
+ while (lineno++, fgets(line, MAXLINE, f)) {
+ rv = parseline(line, this_rule, lineno);
+ if (rv < 0)
+@@ -294,6 +295,7 @@ struct rule *parserulefile(FILE * f)
+ *last_rule = this_rule;
+ last_rule = &this_rule->next;
+ this_rule = tfmalloc(sizeof(struct rule));
++ memset(this_rule, '\0', sizeof(struct rule));
+ }
}
- }
tftp-hpa-0.39-tzfix.patch:
Index: tftp-hpa-0.39-tzfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tftp/devel/tftp-hpa-0.39-tzfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tftp-hpa-0.39-tzfix.patch 10 Apr 2006 16:13:43 -0000 1.1
+++ tftp-hpa-0.39-tzfix.patch 25 Nov 2008 16:55:31 -0000 1.2
@@ -1,18 +1,18 @@
---- tftp-hpa-0.39/tftpd/tftpd.c.old 2004-09-15 00:38:46.000000000 +0200
-+++ tftp-hpa-0.39/tftpd/tftpd.c 2006-04-10 17:26:31.000000000 +0200
-@@ -286,7 +286,14 @@
- char *rewrite_file = NULL;
+diff -up tftp-hpa-0.49/tftpd/tftpd.c.tzfix tftp-hpa-0.49/tftpd/tftpd.c
+--- tftp-hpa-0.49/tftpd/tftpd.c.tzfix 2008-10-20 18:08:31.000000000 -0400
++++ tftp-hpa-0.49/tftpd/tftpd.c 2008-11-25 11:45:27.000000000 -0500
+@@ -350,6 +350,14 @@ int main(int argc, char **argv)
#endif
- u_short tp_opcode;
--
-+ time_t my_time = 0;
-+ struct tm* p_tm;
-+ char envtz[10];
-+ my_time = time(NULL);
-+ p_tm = localtime(&my_time);
-+ snprintf(envtz, sizeof(envtz) - 1, "UTC%+d", (p_tm->tm_gmtoff * -1)/3600);
-+ setenv("TZ", envtz, 0);
-+
- /* basename() is way too much of a pain from a portability standpoint */
+ u_short tp_opcode;
- p = strrchr(argv[0], '/');
++ time_t my_time = 0;
++ struct tm* p_tm;
++ char envtz[10];
++ my_time = time(NULL);
++ p_tm = localtime(&my_time);
++ snprintf(envtz, sizeof(envtz) - 1, "UTC%+d", (p_tm->tm_gmtoff * -1)/3600);
++ setenv("TZ", envtz, 0);
++
+ /* basename() is way too much of a pain from a portability standpoint */
+
+ p = strrchr(argv[0], '/');
Index: tftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- tftp.spec 21 May 2008 21:24:02 -0000 1.46
+++ tftp.spec 25 Nov 2008 16:55:31 -0000 1.47
@@ -1,12 +1,10 @@
-%define tftp_hpa_version 0.48
-
Summary: The client for the Trivial File Transfer Protocol (TFTP)
Name: tftp
-Version: %{tftp_hpa_version}
-Release: 6%{?dist}
+Version: 0.49
+Release: 1%{?dist}
License: BSD
Group: Applications/Internet
-Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
+Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
URL: http://www.kernel.org/pub/software/network/tftp/
Patch0: tftp-0.40-remap.patch
@@ -88,6 +86,9 @@
%{_mandir}/man8/*
%changelog
+* Tue Nov 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.49-1
+- update to 0.49
+
* Wed May 21 2008 Warren Togami <wtogami at redhat.com. - 0.48-6
- undo symlink stuff completely because they are problematic
See Bug #447135 for details.
More information about the fedora-extras-commits
mailing list