openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2008
- 1 participants
- 817 discussions
Hello community,
here is the log from the commit of package yast2-drbd for openSUSE:Factory
checked in at Thu Dec 18 15:37:51 CET 2008.
--------
--- yast2-drbd/yast2-drbd.changes 2008-11-19 10:54:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-drbd/yast2-drbd.changes 2008-12-18 15:10:25.000000000 +0100
@@ -0,0 +1,6 @@
+Thu Dec 18 22:09:29 CST 2008 - xwhu(a)suse.de
+
+- bnc#459742: drbd module crashes in ncurses mode
+- bnc#459747: drbd module doesn't update to the latest drbd.conf
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
update-agent-latest.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-drbd.spec ++++++
--- /var/tmp/diff_new_pack.y30438/_old 2008-12-18 15:37:44.000000000 +0100
+++ /var/tmp/diff_new_pack.y30438/_new 2008-12-18 15:37:44.000000000 +0100
@@ -21,7 +21,7 @@
Name: yast2-drbd
Url: http://en.opensuse.org/YaST
Version: 2.13.1
-Release: 215
+Release: 216
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -36,6 +36,7 @@
Patch7: bug-291490_typo.patch
Patch8: setnextbutton.diff
Patch9: bug-442758_set-button-lable.patch
+Patch10: update-agent-latest.diff
Prefix: /usr
BuildRequires: perl-XML-Writer ruby ruby-racc update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -65,6 +66,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,6 +107,9 @@
%doc %{prefix}/share/doc/packages/yast2-drbd
%changelog
+* Thu Dec 18 2008 xwhu(a)suse.de
+- bnc#459742: drbd module crashes in ncurses mode
+- bnc#459747: drbd module doesn't update to the latest drbd.conf
* Wed Nov 19 2008 cmeng(a)novell.com
- bnc#442758: use another API to set the button lable
* Thu Oct 02 2008 xwhu(a)suse.de
++++++ bug-442758_set-button-lable.patch ++++++
--- /var/tmp/diff_new_pack.y30438/_old 2008-12-18 15:37:44.000000000 +0100
+++ /var/tmp/diff_new_pack.y30438/_new 2008-12-18 15:37:44.000000000 +0100
@@ -1,8 +1,8 @@
Index: yast2-drbd-2.13.1/src/wizards.ycp
===================================================================
---- yast2-drbd-2.13.1.orig/src/wizards.ycp
-+++ yast2-drbd-2.13.1/src/wizards.ycp
-@@ -67,11 +67,11 @@ any TabSequence()
+--- yast2-drbd-2.13.1.orig/src/wizards.ycp 2008-12-18 13:25:14.000000000 +0800
++++ yast2-drbd-2.13.1/src/wizards.ycp 2008-12-18 13:25:36.000000000 +0800
+@@ -67,11 +67,11 @@
Wizard::CreateTree(tree, "DRBD");
// Buttons redefinition
@@ -12,7 +12,7 @@
if (UI::WidgetExists(`id(`wizardTree))) {
- Wizard::ReplaceBackButton(`PushButton(`id(`help), `opt(`key_F1), Label::HelpButton()));
- Wizard::ReplaceAbortButton(`PushButton(`id(`abort), `opt(`key_F9), Label::CancelButton()));
-+ Wizard::SetBackButton(`help, Label::HelpButton());
++ Wizard::SetBackButton(`help_button, Label::HelpButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
} else {
UI::WizardCommand(`SetNextButtonLabel( Label::FinishButton() ) );
++++++ update-agent-latest.diff ++++++
Index: yast2-drbd-2.13.1/agents/drbd.rb.yy
===================================================================
--- yast2-drbd-2.13.1.orig/agents/drbd.rb.yy 2008-12-18 22:07:52.000000000 +0800
+++ yast2-drbd-2.13.1/agents/drbd.rb.yy 2008-12-18 22:07:52.000000000 +0800
@@ -1,20 +1,31 @@
class DrbdParser
-token TK_GLOBAL TK_RESOURCE TK_ON TK_NET TK_DISK_S TK_SYNCER TK_STARTUP TK_DISABLE_IO_HINTS TK_DISABLE_IP_VERIFICATION TK_PROTOCOL TK_INCON_DEGR_CMD TK_ADDRESS TK_DISK TK_DEVICE TK_META_DISK TK_MINOR_COUNT TK_INTEGER TK_STRING TK_ON_IO_ERROR TK_SIZE TK_TIMEOUT TK_CONNECT_INT TK_PING_INT TK_MAX_BUFFERS TK_IPADDR TK_UNPLUG_WATERMARK TK_MAX_EPOCH_SIZE TK_SNDBUF_SIZE TK_SKIP_SYNC TK_USE_CSUMS TK_RATE TK_SYNC_GROUP TK_AL_EXTENTS TK_WFC_TIMEOUT TK_DEGR_WFC_TIMEOUT TK_KO_COUNT TK_ON_DISCONNECT TK_DIALOG_REFRESH
+token TK_GLOBAL TK_RESOURCE TK_ON TK_NET TK_DISK_S TK_SYNCER TK_STARTUP TK_DISABLE_IP_VERIFICATION TK_PROTOCOL TK_ADDRESS TK_DISK TK_DEVICE TK_META_DISK TK_MINOR_COUNT TK_INTEGER TK_STRING TK_ON_IO_ERROR TK_SIZE TK_TIMEOUT TK_CONNECT_INT TK_PING_INT TK_MAX_BUFFERS TK_IPADDR TK_UNPLUG_WATERMARK TK_MAX_EPOCH_SIZE TK_SNDBUF_SIZE TK_RATE TK_AL_EXTENTS TK_WFC_TIMEOUT TK_DEGR_WFC_TIMEOUT TK_KO_COUNT TK_ON_DISCONNECT TK_DIALOG_REFRESH TK_USAGE_COUNT TK_COMMON TK_HANDLERS TK_FENCING TK_USE_BMBV TK_NO_DISK_BARRIER TK_NO_DISK_FLUSHES TK_NO_DISK_DRAIN TK_NO_MD_FLUSHES TK_MAX_BIO_BVECS TK_PINT_TIMEOUT TK_ALLOW_TWO_PRIMARIES TK_CRAM_HMAC_ALG TK_SHARED_SECRET TK_AFTER_SB_0PRI TK_AFTER_SB_1PRI TK_AFTER_SB_2PRI TK_DATA_INTEGRITY_ALG TK_RR_CONFLICT TK_NO_TCP_CORK TK_CPU_MASK TK_VERIFY_ALG TK_AFTER TK_FLEXIBLE_META_DISK TK_PRI_ON_INCON_DEGR TK_PRI_LOST_AFTER_SB TK_PRI_LOST TK_OUTDATE_PEER TK_LOCAL_IO_ERROR TK_SPLIT_BRAIN TK_BEFORE_RESYNC_TARGET TK_AFTER_RESYNC_TARGET TK_WAIT_AFTER_SB TK_BECOME_PRIMARY_ON TK_IPV6ADDR TK_IPV6
rule
- config: global_sec resources { $drbd['global'] = val[0]; $drbd['resources'] = val[1]; return $drbd; }
+ config: global_sec common_sec resources { $drbd['global'] = val[0]; $drbd['common'] = val[1]; $drbd['resources'] = val[2]; return $drbd; }
global_sec: /* none */ { return {}; }
| TK_GLOBAL '{' glob_stmts '}' { return val[2]; }
glob_stmts: /* none */ { return {}; }
| glob_stmts glob_stmt ';' { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
- glob_stmt: TK_DISABLE_IO_HINTS { return ["#{val[0]}", true]; }
- | TK_DISABLE_IP_VERIFICATION { return ["#{val[0]}", true]; }
+ glob_stmt: TK_USAGE_COUNT TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_DISABLE_IP_VERIFICATION { return ["#{val[0]}", true]; }
| TK_MINOR_COUNT TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_DIALOG_REFRESH TK_STRING { return ["#{val[0]}", val[1]];}
+ common_sec: /* none */ { return {}; }
+ | TK_COMMON '{' common_stmts '}' { return val[2]; }
+ common_stmts: /* none */ { return {}; }
+ | common_stmts common_stmt { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
+
+ common_stmt: TK_DISK_S disk_stmts '}' { return ["#{val[0]}", val[1]]; }
+ | TK_NET '{' net_stmts '}' { return ["#{val[0]}", val[2]]; }
+ | TK_SYNCER '{' sync_stmts '}' { return ["#{val[0]}", val[2]]; }
+ | TK_STARTUP '{' startup_stmts '}' { return ["#{val[0]}", val[2]]; }
+ | TK_HANDLERS '{' handlers_stmts '}' { return ["#{val[0]}", val[2]]; }
+
resources: /* none */ { return {}; }
| resources resource { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
@@ -23,8 +34,8 @@
resource_name: TK_STRING { return val[0]; }
res_stmts: /* none */ { return {}; }
- | res_stmts res_stmt ';' { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
- | res_stmts section {nk = val[1][0];
+ | res_stmts res_stmt ';' { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
+ | res_stmts section {nk = val[1][0];
if nk == "on" then
if (!val[0]["on"]) then val[0]["on"] = {}; end
val[0]["on"][val[1][1]] = val[1][2];
@@ -34,12 +45,15 @@
return val[0]; }
res_stmt: TK_PROTOCOL TK_STRING { return ["#{val[0]}", val[1]]; }
- | TK_INCON_DEGR_CMD TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_DEVICE TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_META_DISK meta_disk_and_index { return ["#{val[0]}", val[1]]; }
+ | TK_DISK TK_STRING { return ["#{val[0]}", val[1]]; }
section: TK_DISK_S disk_stmts '}' { return ["#{val[0]}", val[1]]; }
| TK_NET '{' net_stmts '}' { return ["#{val[0]}", val[2]]; }
| TK_SYNCER '{' sync_stmts '}' { return ["#{val[0]}", val[2]]; }
| TK_STARTUP '{' startup_stmts '}' { return ["#{val[0]}", val[2]]; }
+ | TK_HANDLERS '{' handlers_stmts '}' { return ["#{val[0]}", val[2]]; }
| TK_ON hostname '{' host_stmts '}' { return ["#{val[0]}", "#{val[1]}", val[3]]; }
hostname: TK_STRING { return val[0]; }
@@ -49,6 +63,13 @@
disk_stmt: TK_ON_IO_ERROR TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_SIZE TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_FENCING TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_USE_BMBV TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_NO_DISK_BARRIER TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_NO_DISK_FLUSHES TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_NO_DISK_DRAIN TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_NO_MD_FLUSHES TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_MAX_BIO_BVECS TK_STRING { return ["#{val[0]}", val[1]]; }
net_stmts: /* none */ { return {}; }
| net_stmts net_stmt ';' { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
@@ -56,20 +77,29 @@
net_stmt: TK_TIMEOUT TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_CONNECT_INT TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_PING_INT TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_PINT_TIMEOUT TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_MAX_BUFFERS TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_UNPLUG_WATERMARK TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_MAX_EPOCH_SIZE TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_SNDBUF_SIZE TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_KO_COUNT TK_STRING { return ["#{val[0]}", val[1]]; }
- | TK_ON_DISCONNECT TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_ALLOW_TWO_PRIMARIES { return ["#{val[0]}", true]; }
+ | TK_CRAM_HMAC_ALG TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_SHARED_SECRET TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_AFTER_SB_0PRI TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_AFTER_SB_1PRI TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_AFTER_SB_2PRI TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_DATA_INTEGRITY_ALG TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_RR_CONFLICT TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_NO_TCP_CORK { return ["#{val[0]}", true]; }
sync_stmts: /* none */ { return {}; }
| sync_stmts sync_stmt ';' { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
- sync_stmt: TK_SKIP_SYNC { return ["#{val[0]}", true];}
- | TK_USE_CSUMS { return ["#{val[0]}", true];}
- | TK_RATE TK_STRING { return ["#{val[0]}", val[1]]; }
- | TK_SYNC_GROUP TK_STRING { return ["#{val[0]}", val[1]]; }
+ sync_stmt: TK_RATE TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_CPU_MASK TK_STRING { return ["#{val[0]}", vavl[1]]; }
+ | TK_VERIFY_ALG TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_AFTER TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_AL_EXTENTS TK_STRING { return ["#{val[0]}", val[1]]; }
host_stmts: /* none */ { return {}; }
@@ -79,16 +109,35 @@
| TK_DEVICE TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_ADDRESS ip_and_port { return ["#{val[0]}", val[1]]; }
| TK_META_DISK meta_disk_and_index { return ["#{val[0]}", val[1]]; }
+ | TK_FLEXIBLE_META_DISK flexible_meta_disk { return ["#{val[0]}", val[1]]; }
+
+ handlers_stmts: /* none */ { return {}; }
+ | handlers_stmts handlers_stmt ';' { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
+
+ handlers_stmt: TK_PRI_ON_INCON_DEGR TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_PRI_LOST_AFTER_SB TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_PRI_LOST TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_OUTDATE_PEER TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_LOCAL_IO_ERROR TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_SPLIT_BRAIN TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_BEFORE_RESYNC_TARGET TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_AFTER_RESYNC_TARGET TK_STRING { return ["#{val[0]}", val[1]]; }
ip_and_port: TK_STRING ':' TK_STRING { return "#{val[0]}:#{val[2]}"; }
+ | TK_IPV6 TK_IPV6ADDR ":" TK_STRING { return "#{val[0]} #{val[1]}:#{val[3]}"; }
+ | TK_STRING TK_STRING ':' TK_STRING { return "#{val[0]} #{val[1]}:#{val[3]}"; }
meta_disk_and_index: TK_STRING TK_STRING { return "#{val[0]} #{val[1]}"; }
| TK_STRING { return val[0]; }
+ flexible_meta_disk: TK_STRING { return val[0]; }
+
startup_stmts: /* */ { return {}; }
| startup_stmts startup_stmt ';' { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; }
startup_stmt: TK_WFC_TIMEOUT TK_STRING { return ["#{val[0]}", val[1]]; }
+ | TK_WAIT_AFTER_SB { return ["#{val[0]}", true]; }
+ | TK_BECOME_PRIMARY_ON TK_STRING { return ["#{val[0]}", val[1]]; }
| TK_DEGR_WFC_TIMEOUT TK_STRING { return ["#{val[0]}", val[1]]; }
end
@@ -98,21 +147,17 @@
---- inner
def parse(str)
-# @yydebug = true
+ @yydebug = false
@q = []
until str.empty? || !str
case str
when /\A\s+/
when /\Adisable-ip-verification/
@q.push [:TK_DISABLE_IP_VERIFICATION, 'disable-ip-verification']
- when /\Adisable-io-hints/
- @q.push [:TK_DISABLE_IO_HINTS, 'disable-io-hints']
- when /\Aincon-degr-cmd/
- @q.push [:TK_INCON_DEGR_CMD, 'incon-degr-cmd']
+ when /\Ausage-count/
+ @q.push [:TK_USAGE_COUNT, 'usage-count']
when /\Adialog-refresh/
@q.push [:TK_DIALOG_REFRESH, 'dialog-refresh']
- when /\Aon-disconnect/
- @q.push [:TK_ON_DISCONNECT, 'on-disconnect']
when /\Aon-io-error/
@q.push [:TK_ON_IO_ERROR, 'on-io-error']
when /\Aglobal/
@@ -121,10 +166,12 @@
@q.push [:TK_MINOR_COUNT, 'minor-count']
when /\Aresource/
@q.push [:TK_RESOURCE, 'resource']
+ when /\Acommon/
+ @q.push [:TK_COMMON, 'common']
when /\Aprotocol/
@q.push [:TK_PROTOCOL, 'protocol']
when /\Adisk\s*\{/
- @q.push [:TK_DISK_S, 'disk']
+ @q.push [:TK_DISK_S, 'disk_s']
when /\Adisk/
@q.push [:TK_DISK, 'disk']
when /\Anet/
@@ -133,12 +180,80 @@
@q.push [:TK_SYNCER, 'syncer']
when /\Astartup/
@q.push [:TK_STARTUP, 'startup']
+ when /\Ahandlers/
+ @q.push [:TK_HANDLERS, 'handlers']
+ when /\Afencing/
+ @q.push [:TK_FENCING, 'fencing']
+ when /\Ause-bmbv/
+ @q.push [:TK_USE_BMBV, 'use-bmbv']
+ when /\Ano-disk-barrier/
+ @q.push [:TK_NO_DISK_BARRIER, 'no-disk-barrier']
+ when /\Ano-disk-flushes/
+ @q.push [:TK_NO_DISK_FLUSHES, 'no-disk-flushes']
+ when /\Ano-disk-drain/
+ @q.push [:TK_NO_DISK_DRAIN, 'no-disk-drain']
+ when /\Ano-md-flushes/
+ @q.push [:TK_NO_MD_FLUSHES, 'no-md-flushes']
+ when /\Amax-bio-bvecs/
+ @q.push [:TK_MAX_BIO_BVECS, 'max-bio-bvecs']
+ when /\Aping-timeout/
+ @q.push [:TK_PING_TIMEOUT, 'ping-timeout']
+ when /\Aallow-two-primaries/
+ @q.push [:TK_ALLOW_TWO_PRIMARIES, 'allow-two-primaries']
+ when /\Acram-hmac-alg/
+ @q.push [:TK_CRAM_HMAC_ALG, 'cram-hmac-alg']
+ when /\Ashared-secret/
+ @q.push [:TK_SHARED_SECRET, 'shared-secret']
+ when /\Aafter-sb-0pri/
+ @q.push [:TK_AFTER_SB_0PRI, 'after-sb-0pri']
+ when /\Aafter-sb-1pri/
+ @q.push [:TK_AFTER_SB_0PRI, 'after-sb-1pri']
+ when /\Aafter-sb-2pri/
+ @q.push [:TK_AFTER_SB_0PRI, 'after-sb-2pri']
+ when /\Adata-integrity-alg/
+ @q.push [:TK_DATA_INTEGRITY_ALG, 'data-integrity-alg']
+ when /\Arr-conflict/
+ @q.push [:TK_RR_CONFLICT, 'rr-conflict']
+ when /\Apri-on-incon-degr/
+ @q.push [:TK_PRI_ON_INCON_DEGR, 'pri-on-incon-degr']
+ when /\Apri-lost-after-sb/
+ @q.push [:TK_PRI_LOST_AFTER_SB, 'pri-lost-after-sb']
+ when /\Apri-lost/
+ @q.push [:TK_PRI_LOST, 'pri-lost']
+ when /\Aoutdate-peer/
+ @q.push [:TK_OUTDATE_PEER, 'outdate-peer']
+ when /\Alocal-io-error/
+ @q.push [:TK_LOCAL_IO_ERROR, 'local-io-error']
+ when /\Asplit-brain/
+ @q.push [:TK_SPLIT_BRAIN, 'split-brain']
+ when /\Abefore-resync-target/
+ @q.push [:TK_BEFORE_RESYNC_TARGET, 'before-rsync-target']
+ when /\Aafter-resync-target/
+ @q.push [:TK_AFTER_RESYNC_TARGET, 'after-resync-target']
+ when /\Await-after-sb/
+ @q.push [:TK_WAIT_AFTER_SB, 'wait-after-sb']
+ when /\Abecome-primary-on/
+ @q.push [:TK_BECOME_PRIMARY_ON, 'become-primary-on']
+ when /\Ano-tcp-cork/
+ @q.push [:TK_NO_TCP_CORK, 'no-tcp-cork']
+ when /\Acpu-mask/
+ @q.push [:TK_CPU_MASK, 'cpu-mask']
+ when /\Averify-alg/
+ @q.push [:TK_VERIFY_ALG, 'verify-alg']
when /\Asize/
@q.push [:TK_SIZE, 'size']
when /\Atimeout/
@q.push [:TK_TIMEOUT, 'timeout']
when /\Aconnect-int/
@q.push [:TK_CONNECT_INT, 'connect-int']
+ when /\Aafter-sb-0pri/
+ @q.push [:TK_AFTER_SB_0PRI, 'after-sb-0pri']
+ when /\Aafter-sb-1pri/
+ @q.push [:TK_AFTER_SB_0PRI, 'after-sb-1pri']
+ when /\Aafter-sb-2pri/
+ @q.push [:TK_AFTER_SB_0PRI, 'after-sb-2pri']
+ when /\Arr-conflict/
+ @q.push [:TK_RR_CONFLICT, 'rr-conflict']
when /\Aping-int/
@q.push [:TK_PING_INT, 'ping-int']
when /\Amax-buffers/
@@ -151,32 +266,34 @@
@q.push [:TK_SNDBUF_SIZE, 'sndbuf-size']
when /\Ako-count/
@q.push [:TK_KO_COUNT, 'ko-count']
- when /\Askip-sync/
- @q.push [:TK_SKIP_SYNC, 'skip-sync']
- when /\Ause-csums/
- @q.push [:TK_USE_CSUMS, 'use-csums']
when /\Arate/
@q.push [:TK_RATE, 'rate']
- when /\Agroup/
- @q.push [:TK_SYNC_GROUP, 'group']
when /\Aal-extents/
@q.push [:TK_AL_EXTENTS, 'al-extents']
+ when /\Aafter/
+ @q.push [:TK_AFTER, 'after']
when /\Adevice/
@q.push [:TK_DEVICE, 'device']
when /\Aaddress/
@q.push [:TK_ADDRESS, 'address']
when /\Ameta-disk/
@q.push [:TK_META_DISK, 'meta-disk']
- when /\Awfc-timeout/
- @q.push [:TK_WFC_TIMEOUT, 'wfc-timeout']
+ when /\Aflexible-meta-disk/
+ @q.push [:TK_FLEXIBLE_META_DISK, 'flexible-meta-disk']
when /\Adegr-wfc-timeout/
@q.push [:TK_DEGR_WFC_TIMEOUT, 'degr-wfc-timeout']
+ when /\Awfc-timeout/
+ @q.push [:TK_WFC_TIMEOUT, 'wfc-timeout']
+ when /\Aipv6/
+ @q.push [:TK_IPV6, 'ipv6']
when /\Aon\s*/
@q.push [:TK_ON, 'on']
when /\A"[^"]*"/
@q.push [:TK_STRING, $&]
+ when /\A\[[\w\.\/:]+:[\w\.\/:]+\]/
+ @q.push [:TK_IPV6ADDR, $&]
when /\A[\w\.\/\[\]-]+/
- @q.push [:TK_STRING, $&]
+ @q.push [:TK_STRING, $&]
when /\A.|\n/o
s = $&
@q.push [s, s]
@@ -235,7 +352,7 @@
def doList (path)
if path.length == 0 then
- puts "[ \"global\", \"resources\" ]"
+ puts "[ \"global\", \"resources\", \"common\" ]"
return
end
@@ -331,6 +448,10 @@
errlog path[it]+" is changed to "+path[it].chomp()[1..-2]
path[it]=path[it].chomp()[1..-2]
end
+ if path[it] != "" and path[it][0..1] == "\\\"" then
+ errlog path[it]+" is changed to "+path[it].chomp()[1..-3]+"\""
+ path[it]=path[it].chomp()[1..-3]+"\""
+ end
end
if args[0..1] == "\\\"" then
@@ -431,7 +552,7 @@
if $drbd.has_key?("global") then
file.puts "global {"
$drbd["global"].each_key do |key|
- if key == "disable-ip-verification" or key == "disable-io-hints" then
+ if key == "disable-ip-verification" then
if $drbd["global"][key] == "" or $drbd["global"][key] == "true" then
file.puts " "+key+";"
end
@@ -449,14 +570,10 @@
file.puts " protocol\t"+$drbd["resources"][res_name]["protocol"]+";"
end
- if $drbd["resources"][res_name].has_key?("incon-degr-cmd") then
- file.puts " incon-degr-cmd\t"+$drbd["resources"][res_name]["incon-degr-cmd"]+";"
- end
-
- if $drbd["resources"][res_name].has_key?("disk") then
+ if $drbd["resources"][res_name].has_key?("disk_s") then
file.puts " disk {"
- $drbd["resources"][res_name]["disk"].each_key do |key|
- file.puts " "+key+"\t"+$drbd["resources"][res_name]["disk"][key]+";"
+ $drbd["resources"][res_name]["disk_s"].each_key do |key|
+ file.puts " "+key+"\t"+$drbd["resources"][res_name]["disk_s"][key]+";"
end
file.puts " }"
end
@@ -512,10 +629,12 @@
# `Write (.drbd) means to write the file, other wise, the file is not written anyway
+errlog($drbd.to_s)
+
$stdin.each do |line|
errlog(line)
line.chomp
- cmd = line.gsub(/^`?([a-zA-Z]+)\s.*$/, '\1')
+ cmd = line.gsub(/^`?([a-zA-Z]+)\s+$/, '\1')
path = line.gsub(/^`?([a-zA-Z]+)\s+\(([^,]*)(,.*)?\)$/, '\2').split('.')-[""]-["\n"]
args = line.gsub(/^`?([a-zA-Z]+)\s+\(([^,]*)(,.*)?\)$/, '\3')
if args.length != 0 then
Index: yast2-drbd-2.13.1/src/Drbd.ycp
===================================================================
--- yast2-drbd-2.13.1.orig/src/Drbd.ycp 2008-12-18 22:07:52.000000000 +0800
+++ yast2-drbd-2.13.1/src/Drbd.ycp 2008-12-18 22:08:14.000000000 +0800
@@ -49,9 +49,9 @@
global map resource_config = $[];
global string drbd_dir = "/etc";
global boolean start_daemon = false;
-global map<string, list<string> > config_name = $["disk":["on-io-error", "size"],
- "syncer":["skip-sync", "use-csums", "rate", "group", "al-extents"],
- "net":["timeout", "connect-int", "ping-int", "max-buffers", "unplug-watermark", "max-epoch-size", "sndbuf-size", "ko-count", "on-disconnect"],
+global map<string, list<string> > config_name = $["disk_s":["on-io-error", "size"],
+ "syncer":["rate", "al-extents"],
+ "net":["timeout", "connect-int", "ping-int", "max-buffers", "unplug-watermark", "max-epoch-size", "sndbuf-size", "ko-count"],
"startup":["wfc-timeout", "degr-wfc-timeout"]];
@@ -90,7 +90,7 @@
y2milestone("read drbd conf file: %1", drbd_dir);
//read global configs
- foreach (string key, [ "disable-ip-verification", "minor-count", "dialog-refresh", "disable-io-hints" ],
+ foreach (string key, [ "disable-ip-verification", "minor-count", "dialog-refresh"],
{
string val = (string)SCR::Read(topath(sformat(".drbd.global.%1", key)));
global_config[key] = val;
@@ -109,7 +109,7 @@
map config = $[];
list<string> res_configs = (list<string>)SCR::Dir(topath(sformat(".drbd.resources.%1", resname)));
- foreach (string resconf, ["protocol", "incon-degr-cmd"],
+ foreach (string resconf, ["protocol"],
{
if (contains(res_configs, resconf)) {
string val = (string)SCR::Read(topath(sformat(".drbd.resources.%1.%2",resname,resconf)));
@@ -238,7 +238,7 @@
//global config here
Progress::NextStage();
y2debug("to write global config: global_config=%1", global_config);
- foreach(string key, [ "disable-ip-verification", "minor-count", "dialog-refresh", "disable-io-hints" ],
+ foreach(string key, [ "disable-ip-verification", "minor-count", "dialog-refresh" ],
{
if (global_config[key]:nil != nil) {
SCR::Write(topath(sformat(".drbd.global.%1", key)), global_config[key]:nil);
Index: yast2-drbd-2.13.1/src/global_conf.ycp
===================================================================
--- yast2-drbd-2.13.1.orig/src/global_conf.ycp 2007-04-17 00:46:56.000000000 +0800
+++ yast2-drbd-2.13.1/src/global_conf.ycp 2008-12-18 22:07:52.000000000 +0800
@@ -15,7 +15,6 @@
void global_conf_Read()
{
disipver = Drbd::global_config["disable-ip-verification"]:"false";
- disiohin = Drbd::global_config["disable-io-hints"]:"false";
diagref = Drbd::global_config["dialog-refresh"]:"1";
mc = Drbd::global_config["minor-count"]:"5";
}
@@ -28,21 +27,18 @@
`VBox(
`Left(`IntField(`id("MinorCount"), _("Minor Count"), 1, 20, tointeger(mc))),
`Left(`IntField(`id("DialogRefresh"), _("Dialog Refresh"), 0, 1000, tointeger(diagref))),
- `Left(`CheckBox(`id("DisableIpVerification"), `opt(`notify), _("Disable IP Verification"), disipver=="true")),
- `Left(`CheckBox(`id("DisableIoHint"), `opt(`notify), _("Disable IO Hint"), disiohin=="true"))))
- ), `VStretch()
+ `Left(`CheckBox(`id("DisableIpVerification"), `opt(`notify), _("Disable IP Verification"), disipver=="true"))
+ ))), `VStretch()
);
}
boolean global_conf_Write ()
{
disipver = (boolean)UI::QueryWidget(`id("DisableIpVerification"), `Value) ? "true" : nil;
- disiohin = (boolean)UI::QueryWidget(`id("DisableIoHint"), `Value) ? "true" : nil;
diagref = sformat("%1", UI::QueryWidget(`id("DialogRefresh"), `Value));
mc = sformat("%1", UI::QueryWidget(`id("MinorCount"), `Value));
Drbd::global_config["disable-ip-verification"] = disipver;
- Drbd::global_config["disable-io-hints"] = disiohin;
Drbd::global_config["dialog-refresh"] = diagref;
Drbd::global_config["minor-count"] = mc;
@@ -73,7 +69,7 @@
ret = (string)UI::QueryWidget (`id (`wizardTree), `CurrentItem);
}
- if (ret=="DialogRefresh" || ret=="MinorCount" || ret=="DisableIpVerification" || ret=="DisableIoHint") {
+ if (ret=="DialogRefresh" || ret=="MinorCount" || ret=="DisableIpVerification" ) {
continue;
}
Index: yast2-drbd-2.13.1/src/resource_conf.ycp
===================================================================
--- yast2-drbd-2.13.1.orig/src/resource_conf.ycp 2008-12-18 22:07:52.000000000 +0800
+++ yast2-drbd-2.13.1/src/resource_conf.ycp 2008-12-18 22:07:52.000000000 +0800
@@ -78,14 +78,14 @@
ret = (string)UI::QueryWidget (`id (`wizardTree), `CurrentItem);
}
- if (ret=="resource_conf" || ret=="DialogRefresh" || ret=="MinorCount" || ret=="DisableIpVerification" || ret=="DisableIoHint") {
+ if (ret=="resource_conf" || ret=="DialogRefresh" || ret=="MinorCount" || ret=="DisableIpVerification" ) {
continue;
}
if (ret == `delete)
{
string resname = (string) UI::QueryWidget(`id(`res_list_table), `CurrentItem);
- Drbd::resource_config[resname] = nil;
+ Drbd::resource_config[sformat("%1", resname)] = nil;
ret = `list;
break;
}
@@ -185,9 +185,7 @@
return `VBox(
`HBox(
`ComboBox(`id(`protocol), _("Protocol"), ["A", "B", "C"]),
- `HSpacing(),
- `TextEntry(`id(`cmd), _("Inconsistent degraded command"),
- res_config["incon-degr-cmd"]:"\"echo '!DRBD! pri on incon-degr' | wall ; sleep 60 ; halt -f\"")
+ `HSpacing()
),
`Frame(
"Startup",
@@ -201,7 +199,7 @@
`HBox(
`ComboBox(`id(`on_io_error), "on-io-error", ["detach", "panic", "pass_on"]),
`HSpacing(),
- `TextEntry(`id(`size), "size", res_config["disk", "size"]:"")
+ `TextEntry(`id(`size), "size", res_config["disk_s", "size"]:"")
)
),
`Frame(
@@ -218,8 +216,7 @@
),
`HBox(
`TextEntry(`id(`max_epoch_size), "max-epoch-size", res_config["net", "max-epoch-size"]:""),
- `TextEntry(`id(`ko_count), "ko-count", res_config["net", "ko-count"]:""),
- `ComboBox(`id(`on_disconnect), "on-disconnect", ["reconnect", "stand_alone", "freeze_io"])
+ `TextEntry(`id(`ko_count), "ko-count", res_config["net", "ko-count"]:"")
)
)
),
@@ -227,8 +224,7 @@
"Syncer",
`HBox(
`TextEntry(`id(`rate), "Rate", res_config["syncer", "rate"]:""),
- `TextEntry(`id(`al_extents), "Al-extents", res_config["syncer", "al-extents"]:""),
- `TextEntry(`id(`group), "Group", res_config["syncer", "group"]:"")
+ `TextEntry(`id(`al_extents), "Al-extents", res_config["syncer", "al-extents"]:"")
)
),
`VStretch(),
@@ -247,22 +243,19 @@
if (UI::QueryWidget(`id(`protocol), `Value) == nil)
{
if (res_config["protocol"]:nil == nil) res_config["protocol"] = "C";
- if (res_config["incon-degr-cmd"]:nil == nil) res_config["incon-degr-cmd"] = "echo '!DRBD! pri on incon-degr' | wall ; sleep 60 ; halt -f";
- if (res_config["disk", "on-io-error"]:nil == nil) res_config["disk"] = $["on-io-error" : "pass_on"];
- if (res_config["net", "on-disconnect"]:nil == nil) res_config["net"] = $["on-disconnect" : "reconnect"];
+ if (res_config["disk_s", "on-io-error"]:nil == nil) res_config["disk_s"] = $["on-io-error" : "pass_on"];
return res_config;
}
res_config["protocol"] = (string) UI::QueryWidget(`id(`protocol), `Value);
- res_config["incon-degr-cmd"] = (string) UI::QueryWidget(`id(`cmd), `Value);
res_config["startup"] = $[
"wfc-timeout" : (string) UI::QueryWidget(`id(`wfc_timeout), `Value),
"degr-wfc-timeout" : (string) UI::QueryWidget(`id(`degr_wfc_timeout), `Value)
];
- res_config["disk"] = $[
+ res_config["disk_s"] = $[
"on-io-error" : (string) UI::QueryWidget(`id(`on_io_error), `Value),
"size" : (string) UI::QueryWidget(`id(`size), `Value)
];
@@ -275,12 +268,10 @@
"max-buffers" : (string) UI::QueryWidget(`id(`max_buffers), `Value),
"max-epoch-size" : (string) UI::QueryWidget(`id(`max_epoch_size), `Value),
"ko-count" : (string) UI::QueryWidget(`id(`ko_count), `Value),
- "on-disconnect" : (string) UI::QueryWidget(`id(`on_disconnect), `Value),
];
res_config["syncer"] = $[
"al-extents" : (string) UI::QueryWidget(`id(`al_extents), `Value),
- "group" : (string) UI::QueryWidget(`id(`group), `Value),
"rate" : (string) UI::QueryWidget(`id(`rate), `Value)
];
@@ -376,8 +367,7 @@
my_SetContents("resource_conf", res_advance_config_get_dialog(res_config));
UI::ChangeWidget(`id(`protocol), `Value, res_config["protocol"]:"C");
- UI::ChangeWidget(`id(`on_io_error), `Value, res_config["disk", "on-io-error"]:"pass_on");
- UI::ChangeWidget(`id(`on_disconnect), `Value, res_config["net", "on-disconnect"]:"reconnect");
+ UI::ChangeWidget(`id(`on_io_error), `Value, res_config["disk_s", "on-io-error"]:"pass_on");
Wizard::DisableNextButton();
Wizard::DisableAbortButton();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package seamonkey for openSUSE:Factory
checked in at Thu Dec 18 15:37:30 CET 2008.
--------
--- seamonkey/seamonkey.changes 2008-11-17 19:37:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/seamonkey/seamonkey.changes 2008-12-17 21:21:13.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Dec 17 15:19:44 EST 2008 - hfiguiere(a)suse.de
+
+- Review and approve changes.
+
+-------------------------------------------------------------------
+Mon Dec 15 16:11:58 CET 2008 - wr(a)rosenauer.org
+
+- update to security release 1.1.14 (bnc#455804)
+ for details:
+ http://www.mozilla.org/security/known-vulnerabilities/seamonkey11.html
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
seamonkey-source-1.1.13.tar.bz2
New:
----
seamonkey-source-1.1.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.k28514/_old 2008-12-18 15:37:18.000000000 +0100
+++ /var/tmp/diff_new_pack.k28514/_new 2008-12-18 15:37:18.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package seamonkey (Version 1.1.13)
+# spec file for package seamonkey (Version 1.1.14)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -48,7 +48,7 @@
%endif
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Provides: web_browser
-Version: 1.1.13
+Version: 1.1.14
Release: 1
Summary: The successor of the Mozilla Application Suite
Url: http://www.mozilla.org/projects/seamonkey
@@ -96,7 +96,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: libstdc++ coreutils /bin/sh
%define _unpackaged_files_terminate_build 0
-%define releasedate 2008111000
+%define releasedate 2008121300
%define progname seamonkey
%define prefix /usr
%define progdir %_libdir/%{progname}
@@ -710,6 +710,12 @@
%dir %{progdir}/dictionaries
%changelog
+* Wed Dec 17 2008 hfiguiere(a)suse.de
+- Review and approve changes.
+* Mon Dec 15 2008 wr(a)rosenauer.org
+- update to security release 1.1.14 (bnc#455804)
+ for details:
+ http://www.mozilla.org/security/known-vulnerabilities/seamonkey11.html
* Mon Nov 17 2008 maw(a)suse.de
- Review and approve changes.
* Tue Nov 11 2008 wr(a)rosenauer.org
@@ -865,7 +871,7 @@
- added seamonkey icon to filelist and use it for mail and composer
component as well for now (#158556)
- also provide the old mozilla packagenames for correct upgrade
-* Mon Mar 13 2006 stark(a)suse.de
+* Tue Mar 14 2006 stark(a)suse.de
- added Khmer (km-*) to pango locales (#157397)
- yet another set of upstream fixes (#148876)
* Sat Mar 04 2006 stark(a)suse.de
@@ -921,7 +927,7 @@
- update enigmail to 0.93.2
- added gtk2 patch to avoid theme switch events (#134831)
- replace mozilla packages with seamonkey for 10.1 and above
-* Sun Oct 23 2005 stark(a)suse.de
+* Mon Oct 24 2005 stark(a)suse.de
- update to snapshot 1.8-20051024
- update enigmail to 0.93.0
- package renamed to seamonkey with new versioning
@@ -1010,7 +1016,7 @@
- modified bounce patch to not disturb language-packs
* Wed Aug 04 2004 ro(a)suse.de
- recode desktop file to utf-8
-* Thu Jun 17 2004 stark(a)suse.de
+* Fri Jun 18 2004 stark(a)suse.de
- update to 1.7
- update enigmail to 0.84.1
- remove compreg.dat prior to rebuild-databases (#41481)
@@ -1043,7 +1049,7 @@
- install menu-icons and use them (#35992)
- install some more files (#36085)
- renewed bookmark-changes
-* Mon Mar 08 2004 stark(a)suse.de
+* Tue Mar 09 2004 stark(a)suse.de
- patch for keeping ui fonts (#35236)
* Sun Mar 07 2004 ro(a)suse.de
- match function declaration in enigmail mimedummy.cpp
@@ -1057,7 +1063,7 @@
- fixed inclusion of mozex extension
- added compiler flags for security/ (nss-opt.patch)
- update enigmail to 0.83.3
-* Thu Feb 19 2004 stark(a)suse.de
+* Fri Feb 20 2004 stark(a)suse.de
- added build-fix for s390x (#32963)
- added mozex 1.07 to the package
* Wed Feb 04 2004 stark(a)suse.de
@@ -1109,7 +1115,7 @@
to get epiphany and galeon to build
* Fri Aug 22 2003 stark(a)suse.de
- another upstream sync
-* Thu Aug 14 2003 stark(a)suse.de
+* Fri Aug 15 2003 stark(a)suse.de
- again more CVS patches from mozilla.org
* Sun Aug 10 2003 stark(a)suse.de
- updated enigmail to 0.76.5
@@ -1124,7 +1130,7 @@
- removed unneeded files from filelist (for milestone builds)
- removed update-desktop-files again because it's in
gtk2-devel-packages
-* Tue Jul 29 2003 stark(a)suse.de
+* Wed Jul 30 2003 stark(a)suse.de
- add-plugins.sh now links myspell-dictionaries for spellchecker
(#26290)
- added some bugfixes from mozilla.org
@@ -1134,7 +1140,7 @@
* Mon Jul 28 2003 adrian(a)suse.de
- add Categories to desktop file
- TODO: create .desktop files for other Mozilla modules
-* Tue Jul 22 2003 stark(a)suse.de
+* Wed Jul 23 2003 stark(a)suse.de
- check if DISPLAY set correctly (#28098)
- set $TEMP to $HOME for acroread (#27929)
- workaround the BUILD_ROOT issue in xpti.dat
@@ -1184,7 +1190,7 @@
of URLs provided on commandline ($MOZ_NEWURL)
- some spec-file modifications for slow migration to
Firebird
-* Wed Apr 02 2003 stark(a)suse.de
+* Thu Apr 03 2003 stark(a)suse.de
- updated enigmail to 0.74.0
- fixed minor bug in spec-file (only hit old SL versions)
* Mon Mar 31 2003 stark(a)suse.de
@@ -1199,7 +1205,7 @@
- added XFT patches but disabled XFT for SuSE Linux 8.2 at this
time
- added mozilla-config to devel package
-* Thu Mar 13 2003 stark(a)suse.de
+* Fri Mar 14 2003 stark(a)suse.de
- update to 1.3
- redirect error about missing file in rebuild-databases.sh
- update enigmail to 0.73.1
@@ -1290,7 +1296,7 @@
behaviour of cp
* Thu Aug 15 2002 uli(a)suse.de
- added x86-64 port by Gwenole Beauchesne
-* Mon Aug 05 2002 stark(a)suse.de
+* Tue Aug 06 2002 stark(a)suse.de
- apply s390 patch only on s390
* Mon Aug 05 2002 stark(a)suse.de
- added patch to compile on s390(x)
@@ -1522,7 +1528,7 @@
* Wed Dec 20 2000 egger(a)suse.de
- Integrated the latest bugfixes.
- Added: Provides: web_browser to the specfile.
-* Mon Dec 11 2000 egger(a)suse.de
+* Tue Dec 12 2000 egger(a)suse.de
- Update to the real version 0.6.
* Sat Dec 09 2000 bk(a)suse.de
- updated to Mozilla 0.6 (milestone release based on the same branch
++++++ seamonkey-source-1.1.13.tar.bz2 -> seamonkey-source-1.1.14.tar.bz2 ++++++
seamonkey/seamonkey-source-1.1.13.tar.bz2 /mounts/work_src_done/STABLE/seamonkey/seamonkey-source-1.1.14.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory
checked in at Thu Dec 18 15:36:10 CET 2008.
--------
--- libvirt/libvirt.changes 2008-12-05 21:56:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2008-12-15 20:42:37.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Dec 15 12:40:41 MST 2008 - jfehlig(a)novell.com
+
+- Patch for CVE-2008-5086
+ bnc#459009
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
cve-2008-5086.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.U13338/_old 2008-12-18 15:28:57.000000000 +0100
+++ /var/tmp/diff_new_pack.U13338/_new 2008-12-18 15:28:57.000000000 +0100
@@ -49,7 +49,7 @@
Group: Development/Libraries/C and C++
AutoReqProv: yes
Version: 0.4.6
-Release: 12
+Release: 13
Summary: A C toolkit to interract with the virtualization capabilities of Linux
Requires: readline
Requires: ncurses
@@ -85,6 +85,7 @@
Patch16: xen-pv-cdrom.patch
Patch17: detach-disk.patch
Patch18: migrate-params.patch
+Patch19: cve-2008-5086.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -194,6 +195,7 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
+%patch19 -p1
rm po/no.*
%build
@@ -326,6 +328,9 @@
%{py_sitedir}/libvirtmod*
%changelog
+* Mon Dec 15 2008 jfehlig(a)novell.com
+- Patch for CVE-2008-5086
+ bnc#459009
* Fri Dec 05 2008 jfehlig(a)novell.com
- Fix migration of Xen domains
bnc#456946
++++++ cve-2008-5086.patch ++++++
Index: libvirt-0.4.6/src/libvirt.c
===================================================================
--- libvirt-0.4.6.orig/src/libvirt.c
+++ libvirt-0.4.6/src/libvirt.c
@@ -2342,6 +2342,16 @@ virDomainMigrate (virDomainPtr domain,
return NULL;
}
+ if (domain->conn->flags & VIR_CONNECT_RO) {
+ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return NULL;
+ }
+ if (dconn->flags & VIR_CONNECT_RO) {
+ /* NB, delibrately report error against source object, not dest here */
+ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return NULL;
+ }
+
/* Check that migration is supported by both drivers. */
if (!VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn,
VIR_DRV_FEATURE_MIGRATION_V1) ||
@@ -2419,6 +2429,11 @@ __virDomainMigratePrepare (virConnectPtr
return -1;
}
+ if (dconn->flags & VIR_CONNECT_RO) {
+ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return -1;
+ }
+
if (dconn->driver->domainMigratePrepare)
return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen,
uri_in, uri_out,
@@ -2449,6 +2464,11 @@ __virDomainMigratePerform (virDomainPtr
}
conn = domain->conn;
+ if (domain->conn->flags & VIR_CONNECT_RO) {
+ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return -1;
+ }
+
if (conn->driver->domainMigratePerform)
return conn->driver->domainMigratePerform (domain, cookie, cookielen,
uri,
@@ -2476,6 +2496,11 @@ __virDomainMigrateFinish (virConnectPtr
return NULL;
}
+ if (dconn->flags & VIR_CONNECT_RO) {
+ virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return NULL;
+ }
+
if (dconn->driver->domainMigrateFinish)
return dconn->driver->domainMigrateFinish (dconn, dname,
cookie, cookielen,
@@ -2833,6 +2858,11 @@ virDomainBlockPeek (virDomainPtr dom,
}
conn = dom->conn;
+ if (dom->conn->flags & VIR_CONNECT_RO) {
+ virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return (-1);
+ }
+
if (!path) {
virLibDomainError (dom, VIR_ERR_INVALID_ARG,
_("path is NULL"));
@@ -2908,6 +2938,11 @@ virDomainMemoryPeek (virDomainPtr dom,
}
conn = dom->conn;
+ if (dom->conn->flags & VIR_CONNECT_RO) {
+ virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return (-1);
+ }
+
/* Flags must be VIR_MEMORY_VIRTUAL at the moment.
*
* Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is
@@ -3175,6 +3210,11 @@ virDomainSetAutostart(virDomainPtr domai
conn = domain->conn;
+ if (domain->conn->flags & VIR_CONNECT_RO) {
+ virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return (-1);
+ }
+
if (conn->driver->domainSetAutostart)
return conn->driver->domainSetAutostart (domain, autostart);
@@ -4125,6 +4165,11 @@ virNetworkSetAutostart(virNetworkPtr net
return (-1);
}
+ if (network->conn->flags & VIR_CONNECT_RO) {
+ virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return (-1);
+ }
+
conn = network->conn;
if (conn->networkDriver && conn->networkDriver->networkSetAutostart)
@@ -4323,6 +4368,11 @@ virConnectFindStoragePoolSources(virConn
return NULL;
}
+ if (conn->flags & VIR_CONNECT_RO) {
+ virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return NULL;
+ }
+
if (conn->storageDriver && conn->storageDriver->findPoolSources)
return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags);
@@ -4996,6 +5046,11 @@ virStoragePoolSetAutostart(virStoragePoo
return (-1);
}
+ if (pool->conn->flags & VIR_CONNECT_RO) {
+ virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ return (-1);
+ }
+
conn = pool->conn;
if (conn->storageDriver && conn->storageDriver->poolSetAutostart)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Thu Dec 18 15:28:44 CET 2008.
--------
--- ksh/ksh.changes 2008-11-05 14:34:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes 2008-12-17 15:22:44.376016000 +0100
@@ -1,0 +2,41 @@
+Wed Dec 17 15:16:32 CET 2008 - werner(a)suse.de
+
+- Add workaround for bug in s390 architecture where named pipes aka
+ fifos are in blocking mode which cause read failures in some sort
+ of shell code test cases
+
+-------------------------------------------------------------------
+Wed Dec 17 13:25:33 CET 2008 - werner(a)suse.de
+
+- Add workaround for bug in glibc with signbit() macro that is that
+ the inlined part for long doubles does not work on IA64
+
+-------------------------------------------------------------------
+Mon Dec 15 11:25:24 CET 2008 - werner(a)suse.de
+
+- Switch to 2008-12-12 beta test of ksh93t+ for bug fixes:
+
+ 08-12-10 The [[ -t fd ]] test was fixed to handle fd>9.
+ 08-12-10 A bug where function stack misalignment could cause a
+ bus error has been fixed.
+ 08-12-07 A bug in typeset -m which occured when the target node
+ was an associative array element has been fixed.
+ 08-12-04 The sign of floating point zero is preserved across
+ arithmetic function calls.
+ 08-12-04 A bug that caused print(1) to produce garbled
+ stdout/stderr output has been fixed.
+ 08-12-04 A bug in which printf "%d\n" "'<euro>'" did not output
+ the numerical value of the EURO symbol has been fixed.
+ 08-11-20 A bug which could cause a core dump if a function
+ compiled with shcomp was found has been fixed.
+ 08-11-20 A bug in which jobs were not cleared from the jobs table
+ for interactive shells when the pipefail option is on
+ has been fixed.
+ 08-11-11 A bug in which running a simple command & inside a
+ function would not return the correct process id has
+ been fixed.
+ 08-11-06 A bug which could cause a core dump when the _ reference
+ variable was used as an embedded type with a compound
+ assignment has been fixed.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ast-ksh.2008-11-04.tar.bz2
INIT.2008-11-04.tar.bz2
New:
----
ast-ksh.2008-12-12.tar.bz2
INIT.2008-12-12.tar.bz2
ksh93-ia64.dif
ksh93-io.dif
ksh93-s390.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.h11710/_old 2008-12-18 15:28:28.000000000 +0100
+++ /var/tmp/diff_new_pack.h11710/_new 2008-12-18 15:28:28.000000000 +0100
@@ -29,11 +29,11 @@
PreReq: /bin/ln /bin/rm /etc/bash.bashrc /bin/true
AutoReqProv: on
Version: 93t
-Release: 6
+Release: 7
Summary: Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: INIT.2008-11-04.tar.bz2
-Source1: ast-ksh.2008-11-04.tar.bz2
+Source: INIT.2008-12-12.tar.bz2
+Source1: ast-ksh.2008-12-12.tar.bz2
Source2: ast-open-locale.2008-07-25.tar.bz2
Source20: Agreement
Source21: Warning
@@ -52,6 +52,9 @@
Patch10: ksh93-suid_exec.dif
Patch11: ksh93-signals.dif
Patch12: ksh93-limits.dif
+Patch13: ksh93-io.dif
+Patch14: ksh93-ia64.dif
+Patch15: ksh93-s390.dif
%global use_suid_exe 0
%global use_locale 0
@@ -112,6 +115,13 @@
%patch10
%patch11
%patch12
+%patch13
+%ifarch ia64
+%patch14
+%endif
+%ifarch s390
+%patch15
+%endif
%build
test -n "${!LC_*}" && unset "${!LC_*}"
@@ -156,18 +166,30 @@
LARGEFILE="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
fi
rm -f ./test64
- RPM_OPT_FLAGS=$(echo "${RPM_OPT_FLAGS}"|sed -r 's/ +-g[0-9]?//')
- CCFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE $LARGEFILE -fPIC"
- CCFLAGS="$CCFLAGS -g -pipe $IGNORE $FEATURE"
- cflags -fno-strict-aliasing CCFLAGS
- cflags @%{S:22} CCFLAGS
+ case "$RPM_ARCH" in
+ ia64) RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}" ;;
+ s390) RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}" ;;
+ ppc*) RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}" ;;
+ esac
+ RPM_OPT_FLAGS=$(echo "${RPM_OPT_FLAGS}"|sed -r 's/[[:blank:]]+-g[0-9]?//g')
+ UNIVERSE=att
+ CC=gcc
+ cflags -std=gnu99 RPM_OPT_FLAGS
+ cflags -fPIC RPM_OPT_FLAGS
+ cflags @%{S:22} RPM_OPT_FLAGS
+ cflags -fno-strict-aliasing RPM_OPT_FLAGS
+ cflags -g RPM_OPT_FLAGS
+ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE $LARGEFILE"
+ RPM_OPT_FLAGS="$RPM_OPT_FLAGS $IGNORE $FEATURE"
LDFLAGS="-lm"
HOSTTYPE=${RPM_ARCH%%*-linux*}
- CC=gcc
mam_cc_L=use
- UNIVERSE=att
- export CCFLAGS LDFLAGS CC mam_cc_L UNIVERSE
- bin/package make CC=$CC cc=$CC
+ mam_cc_OPTIMIZE=-pipe
+ export mam_cc_L mam_cc_OPTIMIZE HOSTTYPE LDFLAGS RPM_OPT_FLAGS UNIVERSE
+ for mam in $(find ${PWD}/ -name Mamfile); do
+ sed -ri '/^exec.*\$\{CC\}/{ s/(\$\{CC\})/\1 \$\{RPM_OPT_FLAGS\}/g; }' $mam
+ done
+ bin/package make CC="$CC"
root=$(echo ${PWD}/arch/linux*)
test -d $root || exit 1
log=${root}/lib/package/gen/make.out
@@ -371,6 +393,37 @@
%{_includedir}/ast/
%changelog
+* Wed Dec 17 2008 werner(a)suse.de
+- Add workaround for bug in s390 architecture where named pipes aka
+ fifos are in blocking mode which cause read failures in some sort
+ of shell code test cases
+* Wed Dec 17 2008 werner(a)suse.de
+- Add workaround for bug in glibc with signbit() macro that is that
+ the inlined part for long doubles does not work on IA64
+* Mon Dec 15 2008 werner(a)suse.de
+- Switch to 2008-12-12 beta test of ksh93t+ for bug fixes:
+ 08-12-10 The [[ -t fd ]] test was fixed to handle fd>9.
+ 08-12-10 A bug where function stack misalignment could cause a
+ bus error has been fixed.
+ 08-12-07 A bug in typeset -m which occured when the target node
+ was an associative array element has been fixed.
+ 08-12-04 The sign of floating point zero is preserved across
+ arithmetic function calls.
+ 08-12-04 A bug that caused print(1) to produce garbled
+ stdout/stderr output has been fixed.
+ 08-12-04 A bug in which printf "%%d\n" "'<euro>'" did not output
+ the numerical value of the EURO symbol has been fixed.
+ 08-11-20 A bug which could cause a core dump if a function
+ compiled with shcomp was found has been fixed.
+ 08-11-20 A bug in which jobs were not cleared from the jobs table
+ for interactive shells when the pipefail option is on
+ has been fixed.
+ 08-11-11 A bug in which running a simple command & inside a
+ function would not return the correct process id has
+ been fixed.
+ 08-11-06 A bug which could cause a core dump when the _ reference
+ variable was used as an embedded type with a compound
+ assignment has been fixed.
* Tue Nov 04 2008 werner(a)suse.de
- Switch to 2008-11-04 of ksh93t for a minor and minimal fix within
the shell syntax parser.
++++++ ast-ksh.2008-11-04.tar.bz2 -> ast-ksh.2008-12-12.tar.bz2 ++++++
++++ 3466 lines of diff (skipped)
++++++ INIT.2008-11-04.tar.bz2 -> INIT.2008-12-12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lib/package/INIT.html new/lib/package/INIT.html
--- old/lib/package/INIT.html 2008-11-04 08:56:20.000000000 +0100
+++ new/lib/package/INIT.html 2008-12-12 20:29:53.000000000 +0100
@@ -64,7 +64,7 @@
08-06-20 mktest.sh: prepend $PWD onto PATH for local units -- doh^2
08-06-11 regress.sh: fix bug that skipped the last test
08-05-20 regress.sh: add --local to put *.tmp dir in local fs
-08-05-05 regerss.sh: add IF command ... ELIF command ... ELSE ... FI
+08-05-05 regress.sh: add IF command ... ELIF command ... ELSE ... FI
08-05-01 package.sh: package test => ulimit -c 0
08-04-28 regress.sh: fix EXPORT quoting
08-04-28 regress.sh: fix UNIT set check args too
@@ -863,7 +863,7 @@
<TR>
<TD align=left></TD>
<TD align=center></TD>
-<TD align=right>November 04, 2008</TD>
+<TD align=right>December 12, 2008</TD>
</TR>
</TABLE>
<P>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lib/package/INIT.README new/lib/package/INIT.README
--- old/lib/package/INIT.README 2008-10-16 19:51:25.000000000 +0200
+++ new/lib/package/INIT.README 2008-12-08 19:51:12.000000000 +0100
@@ -108,7 +108,7 @@
08-06-20 mktest.sh: prepend $PWD onto PATH for local units -- doh^2
08-06-11 regress.sh: fix bug that skipped the last test
08-05-20 regress.sh: add --local to put *.tmp dir in local fs
-08-05-05 regerss.sh: add IF command ... ELIF command ... ELSE ... FI
+08-05-05 regress.sh: add IF command ... ELIF command ... ELSE ... FI
08-05-01 package.sh: package test => ulimit -c 0
08-04-28 regress.sh: fix EXPORT quoting
08-04-28 regress.sh: fix UNIT set check args too
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lib/package/INIT.ver new/lib/package/INIT.ver
--- old/lib/package/INIT.ver 2008-11-04 00:20:31.000000000 +0100
+++ new/lib/package/INIT.ver 2008-12-12 20:29:53.000000000 +0100
@@ -1 +1 @@
-INIT 2008-11-04 2008-11-04 1
+INIT 2008-12-12 2008-12-12 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/cmd/INIT/mamake.c new/src/cmd/INIT/mamake.c
--- old/src/cmd/INIT/mamake.c 2007-03-28 05:56:57.000000000 +0200
+++ new/src/cmd/INIT/mamake.c 2008-12-10 15:18:37.000000000 +0100
@@ -104,6 +104,7 @@
#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <time.h>
#if !_PACKAGE_ast && defined(__STDC__)
#include <stdlib.h>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/cmd/INIT/Mamfile new/src/cmd/INIT/Mamfile
--- old/src/cmd/INIT/Mamfile 2008-11-04 08:56:20.000000000 +0100
+++ new/src/cmd/INIT/Mamfile 2008-12-12 21:31:14.000000000 +0100
@@ -1,4 +1,4 @@
-info mam static 00000 1994-07-17 make (AT&T Research) 5.3 2008-10-28
+info mam static 00000 1994-07-17 make (AT&T Research) 5.3 2008-12-08
setv INSTALLROOT ../../..
setv PACKAGEROOT ../../../../..
setv AR ar
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/cmd/INIT/proto.c new/src/cmd/INIT/proto.c
--- old/src/cmd/INIT/proto.c 2008-11-03 18:08:09.000000000 +0100
+++ new/src/cmd/INIT/proto.c 2008-12-08 20:39:15.000000000 +0100
@@ -77,7 +77,7 @@
#if !defined(__LINKAGE__)
#define __LINKAGE__ /* 2004-08-11 transition */
#endif
-#line 1 "/home/gsf/src/cmd/proto/proto.c"
+#line 1 "proto.c"
#line 148
@@ -195,14 +195,14 @@
# undef utime
# define utime ______utime
-#line 1 "/home/gsf/src/lib/libpp/ppproto.c"
+#line 1 "../../lib/libpp/ppproto.c"
#line 13
static const char id[] = "\n@(#)$Id: proto (AT&T Research) 2008-05-11 $\000\n";
-#line 1 "/home/gsf/src/lib/libpp/ppfsm.c"
+#line 1 "../../lib/libpp/ppfsm.c"
-#line 1 "/home/gsf/src/lib/libpp/pplib.h"
+#line 1 "../../lib/libpp/pplib.h"
#line 108
struct ppsymbol;
@@ -311,7 +311,7 @@
struct ppfileid id;
};
-#line 1 "/home/gsf/src/lib/libpp/pp.h"
+#line 1 "../../lib/libpp/pp.h"
#line 206
@@ -415,20 +415,20 @@
extern __MANGLE__ int ppprintf __PROTO__((char*, ...));
extern __MANGLE__ int ppsync __PROTO__((void));
-#line 366 "/home/gsf/src/lib/libpp/pplib.h"
+#line 366 "../../lib/libpp/pplib.h"
#line 1 "../../lib/libpp/ppdef.h"
-#line 367 "/home/gsf/src/lib/libpp/pplib.h"
+#line 367 "../../lib/libpp/pplib.h"
-#line 1 "/home/gsf/src/lib/libpp/ppkey.h"
+#line 1 "../../lib/libpp/ppkey.h"
#line 16
#line 125
extern __MANGLE__ struct ppkeyword ppkey[];
-#line 368 "/home/gsf/src/lib/libpp/pplib.h"
+#line 368 "../../lib/libpp/pplib.h"
#line 681
struct ppcontext
@@ -528,9 +528,9 @@
extern __MANGLE__ char* pptokstr __PROTO__((char*, int));
extern __MANGLE__ void pptrace __PROTO__((int));
-#line 11 "/home/gsf/src/lib/libpp/ppfsm.c"
+#line 11 "../../lib/libpp/ppfsm.c"
-#line 1 "/home/gsf/src/lib/libpp/ppfsm.h"
+#line 1 "../../lib/libpp/ppfsm.h"
#line 185
@@ -545,7 +545,7 @@
extern __MANGLE__ void _pp_refill __PROTO__((int));
-#line 12 "/home/gsf/src/lib/libpp/ppfsm.c"
+#line 12 "../../lib/libpp/ppfsm.c"
#line 67
@@ -1272,7 +1272,7 @@
-#line 18 "/home/gsf/src/lib/libpp/ppproto.c"
+#line 18 "../../lib/libpp/ppproto.c"
#line 1 "../../../include/ast/hashkey.h"
@@ -1282,7 +1282,7 @@
#line 68
extern __MANGLE__ long strkey __PROTO__((const char*));
-#line 20 "/home/gsf/src/lib/libpp/ppproto.c"
+#line 20 "../../lib/libpp/ppproto.c"
#line 41
struct proto
@@ -1443,7 +1443,7 @@
return s;
}
-#line 1 "/home/gsf/src/lib/libast/port/astlicense.c"
+#line 1 "../../lib/libast/port/astlicense.c"
@@ -2483,7 +2483,7 @@
comment(¬ice, &buf, ((char*)0), -1, 0);
return (*(( &buf)->nxt>=( &buf)->end?(( &buf)->nxt=( &buf)->end-1):( &buf)->nxt)=0,( &buf)->nxt-( &buf)->buf);
}
-#line 306 "/home/gsf/src/lib/libpp/ppproto.c"
+#line 306 "../../lib/libpp/ppproto.c"
#line 318
static char*
@@ -4647,7 +4647,7 @@
-#line 266 "/home/gsf/src/cmd/proto/proto.c"
+#line 266 "proto.c"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/cmd/INIT/RELEASE new/src/cmd/INIT/RELEASE
--- old/src/cmd/INIT/RELEASE 2008-10-16 17:31:11.000000000 +0200
+++ new/src/cmd/INIT/RELEASE 2008-12-04 19:24:43.000000000 +0100
@@ -14,7 +14,7 @@
08-06-20 mktest.sh: prepend $PWD onto PATH for local units -- doh^2
08-06-11 regress.sh: fix bug that skipped the last test
08-05-20 regress.sh: add --local to put *.tmp dir in local fs
-08-05-05 regerss.sh: add IF command ... ELIF command ... ELSE ... FI
+08-05-05 regress.sh: add IF command ... ELIF command ... ELSE ... FI
08-05-01 package.sh: package test => ulimit -c 0
08-04-28 regress.sh: fix EXPORT quoting
08-04-28 regress.sh: fix UNIT set check args too
++++++ ksh93-ia64.dif ++++++
--- src/lib/libast/sfio/sfcvt.c
+++ src/lib/libast/sfio/sfcvt.c 2008-12-17 11:56:17.000000000 +0000
@@ -56,6 +56,14 @@ static char *Zero = "0";
#define _lib_signbit 1
#endif
+#if defined(__ia64__) && defined(signbit)
+# if defined __GNUC__ && __GNUC__ >= 4
+# define __signbitl(f) __builtin_signbitl(f)
+# elif _lib_copysignl
+# define __signbitl(f) (int)(copysignl(1.0,(f))<0.0)
+# endif
+#endif
+
#if ! _lib_signbit
#if ! _ast_fltmax_double
static int neg0ld(Sfdouble_t f)
++++++ ksh93-io.dif ++++++
--- src/cmd/ksh93/sh/io.c
+++ src/cmd/ksh93/sh/io.c 2008-12-16 12:27:49.000000000 +0000
@@ -718,7 +718,16 @@ int sh_open(register const char *path, i
}
if (fd >= 0)
{
- int nfd = open(path,flags);
+ int nfd;
+ if (flags & O_CREAT)
+ {
+ struct stat st;
+ if (stat(path,&st) < 0)
+ return(-1);
+ nfd = open(path,flags,st.st_mode);
+ }
+ else
+ nfd= open(path,flags);
if(nfd>=0)
{
fd = nfd;
++++++ ksh93-s390.dif ++++++
--- src/cmd/ksh93/bltins/read.c
+++ src/cmd/ksh93/bltins/read.c 2008-12-17 14:01:01.000000000 +0000
@@ -263,6 +263,19 @@ int sh_readline(register Shell_t *shp,ch
delim = ((unsigned)flags)>>D_FLAG;
if(shp->fdstatus[fd]&IOTTY)
tty_raw(fd,1);
+#if defined(__s390__) && defined(__linux__)
+ else if (flags&N_FLAG)
+ {
+ struct stat st;
+ if ((fstat(fd, &st) == 0) && S_ISFIFO(st.st_mode))
+ {
+ int fdflg;
+ if (((fdflg = fcntl(fd, F_GETFL)) != -1) && !(fdflg & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fdflg|O_NONBLOCK);
+ shp->fdstatus[fd] |= IONOSEEK;
+ }
+ }
+#endif
}
binary = nv_isattr(np,NV_BINARY);
if(!binary && !(flags&(N_FLAG|NN_FLAG)))
++++++ ksh93-shift_ijs.dif ++++++
--- /var/tmp/diff_new_pack.h11710/_old 2008-12-18 15:28:31.000000000 +0100
+++ /var/tmp/diff_new_pack.h11710/_new 2008-12-18 15:28:31.000000000 +0100
@@ -38,9 +38,9 @@
#include <ast.h>
+#include <ast_wchar.h>
- #include <ctype.h>
#include "FEATURE/cmds"
#if KSHELL
+ # include "defs.h"
@@ -83,6 +84,9 @@ One line screen editor for any program
++++++ workaround-stupid-build-system.diff ++++++
--- /var/tmp/diff_new_pack.h11710/_old 2008-12-18 15:28:31.000000000 +0100
+++ /var/tmp/diff_new_pack.h11710/_new 2008-12-18 15:28:31.000000000 +0100
@@ -104,33 +104,6 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -702,7 +702,7 @@ prev ${PACKAGE_ast_INCLUDE}/ast.h implic
- done sh/main.c
- meta main.o %.c>%.o sh/main.c main
- prev sh/main.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_DYNAMIC -DSHOPT_STATS -DSHOPT_HISTEXPAND -DERROR_CONTEXT_T=Error_context_t -c sh/main.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_DYNAMIC -DSHOPT_STATS -DSHOPT_HISTEXPAND -DERROR_CONTEXT_T=Error_context_t -c sh/main.c
- done main.o generated
- make nvdisc.o
- make sh/nvdisc.c
-@@ -1135,7 +1135,7 @@ prev ${PACKAGE_ast_INCLUDE}/ccode.h impl
- done sh/trestore.c
- meta trestore.o %.c>%.o sh/trestore.c trestore
- prev sh/trestore.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_STATS -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DERROR_CONTEXT_T=Error_context_t -DSHOPT_ESH -c sh/trestore.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_STATS -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DERROR_CONTEXT_T=Error_context_t -DSHOPT_ESH -c sh/trestore.c
- done trestore.o generated
- make waitevent.o
- make sh/waitevent.c
-@@ -1229,7 +1229,7 @@ prev ${PACKAGE_ast_INCLUDE}/ast_standard
- done data/strdata.c
- meta strdata.o %.c>%.o data/strdata.c strdata
- prev data/strdata.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH -c data/strdata.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH -c data/strdata.c
- done strdata.o generated
- make testops.o
- make data/testops.c
@@ -1372,7 +1372,7 @@ prev +ljobs
prev +li
prev ${mam_libsocket}
@@ -169,60 +142,15 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -478,7 +478,7 @@ done misc/findlib.h
- done misc/fastfind.c
- meta fastfind.o %.c>%.o misc/fastfind.c fastfind
- prev misc/fastfind.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd -D_PACKAGE_ast -c misc/fastfind.c
- done fastfind.o generated
- make hashalloc.o
- make hash/hashalloc.c
@@ -913,7 +913,7 @@ make lcgen
make port/lcgen.c
prev std/stdio.h implicit
done port/lcgen.c
-exec - ${CC} -o lcgen port/lcgen.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -o lcgen port/lcgen.c
++exec - ${CC} ${mam_cc_FLAGS} -o lcgen port/lcgen.c
done lcgen generated
make port/lc.tab
done port/lc.tab
-@@ -1502,7 +1502,7 @@ done sfio/sfhdr.h
- done port/mc.c
- meta mc.o %.c>%.o port/mc.c mc
- prev port/mc.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c
- done mc.o generated
- make base64.o
- make string/base64.c
-@@ -2866,7 +2866,7 @@ prev include/ast.h implicit
- done comp/spawnveg.c
- meta spawnveg.o %.c>%.o comp/spawnveg.c spawnveg
- prev comp/spawnveg.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c comp/spawnveg.c
- done spawnveg.o generated
- make vfork.o
- make comp/vfork.c
-@@ -4187,7 +4187,7 @@ prev sfio/sfhdr.h implicit
- done sfio/sfrd.c
- meta sfrd.o %.c>%.o sfio/sfrd.c sfrd
- prev sfio/sfrd.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c
- done sfrd.o generated
- make sfread.o
- make sfio/sfread.c
-@@ -4342,7 +4342,7 @@ prev sfio/sfhdr.h implicit
- done sfio/sfvprintf.c
- meta sfvprintf.o %.c>%.o sfio/sfvprintf.c sfvprintf
- prev sfio/sfvprintf.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${mam_cc_NOPROTECT} -I. -Icomp -Iport -Isfio -Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c
- done sfvprintf.o generated
- make sfvscanf.o
- make sfio/sfvscanf.c
@@ -7013,64 +7013,37 @@ done ${INSTALLROOT}/lib/file/magic gener
make ${INSTALLROOT}/include/ast/fmtmsg.h
prev comp/fmtmsg.h
@@ -314,15 +242,6 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -572,7 +572,7 @@ make id.o
- prev id.c
- meta id.o %.c>%.o id.c id
- prev id.c
--exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_BLD_cmd -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf(a)research.att.com>][-author?David Korn <dgk(a)research.att.com>][-copyright?Copyright (c) 1992-2008 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog…]"\" -c id.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -D_BLD_cmd -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf(a)research.att.com>][-author?David Korn <dgk(a)research.att.com>][-copyright?Copyright (c) 1992-2008 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog…]"\" -c id.c
- done id.o generated
- make join.o
- prev join.c
--- src/lib/libdll/Mamfile
+++ src/lib/libdll/Mamfile 2008-02-14 13:08:37.000000000 +0100
@@ -7,7 +7,7 @@ setv AR ar
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package avahi for openSUSE:Factory
checked in at Thu Dec 18 15:28:14 CET 2008.
--------
--- avahi/avahi.changes 2008-12-15 18:22:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/avahi/avahi.changes 2008-12-17 09:38:03.547462000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 17 09:10:32 CET 2008 - mauro(a)suse.de
+
+- Added bnc_459007.patch to fix bnc#459007
+ + Fixes CVE-2008-5081
+
+-------------------------------------------------------------------
avahi-mono.changes: same change
avahi-qt4.changes: same change
calling whatdependson for head-i586
New:
----
bnc_459007.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.xk5421/_old 2008-12-18 15:27:59.000000000 +0100
+++ /var/tmp/diff_new_pack.xk5421/_new 2008-12-18 15:27:59.000000000 +0100
@@ -31,7 +31,7 @@
%define build_qt3 0
%define build_qt4 0
Version: 0.6.23
-Release: 9
+Release: 10
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -79,6 +79,8 @@
Patch9: avahi-dnsconfd-netconfig.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel(a)suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
+#PATCH-FIX-UPSTREAM bnc_459007.patch bnc#459007 mauro(a)suse.de -- fix CVE-2008-5081
+Patch11: bnc_459007.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
# Even if we are not building python bindings, we need python to build service types database:
@@ -831,6 +833,7 @@
%patch8
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
++++++ avahi-mono.spec ++++++
--- /var/tmp/diff_new_pack.xk5421/_old 2008-12-18 15:27:59.000000000 +0100
+++ /var/tmp/diff_new_pack.xk5421/_new 2008-12-18 15:27:59.000000000 +0100
@@ -31,7 +31,7 @@
%define build_qt3 0
%define build_qt4 0
Version: 0.6.23
-Release: 57
+Release: 58
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -79,6 +79,8 @@
Patch9: avahi-dnsconfd-netconfig.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel(a)suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
+#PATCH-FIX-UPSTREAM bnc_459007.patch bnc#459007 mauro(a)suse.de -- fix CVE-2008-5081
+Patch11: bnc_459007.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
# Even if we are not building python bindings, we need python to build service types database:
@@ -830,6 +832,7 @@
%patch8
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
++++++ avahi-qt4.spec ++++++
--- /var/tmp/diff_new_pack.xk5421/_old 2008-12-18 15:27:59.000000000 +0100
+++ /var/tmp/diff_new_pack.xk5421/_new 2008-12-18 15:27:59.000000000 +0100
@@ -31,7 +31,7 @@
%define build_qt3 0
%define build_qt4 1
Version: 0.6.23
-Release: 9
+Release: 10
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -79,6 +79,8 @@
Patch9: avahi-dnsconfd-netconfig.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel(a)suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
+#PATCH-FIX-UPSTREAM bnc_459007.patch bnc#459007 mauro(a)suse.de -- fix CVE-2008-5081
+Patch11: bnc_459007.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
# Even if we are not building python bindings, we need python to build service types database:
@@ -833,6 +835,7 @@
%patch8
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.xk5421/_old 2008-12-18 15:27:59.000000000 +0100
+++ /var/tmp/diff_new_pack.xk5421/_new 2008-12-18 15:27:59.000000000 +0100
@@ -33,7 +33,7 @@
%define build_qt3 0
%define build_qt4 0
Version: 0.6.23
-Release: 38
+Release: 39
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -81,6 +81,8 @@
Patch9: avahi-dnsconfd-netconfig.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel(a)suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
+#PATCH-FIX-UPSTREAM bnc_459007.patch bnc#459007 mauro(a)suse.de -- fix CVE-2008-5081
+Patch11: bnc_459007.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
# Even if we are not building python bindings, we need python to build service types database:
@@ -833,6 +835,7 @@
%patch8
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
@@ -1314,6 +1317,9 @@
%endif
%changelog
+* Wed Dec 17 2008 mauro(a)suse.de
+- Added bnc_459007.patch to fix bnc#459007
+ + Fixes CVE-2008-5081
* Mon Dec 15 2008 sbrabec(a)suse.cz
- avahi-discover.glade is required by avahi-utils-gtk and
python-avahi-gtk => move to avahi (bnc#456418).
++++++ bnc_459007.patch ++++++
diff -Naur avahi-0.6.20/avahi-core/server.c avahi-0.6.20-mp/avahi-core/server.c
--- avahi-0.6.20/avahi-core/server.c 2007-05-09 00:51:01.000000000 +0200
+++ avahi-0.6.20-mp/avahi-core/server.c 2008-12-17 09:03:42.103972000 +0100
@@ -899,6 +899,12 @@
return;
}
+ if (port <= 0) {
+ /* This fixes RHBZ #475394, bnc#459007 */
+ avahi_log_warn("Received packet from invalid source port.");
+ return;
+ }
+
if (avahi_address_is_ipv4_in_ipv6(src_address))
/* This is an IPv4 address encapsulated in IPv6, so let's ignore it. */
return;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Thu Dec 18 15:24:45 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-12-12 17:17:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-12-17 14:43:39.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Dec 17 14:42:22 CET 2008 - locilka(a)suse.cz
+
+- Added yet another xset call (bnc #455771 comment #40)
+- 2.17.48
+
+-------------------------------------------------------------------
+Tue Dec 16 12:29:27 CET 2008 - locilka(a)suse.cz
+
+- Removed SLED control file labels that should be hidden
+ (bnc #459080).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.17.47.tar.bz2
New:
----
yast2-installation-2.17.48.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.w27126/_old 2008-12-18 15:24:31.000000000 +0100
+++ /var/tmp/diff_new_pack.w27126/_new 2008-12-18 15:24:31.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.47)
+# spec file for package yast2-installation (Version 2.17.48)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.17.47
+Version: 2.17.48
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.47.tar.bz2
+Source0: yast2-installation-2.17.48.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# xmllint
@@ -126,7 +126,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-installation-2.17.47
+%setup -n yast2-installation-2.17.48
%build
%{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,12 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Wed Dec 17 2008 locilka(a)suse.cz
+- Added yet another xset call (bnc #455771 comment #40)
+- 2.17.48
+* Tue Dec 16 2008 locilka(a)suse.cz
+- Removed SLED control file labels that should be hidden
+ (bnc #459080).
* Fri Dec 12 2008 aschnell(a)suse.de
- require initviocons (bnc #173426)
- 2.17.47
++++++ yast2-installation-2.17.47.tar.bz2 -> yast2-installation-2.17.48.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.47/control/control.rng new/yast2-installation-2.17.48/control/control.rng
--- old/yast2-installation-2.17.47/control/control.rng 2008-12-09 19:10:58.000000000 +0100
+++ new/yast2-installation-2.17.48/control/control.rng 2008-12-16 12:23:10.000000000 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:config="http://www.suse.com/1.0/configns" ns="http://www.suse.com/1.0/yast2ns" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!-- types -->
<define name="BOOLEAN">
<attribute name="config:type">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.47/control/control.SLED.xml new/yast2-installation-2.17.48/control/control.SLED.xml
--- old/yast2-installation-2.17.47/control/control.SLED.xml 2008-11-21 12:16:53.000000000 +0100
+++ new/yast2-installation-2.17.48/control/control.SLED.xml 2008-12-16 12:23:04.000000000 +0100
@@ -889,7 +889,6 @@
<name>restore_settings</name>
</module>
<module>
- <label>Clean Up</label>
<name>suseconfig</name>
</module>
<module>
@@ -1004,7 +1003,7 @@
<name>user</name>
</module>
<module>
- <label>Users</label>
+ <!-- BNC #459080, no label is intentional -->
<name>user_non_interactive</name>
<!-- BNC #401319, define client to call explicitly -->
<execute>inst_user</execute>
@@ -1122,7 +1121,6 @@
<name>autoconfigure</name>
</module>
<module>
- <label>Clean Up</label>
<name>suseconfig</name>
</module>
</modules>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.47/src/include/inst_inc_all.ycp new/yast2-installation-2.17.48/src/include/inst_inc_all.ycp
--- old/yast2-installation-2.17.47/src/include/inst_inc_all.ycp 2008-11-13 21:44:07.000000000 +0100
+++ new/yast2-installation-2.17.48/src/include/inst_inc_all.ycp 2008-12-17 14:41:04.000000000 +0100
@@ -56,7 +56,7 @@
if (WFM::Read (.local.size, "/usr/bin/xset") != -1) {
y2milestone ("Disabling Energy Star (DPMS) features");
// DPMS off values, disable DPMS, disable screen-saver
- WFM::Execute (.local.bash, "/usr/bin/xset dpms 0 0 0; /usr/bin/xset -dpms; /usr/bin/xset s 0 0");
+ WFM::Execute (.local.bash, "/usr/bin/xset dpms 0 0 0; /usr/bin/xset -dpms; /usr/bin/xset s 0 0; /usr/bin/xset s off");
}
}
@@ -72,7 +72,7 @@
if (WFM::Read (.local.size, "/usr/bin/xset") != -1) {
y2milestone ("Enabling Energy Star (DPMS) features");
// default DPMS values, enable DPMS, enable screen-saver
- WFM::Execute (.local.bash, "/usr/bin/xset dpms 1200 1800 2400; /usr/bin/xset +dpms; /usr/bin/xset s default");
+ WFM::Execute (.local.bash, "/usr/bin/xset dpms 1200 1800 2400; /usr/bin/xset +dpms; /usr/bin/xset s on; /usr/bin/xset s default;");
}
// TRANSLATORS: busy message
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.47/VERSION new/yast2-installation-2.17.48/VERSION
--- old/yast2-installation-2.17.47/VERSION 2008-12-12 17:16:34.000000000 +0100
+++ new/yast2-installation-2.17.48/VERSION 2008-12-17 14:44:02.000000000 +0100
@@ -1 +1 @@
-2.17.47
+2.17.48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at Thu Dec 18 15:24:20 CET 2008.
--------
--- yast2-country/yast2-country.changes 2008-11-28 12:52:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2008-12-18 11:18:37.023834000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 18 09:53:57 CET 2008 - jsuchome(a)suse.cz
+
+- call xset to prevent black screen during firstboot (bnc#455771)
+- 2.17.30
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-country-2.17.29.tar.bz2
New:
----
yast2-country-2.17.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.s26193/_old 2008-12-18 15:24:14.000000000 +0100
+++ /var/tmp/diff_new_pack.s26193/_new 2008-12-18 15:24:14.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.17.29)
+# spec file for package yast2-country (Version 2.17.30)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-country
-Version: 2.17.29
+Version: 2.17.30
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.17.29.tar.bz2
+Source0: yast2-country-2.17.30.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2-trans-stats yast2-perl-bindings timezone
@@ -75,7 +75,7 @@
Jiri Suchomel <jsuchome(a)suse.cz>
%prep
-%setup -n yast2-country-2.17.29
+%setup -n yast2-country-2.17.30
%build
%{prefix}/bin/y2tool y2autoconf
@@ -143,6 +143,9 @@
/usr/share/YaST2/data/languages/*.ycp
/usr/share/YaST2/modules/Language.y*
%changelog
+* Thu Dec 18 2008 jsuchome(a)suse.cz
+- call xset to prevent black screen during firstboot (bnc#455771)
+- 2.17.30
* Fri Nov 28 2008 jsuchome(a)suse.cz
- help text: do not refer to hidden parts (bnc#449070)
- 2.17.29
++++++ yast2-country-2.17.29.tar.bz2 -> yast2-country-2.17.30.tar.bz2 ++++++
++++ 8833 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.29/configure.in new/yast2-country-2.17.30/configure.in
--- old/yast2-country-2.17.29/configure.in 2008-04-21 11:06:35.000000000 +0200
+++ new/yast2-country-2.17.30/configure.in 2008-12-18 11:05:32.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-country, 2.16.18, http://bugs.opensuse.org/, yast2-country)
+AC_INIT(yast2-country, 2.17.30, http://bugs.opensuse.org/, yast2-country)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.18"
+VERSION="2.17.30"
RPMNAME="yast2-country"
MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.29/language/src/select_language.ycp new/yast2-country-2.17.30/language/src/select_language.ycp
--- old/yast2-country-2.17.29/language/src/select_language.ycp 2008-11-28 12:43:15.000000000 +0100
+++ new/yast2-country-2.17.30/language/src/select_language.ycp 2008-12-16 07:59:48.000000000 +0100
@@ -15,7 +15,7 @@
* Summary:
* This client shows main dialog for choosing the language.
*
- * $Id: select_language.ycp 51770 2008-10-02 08:00:00Z jsuchome $
+ * $Id: select_language.ycp 53698 2008-11-28 11:53:05Z jsuchome $
*
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.29/timezone/src/Timezone.ycp new/yast2-country-2.17.30/timezone/src/Timezone.ycp
--- old/yast2-country-2.17.29/timezone/src/Timezone.ycp 2008-11-18 15:54:54.000000000 +0100
+++ new/yast2-country-2.17.30/timezone/src/Timezone.ycp 2008-12-17 12:39:54.000000000 +0100
@@ -244,7 +244,15 @@
//
if (!Mode::config () && really )
{
- boolean textmode = Language::GetTextMode ();
+ boolean textmode = Language::GetTextMode ();
+ // turn off the screensaver when clock can change radically (bnc#455771)
+ // (in non-firstboot cases, installation process handles it)
+ if (Stage::firstboot() && !textmode)
+ {
+ SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset -dpms");
+ SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset s reset");
+ SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset s off");
+ }
string cmd = "/usr/sbin/zic -l " + timezone;
y2milestone( "Set cmd %1", cmd );
y2milestone( "Set ret %1", SCR::Execute( .target.bash_output, cmd ));
@@ -254,6 +262,11 @@
y2milestone( "Set cmd %1", cmd );
y2milestone( "Set ret %1", SCR::Execute(.target.bash_output, cmd ));
}
+ if (Stage::firstboot() && !textmode)
+ {
+ SCR::Execute (.target.bash, "/usr/X11R6/bin/xset s on");
+ SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset +dpms");
+ }
}
// On first assignment store default timezone.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.29/timezone/testsuite/tests/GetDateTimeMap.ycp new/yast2-country-2.17.30/timezone/testsuite/tests/GetDateTimeMap.ycp
--- old/yast2-country-2.17.29/timezone/testsuite/tests/GetDateTimeMap.ycp 2006-09-08 11:21:28.000000000 +0200
+++ new/yast2-country-2.17.30/timezone/testsuite/tests/GetDateTimeMap.ycp 2008-12-16 07:59:49.000000000 +0100
@@ -2,7 +2,7 @@
* test for Timezone::GetDateTimeMap
* - check correct parsing after changed time format (bug #62312)
* Author: jsuchome(a)suse.cz
- * $Id: GetDateTimeMap.ycp 31664 2006-06-26 14:24:19Z jsuchome $
+ * $Id: GetDateTimeMap.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*/
{
// testedfiles: Timezone.ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.29/timezone/testsuite/tests/GetDateTime.ycp new/yast2-country-2.17.30/timezone/testsuite/tests/GetDateTime.ycp
--- old/yast2-country-2.17.29/timezone/testsuite/tests/GetDateTime.ycp 2006-09-08 11:21:28.000000000 +0200
+++ new/yast2-country-2.17.30/timezone/testsuite/tests/GetDateTime.ycp 2008-12-16 07:59:49.000000000 +0100
@@ -1,7 +1,7 @@
/**
* tests for Timezone::GetDateTime
* Author: jsuchome(a)suse.cz
- * $Id: GetDateTime.ycp 31664 2006-06-26 14:24:19Z jsuchome $
+ * $Id: GetDateTime.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.17.29/VERSION new/yast2-country-2.17.30/VERSION
--- old/yast2-country-2.17.29/VERSION 2008-11-28 12:45:04.000000000 +0100
+++ new/yast2-country-2.17.30/VERSION 2008-12-18 09:54:30.000000000 +0100
@@ -1 +1 @@
-2.17.29
+2.17.30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Thu Dec 18 15:23:20 CET 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-12-11 17:56:24.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-12-17 14:32:57.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 17 14:24:57 CET 2008 - juhliarik(a)suse.cz
+
+- added fix for problem with primary language in GRUB (bnc #447053)
+- 2.17.47
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.46.tar.bz2
New:
----
yast2-bootloader-2.17.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.S24119/_old 2008-12-18 15:23:10.000000000 +0100
+++ /var/tmp/diff_new_pack.S24119/_new 2008-12-18 15:23:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.46)
+# spec file for package yast2-bootloader (Version 2.17.47)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.46
+Version: 2.17.47
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.46.tar.bz2
+Source0: yast2-bootloader-2.17.47.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
@@ -68,7 +68,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.46
+%setup -n yast2-bootloader-2.17.47
%build
%{prefix}/bin/y2tool y2autoconf
@@ -113,7 +113,11 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
+
%changelog
+* Wed Dec 17 2008 juhliarik(a)suse.cz
+- added fix for problem with primary language in GRUB (bnc #447053)
+- 2.17.47
* Thu Dec 11 2008 juhliarik(a)suse.cz
- added fix for problem with autoinstallation and powerlilo
(bnc #439674)
++++++ yast2-bootloader-2.17.46.tar.bz2 -> yast2-bootloader-2.17.47.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/aclocal.m4 new/yast2-bootloader-2.17.47/aclocal.m4
--- old/yast2-bootloader-2.17.46/aclocal.m4 2008-07-21 18:25:55.000000000 +0200
+++ new/yast2-bootloader-2.17.47/aclocal.m4 2008-12-16 13:29:42.000000000 +0100
@@ -7519,3 +7519,159 @@
AC_MSG_RESULT([$SED])
])
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/agents/Makefile.in new/yast2-bootloader-2.17.47/agents/Makefile.in
--- old/yast2-bootloader-2.17.46/agents/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/agents/Makefile.in 2008-12-16 13:29:46.000000000 +0100
@@ -117,6 +117,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -131,6 +132,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/configure new/yast2-bootloader-2.17.47/configure
--- old/yast2-bootloader-2.17.46/configure 2008-07-21 18:25:57.000000000 +0200
+++ new/yast2-bootloader-2.17.47/configure 2008-12-16 13:29:44.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-bootloader 2.17.4.
+# Generated by GNU Autoconf 2.61 for yast2-bootloader 2.17.46.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-bootloader'
PACKAGE_TARNAME='yast2-bootloader'
-PACKAGE_VERSION='2.17.4'
-PACKAGE_STRING='yast2-bootloader 2.17.4'
+PACKAGE_VERSION='2.17.46'
+PACKAGE_STRING='yast2-bootloader 2.17.46'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -902,6 +902,9 @@
am__fastdepCC_TRUE
am__fastdepCC_FALSE
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
AGENT_LIBADD
SED
GREP
@@ -943,6 +946,9 @@
CC
CFLAGS
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
CXXCPP
F77
FFLAGS'
@@ -1448,7 +1454,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-bootloader 2.17.4 to adapt to many kinds of systems.
+\`configure' configures yast2-bootloader 2.17.46 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1519,7 +1525,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-bootloader 2.17.4:";;
+ short | recursive ) echo "Configuration of yast2-bootloader 2.17.46:";;
esac
cat <<\_ACEOF
@@ -1557,6 +1563,10 @@
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ Y2CORE_CFLAGS
+ C compiler flags for Y2CORE, overriding pkg-config
+ Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
@@ -1625,7 +1635,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-bootloader configure 2.17.4
+yast2-bootloader configure 2.17.46
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1639,7 +1649,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-bootloader $as_me 2.17.4, which was
+It was created by yast2-bootloader $as_me 2.17.46, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2460,7 +2470,7 @@
# Define the identity of the package.
PACKAGE='yast2-bootloader'
- VERSION='2.17.4'
+ VERSION='2.17.46'
cat >>confdefs.h <<_ACEOF
@@ -2688,7 +2698,7 @@
-VERSION="2.17.4"
+VERSION="2.17.46"
RPMNAME="yast2-bootloader"
MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>"
@@ -5024,8 +5034,247 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf(a)gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf(a)gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for Y2CORE" >&5
+echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; }
+
+if test -n "$Y2CORE_CFLAGS"; then
+ pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$Y2CORE_LIBS"; then
+ pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "yast2-core" 2>&1`
+ else
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$Y2CORE_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (yast2-core) were not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS
+ Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+fi
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
@@ -5745,7 +5994,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5748 "configure"' > conftest.$ac_ext
+ echo '#line 5997 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8100,11 +8349,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8103: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8107: \$? = $ac_status" >&5
+ echo "$as_me:8356: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8390,11 +8639,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8393: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8642: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8397: \$? = $ac_status" >&5
+ echo "$as_me:8646: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8494,11 +8743,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8497: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8746: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8501: \$? = $ac_status" >&5
+ echo "$as_me:8750: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10858,7 +11107,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10861 "configure"
+#line 11110 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10958,7 +11207,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10961 "configure"
+#line 11210 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13359,11 +13608,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13362: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13611: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13366: \$? = $ac_status" >&5
+ echo "$as_me:13615: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13463,11 +13712,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13466: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13715: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13470: \$? = $ac_status" >&5
+ echo "$as_me:13719: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15046,11 +15295,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15049: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15298: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15053: \$? = $ac_status" >&5
+ echo "$as_me:15302: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15150,11 +15399,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15153: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15402: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15157: \$? = $ac_status" >&5
+ echo "$as_me:15406: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17357,11 +17606,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17360: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17364: \$? = $ac_status" >&5
+ echo "$as_me:17613: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17647,11 +17896,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17650: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17899: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17654: \$? = $ac_status" >&5
+ echo "$as_me:17903: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17751,11 +18000,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17754: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18003: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17758: \$? = $ac_status" >&5
+ echo "$as_me:18007: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21484,7 +21733,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-bootloader $as_me 2.17.4, which was
+This file was extended by yast2-bootloader $as_me 2.17.46, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21537,7 +21786,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-bootloader config.status 2.17.4
+yast2-bootloader config.status 2.17.46
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21904,6 +22153,9 @@
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim
+Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim
AGENT_LIBADD!$AGENT_LIBADD$ac_delim
SED!$SED$ac_delim
GREP!$GREP$ac_delim
@@ -21933,7 +22185,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/configure.in new/yast2-bootloader-2.17.47/configure.in
--- old/yast2-bootloader-2.17.46/configure.in 2008-07-21 18:25:43.000000000 +0200
+++ new/yast2-bootloader-2.17.47/configure.in 2008-12-16 13:29:30.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.17.4, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.17.46, http://bugs.opensuse.org/, yast2-bootloader)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.4"
+VERSION="2.17.46"
RPMNAME="yast2-bootloader"
MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>"
@@ -161,8 +161,14 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+PKG_CHECK_EXISTS([yast2-core],[
+ PKG_CHECK_MODULES(Y2CORE, yast2-core)
+])
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/doc/autodocs/Makefile.in new/yast2-bootloader-2.17.47/doc/autodocs/Makefile.in
--- old/yast2-bootloader-2.17.46/doc/autodocs/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/doc/autodocs/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -122,6 +122,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -136,6 +137,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/doc/Makefile.in new/yast2-bootloader-2.17.47/doc/Makefile.in
--- old/yast2-bootloader-2.17.46/doc/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/doc/Makefile.in 2008-12-16 13:29:46.000000000 +0100
@@ -114,6 +114,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -128,6 +129,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/Makefile.in new/yast2-bootloader-2.17.47/Makefile.in
--- old/yast2-bootloader-2.17.46/Makefile.in 2008-07-21 18:26:01.000000000 +0200
+++ new/yast2-bootloader-2.17.47/Makefile.in 2008-12-16 13:29:48.000000000 +0100
@@ -146,6 +146,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -160,6 +161,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/scripts/Makefile.in new/yast2-bootloader-2.17.47/scripts/Makefile.in
--- old/yast2-bootloader-2.17.46/scripts/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/scripts/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -106,6 +106,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -120,6 +121,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/scripts/update_gfxmenu new/yast2-bootloader-2.17.47/scripts/update_gfxmenu
--- old/yast2-bootloader-2.17.46/scripts/update_gfxmenu 2008-11-25 10:54:16.000000000 +0100
+++ new/yast2-bootloader-2.17.47/scripts/update_gfxmenu 2008-12-17 09:07:08.000000000 +0100
@@ -34,11 +34,19 @@
# set languages to choose
if [ -f $SRC_DIR/$LOCALE.tr ]; then
echo "$LOCALE" > languages || exit 6
+ # always add also en_US
+ if [ "$LOCALE" != "en_US" ]; then
+ echo "en_US" >>languages || exit 6
+ fi
# set translations of bootloaer menu entries
cp $MENU_ENTRIES ./translations.$LOCALE || exit 7;
else
if [ -f $SRC_DIR/$LOCALE_SHORT.tr ]; then
echo "$LOCALE" > languages || exit 6
+ # always add also en_US
+ if [ "$LOCALE" != "en_US" ]; then
+ echo "en_US" >>languages || exit 6
+ fi
else
if [ "$LOCALE_SHORT" = "en" ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/clients/Makefile.in new/yast2-bootloader-2.17.47/src/clients/Makefile.in
--- old/yast2-bootloader-2.17.46/src/clients/Makefile.in 2008-09-29 17:11:49.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/clients/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -117,6 +117,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -131,6 +132,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/config/Makefile.in new/yast2-bootloader-2.17.47/src/config/Makefile.in
--- old/yast2-bootloader-2.17.46/src/config/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/config/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -113,6 +113,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -127,6 +128,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/elilo/Makefile.in new/yast2-bootloader-2.17.47/src/elilo/Makefile.in
--- old/yast2-bootloader-2.17.46/src/elilo/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/elilo/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -112,6 +112,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -126,6 +127,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/generic/Makefile.in new/yast2-bootloader-2.17.47/src/generic/Makefile.in
--- old/yast2-bootloader-2.17.46/src/generic/Makefile.in 2008-08-05 09:59:31.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/generic/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -112,6 +112,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -126,6 +127,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/grub/Makefile.in new/yast2-bootloader-2.17.47/src/grub/Makefile.in
--- old/yast2-bootloader-2.17.46/src/grub/Makefile.in 2008-12-08 15:42:53.000000000 +0100
+++ new/yast2-bootloader-2.17.47/src/grub/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -112,6 +112,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -126,6 +127,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/lilo/Makefile.in new/yast2-bootloader-2.17.47/src/lilo/Makefile.in
--- old/yast2-bootloader-2.17.46/src/lilo/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/lilo/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -112,6 +112,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -126,6 +127,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/Makefile.in new/yast2-bootloader-2.17.47/src/Makefile.in
--- old/yast2-bootloader-2.17.46/src/Makefile.in 2008-07-21 18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -110,6 +110,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -124,6 +125,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/modules/Makefile.in new/yast2-bootloader-2.17.47/src/modules/Makefile.in
--- old/yast2-bootloader-2.17.46/src/modules/Makefile.in 2008-09-03 14:42:59.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/modules/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -117,6 +117,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -131,6 +132,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/ppc/Makefile.in new/yast2-bootloader-2.17.47/src/ppc/Makefile.in
--- old/yast2-bootloader-2.17.46/src/ppc/Makefile.in 2008-07-21 18:26:01.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/ppc/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -112,6 +112,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -126,6 +127,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/routines/Makefile.in new/yast2-bootloader-2.17.47/src/routines/Makefile.in
--- old/yast2-bootloader-2.17.46/src/routines/Makefile.in 2008-07-21 18:26:01.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/routines/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -112,6 +112,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -126,6 +127,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/src/zipl/Makefile.in new/yast2-bootloader-2.17.47/src/zipl/Makefile.in
--- old/yast2-bootloader-2.17.46/src/zipl/Makefile.in 2008-07-21 18:26:01.000000000 +0200
+++ new/yast2-bootloader-2.17.47/src/zipl/Makefile.in 2008-12-16 13:29:47.000000000 +0100
@@ -112,6 +112,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -126,6 +127,8 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.46/VERSION new/yast2-bootloader-2.17.47/VERSION
--- old/yast2-bootloader-2.17.46/VERSION 2008-12-08 15:42:44.000000000 +0100
+++ new/yast2-bootloader-2.17.47/VERSION 2008-12-17 14:26:57.000000000 +0100
@@ -1 +1 @@
-2.17.46
+2.17.47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-add-on-creator for openSUSE:Factory
checked in at Thu Dec 18 15:22:59 CET 2008.
--------
--- yast2-add-on-creator/yast2-add-on-creator.changes 2008-12-03 15:12:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-add-on-creator/yast2-add-on-creator.changes 2008-12-17 21:22:56.210850000 +0100
@@ -1,0 +2,17 @@
+Wed Dec 17 14:34:32 CET 2008 - jsuchome(a)suse.cz
+
+- added CLI support for product file (disable generating, offer
+ path to import)
+- removed debug popup
+- enable importing product file with dependency data
+- 2.17.10
+
+-------------------------------------------------------------------
+Fri Dec 12 16:02:16 CET 2008 - jsuchome(a)suse.cz
+
+- call bs_productconvert from correct path
+- import data from -release packages when cloning product
+ (fate#305172)
+- 2.17.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-add-on-creator-2.17.8.tar.bz2
New:
----
yast2-add-on-creator-2.17.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on-creator.spec ++++++
--- /var/tmp/diff_new_pack.B21929/_old 2008-12-18 15:22:16.000000000 +0100
+++ /var/tmp/diff_new_pack.B21929/_new 2008-12-18 15:22:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on-creator (Version 2.17.8)
+# spec file for package yast2-add-on-creator (Version 2.17.10)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-add-on-creator
-Version: 2.17.8
+Version: 2.17.10
Release: 1
License: GPL v2 only; GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-creator-2.17.8.tar.bz2
+Source0: yast2-add-on-creator-2.17.10.tar.bz2
Prefix: /usr
PreReq: %fillup_prereq
Requires: yast2
@@ -42,7 +42,7 @@
Jiri Suchomel <jsuchome(a)suse.cz>
%prep
-%setup -n yast2-add-on-creator-2.17.8
+%setup -n yast2-add-on-creator-2.17.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,17 @@
%doc %{prefix}/share/doc/packages/yast2-add-on-creator
/var/adm/fillup-templates/sysconfig.add-on-creator
%changelog
+* Wed Dec 17 2008 jsuchome(a)suse.cz
+- added CLI support for product file (disable generating, offer
+ path to import)
+- removed debug popup
+- enable importing product file with dependency data
+- 2.17.10
+* Fri Dec 12 2008 jsuchome(a)suse.cz
+- call bs_productconvert from correct path
+- import data from -release packages when cloning product
+ (fate#305172)
+- 2.17.9
* Wed Dec 03 2008 jsuchome(a)suse.cz
- flag is GE, not GT
- read product requires from existing release packages
++++++ yast2-add-on-creator-2.17.8.tar.bz2 -> yast2-add-on-creator-2.17.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/configure new/yast2-add-on-creator-2.17.10/configure
--- old/yast2-add-on-creator-2.17.8/configure 2008-10-22 16:04:13.000000000 +0200
+++ new/yast2-add-on-creator-2.17.10/configure 2008-12-17 13:32:23.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-add-on-creator 2.17.5.
+# Generated by GNU Autoconf 2.61 for yast2-add-on-creator 2.17.9.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-add-on-creator'
PACKAGE_TARNAME='yast2-add-on-creator'
-PACKAGE_VERSION='2.17.5'
-PACKAGE_STRING='yast2-add-on-creator 2.17.5'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2-add-on-creator 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-add-on-creator 2.17.5 to adapt to many kinds of systems.
+\`configure' configures yast2-add-on-creator 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-add-on-creator 2.17.5:";;
+ short | recursive ) echo "Configuration of yast2-add-on-creator 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-add-on-creator configure 2.17.5
+yast2-add-on-creator configure 2.17.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-add-on-creator $as_me 2.17.5, which was
+It was created by yast2-add-on-creator $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-add-on-creator'
- VERSION='2.17.5'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.5"
+VERSION="2.17.9"
RPMNAME="yast2-add-on-creator"
MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>"
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-add-on-creator $as_me 2.17.5, which was
+This file was extended by yast2-add-on-creator $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-add-on-creator config.status 2.17.5
+yast2-add-on-creator config.status 2.17.9
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/configure.in new/yast2-add-on-creator-2.17.10/configure.in
--- old/yast2-add-on-creator-2.17.8/configure.in 2008-10-22 16:04:07.000000000 +0200
+++ new/yast2-add-on-creator-2.17.10/configure.in 2008-12-17 13:32:17.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-add-on-creator, 2.17.5, http://bugs.opensuse.org/, yast2-add-on-creator)
+AC_INIT(yast2-add-on-creator, 2.17.9, http://bugs.opensuse.org/, yast2-add-on-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.5"
+VERSION="2.17.9"
RPMNAME="yast2-add-on-creator"
MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/src/add-on-creator.ycp new/yast2-add-on-creator-2.17.10/src/add-on-creator.ycp
--- old/yast2-add-on-creator-2.17.8/src/add-on-creator.ycp 2008-10-13 16:36:17.000000000 +0200
+++ new/yast2-add-on-creator-2.17.10/src/add-on-creator.ycp 2008-12-17 14:16:52.000000000 +0100
@@ -146,6 +146,22 @@
return false;
}
}
+ if (haskey (options, "product_file"))
+ {
+ string file = options["product_file"]:"";
+ if (FileUtils::Exists (file))
+ {
+ AddOnCreator::product_xml =
+ AddOnCreator::ReadProductXML (file);
+ AddOnCreator::product_info =
+ AddOnCreator::GetProductInfo (AddOnCreator::product_xml, false);
+ }
+ else
+ {
+ ReportMissingFile (file);
+ return false;
+ }
+ }
if (haskey (options, "package_descriptions_dir"))
{
string dir = options["package_descriptions_dir"]:"";
@@ -320,6 +336,11 @@
}
current_product["changelog"] = haskey (options, "changelog");
+ current_product["generate_release_package"] = true;
+ if (haskey (options, "no_release_package"))
+ {
+ current_product["generate_release_package"] = false;
+ }
if (!haskey (options, "do_not_sign"))
{
current_product = union (current_product, ParseGPGData (options));
@@ -495,7 +516,12 @@
if (haskey (options, "changelog"))
product["changelog"] = true;
+ // CLI option could replace the saved one
+ if (haskey (options, "no_release_package"))
+ product["generate_release_package"] = false;
+
AddOnCreator::SelectProduct (product);
+
AddOnCreator::PrepareBuild ();
AddOnCreator::BuildAddOn ();
return false;
@@ -686,6 +712,15 @@
// command line help text for 'changelog' option
"help" : _("Generate a Changelog file."),
],
+ "no_release_package" : $[
+ // command line help text for 'no_release_package' option
+ "help" : _("Do not generate the release package"),
+ ],
+ "product_file" : $[
+ // command line help text for 'product_file' option
+ "help" : _("Path to file with the product description (*.prod)"),
+ "type" : "string",
+ ],
],
"mappings" : $[
"create" : [ "content", "rpm_dir", "package_descriptions_dir",
@@ -693,7 +728,7 @@
"passphrase", "passphrase_file", "workflow", "y2update",
"y2update_packages_dir", "license", "do_not_sign", "iso_output_dir",
"resign_packages", "info", "extra_prov", "do_not_build",
- "changelog",
+ "changelog", "no_release_package", "product_file",
],
"clone" : [ "existing", "generate_descriptions", "content",
"package_descriptions_dir", "patterns_dir", "output_dir",
@@ -701,7 +736,7 @@
"gpg_key", "passphrase", "passphrase_file", "workflow", "y2update",
"y2update_packages_dir", "license", "do_not_sign", "iso_output_dir",
"resign_packages", "info", "extra_prov", "do_not_build",
- "changelog",
+ "changelog", "no_release_package", "product_file",
],
"sign" : [ "addon_dir", "gpg_key", "passphrase",
"passphrase_file", "create_iso", "iso_name", "iso_output_dir",
@@ -710,7 +745,7 @@
"build" : [
"number", "gpg_key", "passphrase", "passphrase_file",
"resign_packages", "create_iso", "iso_name", "iso_output_dir",
- "changelog",
+ "changelog", "no_release_package",
],
"delete" : [
"number"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/src/AddOnCreator.ycp new/yast2-add-on-creator-2.17.10/src/AddOnCreator.ycp
--- old/yast2-add-on-creator-2.17.8/src/AddOnCreator.ycp 2008-12-03 15:08:50.000000000 +0100
+++ new/yast2-add-on-creator-2.17.10/src/AddOnCreator.ycp 2008-12-17 14:34:20.000000000 +0100
@@ -24,7 +24,7 @@
* Summary: AddOnCreator settings, input and output functions
* Authors: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: AddOnCreator.ycp 53823 2008-12-02 15:01:38Z jsuchome $
+ * $Id: AddOnCreator.ycp 54098 2008-12-12 15:06:30Z jsuchome $
*
* Representation of the configuration of add-on-creator.
* Input and output routines.
@@ -116,6 +116,8 @@
"resign_packages" : false,
// current GPG key
"gpg_key" : "",
+ // if we should generate -release package containing .prod file
+ "generate_release_package" : true,
];
// skeleton for current_product map (with keys and default values)
@@ -745,9 +747,6 @@
// if package description files should be compressed
global boolean compress_package_descriptions = false;
-// if we should generate -release package containing .prod file
-global boolean generate_release_package = true;
-
/**
* Data was modified?
*/
@@ -850,7 +849,7 @@
else
// manual modifications present -> generate
// this is used when product xml was read from rpm
- generate_release_package = true;
+ current_product["generate_release_package"] = true;
}
else
retmap[key,"value"] = val;
@@ -1582,6 +1581,25 @@
}
Progress::NextStage();
}
+ // we want to find and read release packages for cloned product
+ else {
+ out = (map) SCR::Execute (.target.bash_output,
+ sformat ("find %1 -name '*-release*'", rpm_path));
+ foreach (string f, splitstring (out["stdout"]:"", "\n"), {
+ if (f == "") return;
+ out = (map) SCR::Execute (.target.bash_output,
+ sformat ("rpm -q -p %1 --qf \"%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f));
+ list lines = splitstring (out["stdout"]:"", "\n");
+ string name = lines[0]:"";
+ string sourcerpm = lines[1]:"";
+ if (sourcerpm != "src" && name != "" &&
+ size (name) > 8 && issubstring (name, "-release"))
+ {
+ y2milestone ("release package found: %1, %2", name, f);
+ release_packages = add (release_packages, f);
+ }
+ });
+ }
if (rpm_path == "")
{
Progress::Finish ();
@@ -1590,14 +1608,16 @@
string reldir = tmpdir + "/release";
if (release_packages != [])
{
- SCR::Execute (.target.mkdir, reldir);
// when release package is present, do not offer to change it
- generate_release_package = false;
+ current_product["generate_release_package"] = false;
}
list requireslist = [];
// read the product info contained in release package
foreach (string release_package, release_packages, {
+ // use 'reldir' only for one package
+ SCR::Execute (.target.bash, "rm -rf " + reldir);
+ SCR::Execute (.target.mkdir, reldir);
SCR::Execute (.target.bash,
sformat ("cp %1 %2", release_package, reldir));
SCR::Execute (.target.bash,
@@ -1640,7 +1660,7 @@
requiremap["flavor"] = tokens[2]:"";
if (tokens[5]:"" != "")
requiremap["release"] = tokens[5]:"";
- y2debug ("requiremap: %1", requiremap);
+ y2milestone ("requiremap: %1", requiremap);
requireslist = add (requireslist, requiremap);
});
return;
@@ -2186,7 +2206,7 @@
*/
global boolean GenerateReleasePackage (string base_path) {
- if (!generate_release_package)
+ if (!current_product["generate_release_package"]:false)
{
y2milestone ("release package should not be generated");
return true;
@@ -2206,7 +2226,12 @@
// write the result into temporary .prod file
string name = content_map["NAME"]:"add-on";
- map submap = product_xml["product",0]:$[];
+ map submap = product_xml;
+ if (size (product_xml["productdefinition",0,"products"]:[]) > 0)
+ {
+ submap = product_xml["productdefinition",0,"products",0]:$[];
+ }
+ submap = submap["product",0]:$[];
submap["id"] = name;
submap["name",0, content_key] = name;
@@ -2293,7 +2318,8 @@
// 2. call bs_productconvert to generate a spec file for -release package
map out = (map) SCR::Execute (.target.bash_output, sformat (
- "bs_productconvert %1 %2 %3", prod_file_path, product_dir, name));
+ "/usr/lib/obs/server/bs_productconvert %1 %2 %3",
+ prod_file_path, product_dir, name));
// 3. build the release package from generated .spec file
string cmd = sformat (
@@ -2340,8 +2366,6 @@
SCR::Execute (.target.bash, sformat ("/bin/cp -r %1 '%2/%3'",
package_path, full_data_path, arch));
});
-import "Popup";
-Popup::Message ("built");
// 5. delete the tmp files, so it doesn't mess possible next builds
SCR::Execute (.target.remove, prod_file_path);
SCR::Execute (.target.bash, sformat ("rm -rf '%1'", product_dir));
@@ -2829,7 +2853,6 @@
map modified_product = union (current_product, $[
"content_map" : content_map,
"product_info_values" : product_info_values,
- "generate_release_package" : generate_release_package,
"available_packages" : available_packages,
"arch_directories" : arch_directories,
"package2filename" : package2filename,
@@ -2866,8 +2889,6 @@
product_info[key] = desc;
});
- generate_release_package = product["generate_release_package"]:false;
-
// generate content from content_map
content = [];
foreach (string key, map entry, content_descr, {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/src/complex.ycp new/yast2-add-on-creator-2.17.10/src/complex.ycp
--- old/yast2-add-on-creator-2.17.8/src/complex.ycp 2008-12-03 12:44:24.000000000 +0100
+++ new/yast2-add-on-creator-2.17.10/src/complex.ycp 2008-12-17 13:30:09.000000000 +0100
@@ -24,7 +24,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: complex.ycp 53823 2008-12-02 15:01:38Z jsuchome $
+ * $Id: complex.ycp 53843 2008-12-03 14:17:08Z jsuchome $
*/
{
@@ -693,7 +693,8 @@
list<map> content = AddOnCreator::content;
map product_xml = $[]; // used only when imported
map<string,map>product_info = AddOnCreator::product_info;
- boolean generate_release_package =AddOnCreator::generate_release_package;
+ boolean generate_release_package =
+ current_product["generate_release_package"]:false;
integer linguas_entry = -1;
// generate items for content file table
@@ -937,7 +938,8 @@
if (product_xml != $[])
AddOnCreator::product_xml = product_xml;
AddOnCreator::product_info = product_info;
- AddOnCreator::generate_release_package = generate_release_package;
+ AddOnCreator::current_product["generate_release_package"] =
+ generate_release_package;
break;
}
else if(ret == `abort || ret == `cancel) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/VERSION new/yast2-add-on-creator-2.17.10/VERSION
--- old/yast2-add-on-creator-2.17.8/VERSION 2008-12-03 15:10:00.000000000 +0100
+++ new/yast2-add-on-creator-2.17.10/VERSION 2008-12-17 14:35:36.000000000 +0100
@@ -1 +1 @@
-2.17.8
+2.17.10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory
checked in at Thu Dec 18 15:22:05 CET 2008.
--------
--- wireshark/wireshark.changes 2008-11-24 16:14:29.000000000 +0100
+++ /mounts/work_src_done/STABLE/wireshark/wireshark.changes 2008-12-17 15:26:33.000000000 +0100
@@ -1,0 +2,32 @@
+Wed Dec 17 15:22:40 CET 2008 - prusnak(a)suse.cz
+
+- updated to 1.0.5
+ * security fixes
+ o The SMTP dissector could consume excessive amounts of CPU
+ and memory
+ o The WLCCP dissector could go into an infinte loop
+ * bug fixes
+ o Missing CRLF during HTTP POST in the "packet details" window
+ (Bug 2534)
+ o Memory assertion in time_secs_to_str_buf() when compiled
+ with GCC 4.2.3 (Bug 2777)
+ o Diameter dissector fails RFC 4005 compliance (Bug 2828)
+ o LDP vendor private TLV type is not correctly shown (Bug 2832)
+ o Wireshark on MacOS does not run when there are spaces in
+ its path (Bug 2844)
+ o OS X Intel package incorrectly claims to be Universal (Bug 2979)
+ o Compilation broke when compiling without zlib (Bug 2993)
+ o Memory leaks (Bugs 3017 ... 3022, 3079)
+ o Incorrect address structure assigned for find_conversation()
+ in WSP (Bug 3071)
+ o Error parsing the BSSGP protocol (Bug 3085)
+ o Assertion thrown in fvalue_get_uinteger when decoding TIPC
+ (Bug 3086)
+ o LUA script : Wireshark crashes after closing and opening again
+ a window used by a listener.draw() function. (Bug 3090)
+ * Updated Protocol Support
+ ANSI MAP, BSSGP, CIP, Diameter, ENIP, GIOP, H.263, H.264, HTTP,
+ MPEG PES, PostgreSQL, PPI, PTP, Rsync, RTP, SMTP, SNMP, STANAG 5066,
+ TACACS, TIPC, WLCCP, WSP
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
wireshark-1.0.4-desktop.patch
wireshark-1.0.4-disable-warning-dialog.patch
wireshark-1.0.4-help.patch
wireshark-1.0.4-sigpipe-block.patch
wireshark-1.0.4.tar.bz2
New:
----
wireshark-1.0.5-desktop.patch
wireshark-1.0.5-disable-warning-dialog.patch
wireshark-1.0.5-help.patch
wireshark-1.0.5-sigpipe-block.patch
wireshark-1.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.U20818/_old 2008-12-18 15:21:34.000000000 +0100
+++ /var/tmp/diff_new_pack.U20818/_new 2008-12-18 15:21:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package wireshark (Version 1.0.4)
+# spec file for package wireshark (Version 1.0.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,10 +25,10 @@
Group: Productivity/Networking/Diagnostic
AutoReqProv: on
Summary: A Network Traffic Analyser
-Version: 1.0.4
-Release: 2
+Version: 1.0.5
+Release: 1
Url: http://www.wireshark.org/
-Source: %{name}-%{version}.tar.bz2
+Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
Source1: include.filelist
Patch0: %{name}-%{version}-help.patch
Patch1: %{name}-%{version}-desktop.patch
@@ -186,6 +186,35 @@
%{_mandir}/man1/idl2wrs*
%changelog
+* Wed Dec 17 2008 prusnak(a)suse.cz
+- updated to 1.0.5
+ * security fixes
+ o The SMTP dissector could consume excessive amounts of CPU
+ and memory
+ o The WLCCP dissector could go into an infinte loop
+ * bug fixes
+ o Missing CRLF during HTTP POST in the "packet details" window
+ (Bug 2534)
+ o Memory assertion in time_secs_to_str_buf() when compiled
+ with GCC 4.2.3 (Bug 2777)
+ o Diameter dissector fails RFC 4005 compliance (Bug 2828)
+ o LDP vendor private TLV type is not correctly shown (Bug 2832)
+ o Wireshark on MacOS does not run when there are spaces in
+ its path (Bug 2844)
+ o OS X Intel package incorrectly claims to be Universal (Bug 2979)
+ o Compilation broke when compiling without zlib (Bug 2993)
+ o Memory leaks (Bugs 3017 ... 3022, 3079)
+ o Incorrect address structure assigned for find_conversation()
+ in WSP (Bug 3071)
+ o Error parsing the BSSGP protocol (Bug 3085)
+ o Assertion thrown in fvalue_get_uinteger when decoding TIPC
+ (Bug 3086)
+ o LUA script : Wireshark crashes after closing and opening again
+ a window used by a listener.draw() function. (Bug 3090)
+ * Updated Protocol Support
+ ANSI MAP, BSSGP, CIP, Diameter, ENIP, GIOP, H.263, H.264, HTTP,
+ MPEG PES, PostgreSQL, PPI, PTP, Rsync, RTP, SMTP, SNMP, STANAG 5066,
+ TACACS, TIPC, WLCCP, WSP
* Mon Nov 24 2008 prusnak(a)suse.cz
- fix wireshark freeze when closing capture window [bnc#417850]
(sigpipe-block.patch)
++++++ wireshark-1.0.4-desktop.patch -> wireshark-1.0.5-desktop.patch ++++++
++++++ wireshark-1.0.4-disable-warning-dialog.patch -> wireshark-1.0.5-disable-warning-dialog.patch ++++++
++++++ wireshark-1.0.4-help.patch -> wireshark-1.0.5-help.patch ++++++
++++++ wireshark-1.0.4-sigpipe-block.patch -> wireshark-1.0.5-sigpipe-block.patch ++++++
++++++ wireshark-1.0.4.tar.bz2 -> wireshark-1.0.5.tar.bz2 ++++++
wireshark/wireshark-1.0.4.tar.bz2 /mounts/work_src_done/STABLE/wireshark/wireshark-1.0.5.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0