[Glibc-bsd-commits] r4028 - in trunk/freebsd-buildutils/debian: . patches

Robert Millan rmh at alioth.debian.org
Sat Jan 28 22:09:12 UTC 2012


Author: rmh
Date: 2012-01-28 22:09:11 +0000 (Sat, 28 Jan 2012)
New Revision: 4028

Removed:
   trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
Remove getline kludge. The second part was unneeded, the first one caused version_gen.awk to hang.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-01-28 22:05:26 UTC (rev 4027)
+++ trunk/freebsd-buildutils/debian/changelog	2012-01-28 22:09:11 UTC (rev 4028)
@@ -6,8 +6,10 @@
   * Fix local endian.h to use native <sys/endian.h> on GNU/kFreeBSD.
   * Add local sys/errno.h.
   * Add a few more definitions to local sys/cdefs.h.
+  * Remove getline kludge. The second part was unneeded, the first one
+    caused version_gen.awk to hang.
 
- -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 22:43:54 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 23:09:05 +0100
 
 freebsd-buildutils (9.0-2) unstable; urgency=low
 

Deleted: trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/02_libbsd.diff	2012-01-28 22:05:26 UTC (rev 4027)
+++ trunk/freebsd-buildutils/debian/patches/02_libbsd.diff	2012-01-28 22:09:11 UTC (rev 4028)
@@ -1,59 +0,0 @@
---- a/src/share/mk/version_gen.awk
-+++ b/src/share/mk/version_gen.awk
-@@ -43,7 +43,7 @@
- 	version_count = 0;
- 	current_version = "";
- 	stderr = "/dev/stderr";
--	while (getline < vfile) {
-+	while (bsd_getline < vfile) {
- 		# Strip comments.
- 		sub("#.*$", "", $0);
- 
---- a/src/usr.bin/yacc/test/ftp.tab.c
-+++ b/src/usr.bin/yacc/test/ftp.tab.c
-@@ -490,10 +490,10 @@
- #include <arpa/telnet.h>
- 
- /*
-- * getline - a hacked up version of fgets to ignore TELNET escape codes.
-+ * bsd_getline - a hacked up version of fgets to ignore TELNET escape codes.
-  */
- char *
--getline(s, n, iop)
-+bsd_getline(s, n, iop)
- 	char *s;
- 	register FILE *iop;
- {
-@@ -584,7 +584,7 @@
- 		case CMD:
- 			(void) signal(SIGALRM, toolong);
- 			(void) alarm((unsigned) timeout);
--			if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
-+			if (bsd_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
- 				reply(221, "You could at least say goodbye.");
- 				dologout(0);
- 			}
---- a/src/usr.bin/yacc/test/ftp.y
-+++ b/src/usr.bin/yacc/test/ftp.y
-@@ -750,10 +750,10 @@
- #include <arpa/telnet.h>
- 
- /*
-- * getline - a hacked up version of fgets to ignore TELNET escape codes.
-+ * bsd_getline - a hacked up version of fgets to ignore TELNET escape codes.
-  */
- char *
--getline(s, n, iop)
-+bsd_getline(s, n, iop)
- 	char *s;
- 	register FILE *iop;
- {
-@@ -844,7 +844,7 @@
- 		case CMD:
- 			(void) signal(SIGALRM, toolong);
- 			(void) alarm((unsigned) timeout);
--			if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
-+			if (bsd_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
- 				reply(221, "You could at least say goodbye.");
- 				dologout(0);
- 			}

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2012-01-28 22:05:26 UTC (rev 4027)
+++ trunk/freebsd-buildutils/debian/patches/series	2012-01-28 22:09:11 UTC (rev 4028)
@@ -4,7 +4,6 @@
 # Other patches
 00_upstream.diff
 01_make_fixes.diff
-02_libbsd.diff
 03_glibc.diff
 04_lex_disable_unused.diff
 05_disable_hardlinks.diff




More information about the Glibc-bsd-commits mailing list