Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2013-07-04 10:17:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2013-07-02 07:45:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2013-07-04 10:17:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 2 13:39:30 UTC 2013 - [email protected] + +- PIDL: fix parsing linemarkers in preprocessor output; (bso#9636). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.sxS9kD/_old 2013-07-04 10:17:42.000000000 +0200 +++ /var/tmp/diff_new_pack.sxS9kD/_new 2013-07-04 10:17:42.000000000 +0200 @@ -129,7 +129,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3030 +%define SOURCE_TIMESTAMP 3033 %define BRANCH %{version} Version: 3.6.16 Release: 0 samba.spec: same change ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/6ba7ab5c14801aecae96373d5a9db7ab82957526 new/patches/samba.org/6ba7ab5c14801aecae96373d5a9db7ab82957526 --- old/patches/samba.org/6ba7ab5c14801aecae96373d5a9db7ab82957526 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/6ba7ab5c14801aecae96373d5a9db7ab82957526 2013-07-02 15:37:46.000000000 +0200 @@ -0,0 +1,57 @@ +From 6ba7ab5c14801aecae96373d5a9db7ab82957526 Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy <[email protected]> +Date: Wed, 6 Feb 2013 10:17:57 +0200 +Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output + +When PIDL calls out to C preprocessor to expand IDL files +and parse the output, it filters out linemarkers and line control +information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html +and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control + +With gcc 4.8 stdc-predef.h is included automatically and linemarker for the +file has extended flags that PIDL couldn't parse ('system header that needs to +be extern "C" protected for C++') + +Thanks to Jakub Jelinek <[email protected]> for explanation of the linemarker format. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517 + +Reviewed-by: Andreas Schneider <[email protected]> +--- + pidl/idl.yp | 4 +++- + pidl/lib/Parse/Pidl/IDL.pm | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git pidl/idl.yp pidl/idl.yp +index b5c5185..c8a65f6 100644 +--- pidl/idl.yp ++++ pidl/idl.yp +@@ -610,7 +610,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +diff --git pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/IDL.pm +index d4820ff..6927c89 100644 +--- pidl/lib/Parse/Pidl/IDL.pm ++++ pidl/lib/Parse/Pidl/IDL.pm +@@ -2576,7 +2576,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +-- +1.8.1.4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2013-07-01 17:13:29.000000000 +0200 +++ new/patches/series 2013-07-02 15:38:52.000000000 +0200 @@ -17,6 +17,7 @@ samba.org/1f601d14d0ee440126d7202924e5cf7af88f6ea3 -p0 # bso 9777 10/10 samba.org/17794737fedf095212cf45920dd1e29b5a1a9fa0 -p0 # bso 9880, bnc 820531 1/2 samba.org/006ba0cc73a3fe484452f594a25dd3bfee9b39fd -p0 # bso 9880, bnc 820531 2/2 +samba.org/6ba7ab5c14801aecae96373d5a9db7ab82957526 -p0 # bso 9636 # SuSE specific changes +pre_1111 suse/passdb_backend_defaults_smbpasswd.diff -p0 # default to smbpasswd on pre 11.2 systems ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2013-07-01 19:59:14.000000000 +0200 +++ new/vendor-files/tools/package-data 2013-07-02 15:45:00.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="3030" +SAMBA_PACKAGE_SVN_VERSION="3033" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
