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

[Robert Millan]

Author: rmh
Date: 2013-08-22 18:10:13 +0000 (Thu, 22 Aug 2013)
New Revision: 4902

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff
   trunk/kfreebsd-10/debian/patches/902_version.diff
   trunk/kfreebsd-10/debian/patches/922_cc_version.diff
   trunk/kfreebsd-10/debian/rules
Log:
  * New upstream snapshot.
    - Refresh all patches.
    - Fix for CVE-2013-3077. (Closes: #720471)
    - Fix for CVE-2013-5209. (Closes: #720478)

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-08-22 13:23:56 UTC (rev 4901)
+++ trunk/kfreebsd-10/debian/changelog	2013-08-22 18:10:13 UTC (rev 4902)
@@ -1,5 +1,11 @@
-kfreebsd-10 (10.0~svn253832-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn254663-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot.
+    - Refresh all patches.
+    - Fix for CVE-2013-3077. (Closes: #720471)
+    - Fix for CVE-2013-5209. (Closes: #720478)
+
+  [ Robert Millan ]
   * Harmonize kernel config with upstream, reducing the GENERIC delta.
     - Let GENERIC define fdc. DEBIAN can override this afterwards.
     - Let GENERIC define lpt, ppi, tun, gif and faith. There seems to
@@ -8,7 +14,7 @@
   * Add INCLUDE_CONFIG_FILE option.  (Closes: #706736)
   * Use config(8) from freebsd-buildutils.
 
- -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 21:44:17 +0200
+ -- Robert Millan <rmh at debian.org>  Thu, 22 Aug 2013 18:50:23 +0200
 
 kfreebsd-10 (10.0~svn253832-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff	2013-08-22 13:23:56 UTC (rev 4901)
+++ trunk/kfreebsd-10/debian/patches/002_maxpathlen.diff	2013-08-22 18:10:13 UTC (rev 4902)
@@ -1,42 +1,3 @@
---- a/usr.sbin/config/main.c
-+++ b/usr.sbin/config/main.c
-@@ -60,6 +60,10 @@
- #include "config.h"
- #include "configvers.h"
- 
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 4096
-+#endif
-+
- #ifndef TRUE
- #define TRUE	(1)
- #endif
---- a/usr.sbin/config/mkmakefile.c
-+++ b/usr.sbin/config/mkmakefile.c
-@@ -50,6 +50,10 @@
- #include "config.h"
- #include "configvers.h"
- 
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 4096
-+#endif
-+
- #define next_word(fp, wd) \
- 	{ char *word = get_word(fp); \
- 	  if (word == (char *)EOF) \
---- a/usr.sbin/config/mkoptions.c
-+++ b/usr.sbin/config/mkoptions.c
-@@ -48,6 +48,10 @@
- #include "config.h"
- #include "y.tab.h"
- 
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 4096
-+#endif
-+
- static	struct users {
- 	int	u_default;
- 	int	u_min;
 --- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 +++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 @@ -57,6 +57,10 @@

Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff	2013-08-22 13:23:56 UTC (rev 4901)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff	2013-08-22 18:10:13 UTC (rev 4902)
@@ -1,6 +1,6 @@
 --- a/sys/conf/newvers.sh
 +++ b/sys/conf/newvers.sh
-@@ -170,7 +170,7 @@
+@@ -182,7 +182,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
  #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"

Modified: trunk/kfreebsd-10/debian/patches/922_cc_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/922_cc_version.diff	2013-08-22 13:23:56 UTC (rev 4901)
+++ trunk/kfreebsd-10/debian/patches/922_cc_version.diff	2013-08-22 18:10:13 UTC (rev 4902)
@@ -10,5 +10,5 @@
 -compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
 +compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
  
- if [ -x /usr/bin/svnliteversion ] ; then
- 	svnversion=/usr/bin/svnliteversion
+ for dir in /usr/bin /usr/local/bin; do
+ 	if [ ! -z "${svnversion}" ] ; then

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-08-22 13:23:56 UTC (rev 4901)
+++ trunk/kfreebsd-10/debian/rules	2013-08-22 18:10:13 UTC (rev 4902)
@@ -119,7 +119,7 @@
 src: src-stamp
 src-stamp:
 	mkdir $(CURDIR)/src
-	cp -af $(CURDIR)/sys $(CURDIR)/usr.sbin $(CURDIR)/src
+	cp -af $(CURDIR)/sys $(CURDIR)/src
 
 	touch src-stamp