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

Petr Salinger ps-guest at alioth.debian.org
Mon Apr 12 15:04:54 UTC 2010 

Author: ps-guest
Date: 2010-04-12 15:04:48 +0000 (Mon, 12 Apr 2010)
New Revision: 3023

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/00_upstream.diff
   trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
   trunk/freebsd-buildutils/debian/patches/03_glibc.diff
   trunk/freebsd-buildutils/debian/patches/14_config.diff
   trunk/freebsd-buildutils/debian/rules
Log:
jump to 8.0 release ...



Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2010-04-12 11:06:00 UTC (rev 3022)
+++ trunk/freebsd-buildutils/debian/changelog	2010-04-12 15:04:48 UTC (rev 3023)
@@ -1,7 +1,7 @@
-freebsd-buildutils (7.3-1) UNSTABLE; urgency=low
+freebsd-buildutils (8.0-1) UNSTABLE; urgency=low
 
   [ Petr Salinger ]
-  * New upstream version (RELENG_7_3_0_RELEASE)
+  * New upstream version (RELENG_8_0_0_RELEASE)
   * Add a get-orig-source target to debian/rules and 
        stop using a tar in tar system.
   * Use quilt for patches management

Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2010-04-12 11:06:00 UTC (rev 3022)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2010-04-12 15:04:48 UTC (rev 3023)
@@ -20,7 +20,7 @@
  int	crc(int, uint32_t *, off_t *);
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -946,6 +946,7 @@
+@@ -914,6 +914,7 @@
  	}
  #endif
  
@@ -28,7 +28,7 @@
  	/*
  	 * Prior to 7.0, FreeBSD/pc98 kernel used to set the
  	 * utsname.machine to "i386", and MACHINE was defined as
-@@ -965,6 +966,7 @@
+@@ -933,6 +934,7 @@
  				machine = "pc98";
  		}
  	}
@@ -48,7 +48,7 @@
  #include "y.tab.h"
  #include "config.h"
  #include "configvers.h"
-@@ -606,7 +609,11 @@
+@@ -605,7 +608,11 @@
  	if ((dirp = opendir(p)) == NULL)
  		err(EX_OSERR, "opendir %s", p);
  	while ((dp = readdir(dirp)) != NULL) {
@@ -136,7 +136,7 @@
  		    (intmax_t)p->fts_statp->st_size);
 +#ifdef ST_MTIM
  	if (keys & F_TIME)
- 		output(indent, &offset, "time=%ld.%ld",
+ 		output(indent, &offset, "time=%ld.%09ld",
 -		    (long)p->fts_statp->st_mtimespec.tv_sec,
 -		    p->fts_statp->st_mtimespec.tv_nsec);
 +		    (long)p->fts_statp->ST_MTIM.tv_sec,
@@ -263,7 +263,7 @@
  		case F_GID:
  			ip->st_gid = strtoul(val, &ep, 10);
  			if (*ep)
-@@ -252,17 +254,19 @@
+@@ -252,20 +254,22 @@
  			if (strunvis(ip->slink, val) == -1)
  				errx(1, "symlink %s is ill-encoded", val);
  			break;
@@ -271,15 +271,19 @@
  		case F_TIME:
 -			ip->st_mtimespec.tv_sec = strtoul(val, &ep, 10);
 +			ip->ST_MTIM.tv_sec = strtoul(val, &ep, 10);
- 			if (*ep != '.')
- 				errx(1, "line %d: invalid time %s",
- 				lineno, val);
- 			val = ep + 1;
--			ip->st_mtimespec.tv_nsec = strtoul(val, &ep, 10);
-+			ip->ST_MTIM.tv_nsec = strtoul(val, &ep, 10);
+ 			if (*ep == '.') {
+ 				/* Note: we require exactly nine
+ 				 * digits after the decimal point. */
+ 				val = ep + 1;
+-				ip->st_mtimespec.tv_nsec
++				ip->ST_MTIM.tv_nsec
+ 				    = strtoul(val, &ep, 10);
+ 			} else
+-				ip->st_mtimespec.tv_nsec = 0;
++				ip->ST_MTIM.tv_nsec = 0;
  			if (*ep)
  				errx(1, "line %d: invalid time %s",
- 				lineno, val);
+ 				    lineno, val);
  			break;
 +#endif
  		case F_TYPE:

Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2010-04-12 11:06:00 UTC (rev 3022)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2010-04-12 15:04:48 UTC (rev 3023)
@@ -88,12 +88,12 @@
 +	@ln -fs ${SHLIBDIR}${.TARGET} ${SHLIB_LINK}
  .endif
  .if !defined(NM)
- 	@${CC} ${LDFLAGS} -shared -Wl,-x \
+ 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
  	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 -	    `lorder ${SOBJS} | tsort -q` ${LDADD}
 +	    `lorder ${SOBJS} | tsort` ${LDADD}
  .else
- 	@${CC} ${LDFLAGS} -shared -Wl,-x \
+ 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
  	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 -	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
 +	    `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}

Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2010-04-12 11:06:00 UTC (rev 3022)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2010-04-12 15:04:48 UTC (rev 3023)
@@ -263,3 +263,15 @@
 -LDADD=	-lmd
 -
  .include <bsd.prog.mk>
+--- a/src/usr.bin/yacc/defs.h
++++ b/src/usr.bin/yacc/defs.h
+@@ -42,6 +42,9 @@
+ #include <err.h>
+ #include <stdio.h>
+ 
++#ifndef __dead2
++# define __dead2
++#endif
+ 
+ /*  machine-dependent definitions			*/
+ /*  the following definitions are for the Tahoe		*/

Modified: trunk/freebsd-buildutils/debian/patches/14_config.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/14_config.diff	2010-04-12 11:06:00 UTC (rev 3022)
+++ trunk/freebsd-buildutils/debian/patches/14_config.diff	2010-04-12 15:04:48 UTC (rev 3023)
@@ -10,12 +10,14 @@
  
  /*
   * Structure definition
-@@ -64,8 +65,8 @@
+@@ -64,10 +65,8 @@
  int		 sbuf_bcpy(struct sbuf *, const void *, size_t);
  int		 sbuf_cat(struct sbuf *, const char *);
  int		 sbuf_cpy(struct sbuf *, const char *);
--int		 sbuf_printf(struct sbuf *, const char *, ...) __printflike(2, 3);
--int		 sbuf_vprintf(struct sbuf *, const char *, __va_list) __printflike(2, 0);
+-int		 sbuf_printf(struct sbuf *, const char *, ...)
+-	__printflike(2, 3);
+-int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
+-	__printflike(2, 0);
 +int		 sbuf_printf(struct sbuf *, const char *, ...);
 +int		 sbuf_vprintf(struct sbuf *, const char *, va_list);
  int		 sbuf_putc(struct sbuf *, int);

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2010-04-12 11:06:00 UTC (rev 3022)
+++ trunk/freebsd-buildutils/debian/rules	2010-04-12 15:04:48 UTC (rev 3023)
@@ -18,8 +18,9 @@
 VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN=http://svn.freebsd.org/base/release/$(VERSION).0
 
+PVERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g' -e 's/\./_/g')
 PCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-PTAG=RELEASE_7_3_0
+PTAG=RELEASE_$(PVERSION)_0
 
 ORIGDIR=freebsd-buildutils-$(VERSION)
 PMAKE=pmake

More information about the Glibc-bsd-commits mailing list