[Glibc-bsd-commits] r4548 - in trunk/kfreebsd-10/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2013-06-20 16:54:58 +0000 (Thu, 20 Jun 2013)
New Revision: 4548

Added:
   trunk/kfreebsd-10/debian/patches/922_cc_version.diff
Removed:
   trunk/kfreebsd-10/debian/patches/cc_version.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
Log:
update kfreebsd-10 to svn252032



Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-06-20 16:14:04 UTC (rev 4547)
+++ trunk/kfreebsd-10/debian/changelog	2013-06-20 16:54:58 UTC (rev 4548)
@@ -1,17 +1,18 @@
-kfreebsd-10 (10.0~svn250856-1) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn252032-1) UNRELEASED; urgency=low
 
-  * Update to SVN 250856
-
   [Petr Salinger]   
+  * New upstream snapshot.
+    - fix for FreeBSD-SA-13:06.mmap (CVE-2013-2171). (Closes: #712892)
   * refresh all patches
   * switch to gcc-4.8
   * disable 901_disable_optimization_2.diff
   * bump Breaks of grub due to #699002.
 
   [Steven McDonald]
-  * temporary patches debugger.diff and cc_version.diff
+  * add 922_cc_version.diff
+  * temporary patch debugger.diff
 
- -- Christoph Egger <christoph at debian.org>  Tue, 21 May 2013 18:13:53 +0200
+ -- Christoph Egger <christoph at debian.org>  Thu, 20 Jun 2013 18:13:53 +0200
 
 kfreebsd-10 (10.0~svn242489-1) experimental; urgency=low
 

Copied: trunk/kfreebsd-10/debian/patches/922_cc_version.diff (from rev 4546, trunk/kfreebsd-10/debian/patches/cc_version.diff)
===================================================================
--- trunk/kfreebsd-10/debian/patches/922_cc_version.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/922_cc_version.diff	2013-06-20 16:54:58 UTC (rev 4548)
@@ -0,0 +1,14 @@
+Ensure we don't accidentally match lines with 'version' as a substring in
+some other term (such as a compiler flag) when grepping for the compiler
+version.
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -86,7 +86,7 @@
+ touch version
+ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
+ i=`${MAKE:-make} -V KERN_IDENT`
+-compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
++compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
+ 
+ for dir in /bin /usr/bin /usr/local/bin; do
+ 	if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then

Deleted: trunk/kfreebsd-10/debian/patches/cc_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/cc_version.diff	2013-06-20 16:14:04 UTC (rev 4547)
+++ trunk/kfreebsd-10/debian/patches/cc_version.diff	2013-06-20 16:54:58 UTC (rev 4548)
@@ -1,14 +0,0 @@
-Ensure we don't accidentally match lines with 'version' as a substring in
-some other term (such as a compiler flag) when grepping for the compiler
-version.
---- a/sys/conf/newvers.sh
-+++ b/sys/conf/newvers.sh
-@@ -86,7 +86,7 @@
- touch version
- v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
- i=`${MAKE:-make} -V KERN_IDENT`
--compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
-+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
- 
- for dir in /bin /usr/bin /usr/local/bin; do
- 	if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2013-06-20 16:14:04 UTC (rev 4547)
+++ trunk/kfreebsd-10/debian/patches/series	2013-06-20 16:54:58 UTC (rev 4548)
@@ -28,9 +28,9 @@
 919_delete_key.diff
 920_linux_cflags.diff
 921_signal_watchdog.diff
+922_cc_version.diff
 951_disable_mk_magic.diff
 999_config.diff
 
 # temporary
 debugger.diff
-cc_version.diff