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
August 2008
- 1 participants
- 1192 discussions
Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Aug 28 02:27:18 CEST 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-08-18 14:49:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-08-27 17:06:59.417647000 +0200
@@ -1,0 +2,17 @@
+Tue Aug 26 13:43:01 CEST 2008 - aschnell(a)suse.de
+
+- fixed udev data for multipath and dmraid
+- version 2.17.22
+
+-------------------------------------------------------------------
+Fri Aug 22 14:11:18 CEST 2008 - aschnell(a)suse.de
+
+- refactored zeroing devices (bnc #409528)
+
+-------------------------------------------------------------------
+Thu Aug 21 12:52:42 CEST 2008 - aschnell(a)suse.de
+
+- disallow modifications to disks in use (e.g. by multipath)
+- version 2.17.21
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.17.20.tar.bz2
New:
----
yast2-storage-2.17.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Oz4083/_old 2008-08-28 02:26:10.000000000 +0200
+++ /var/tmp/diff_new_pack.Oz4083/_new 2008-08-28 02:26:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.17.20)
+# spec file for package yast2-storage (Version 2.17.22)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-storage
-Version: 2.17.20
+Version: 2.17.22
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.17.20.tar.bz2
+Source0: yast2-storage-2.17.22.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup
@@ -57,7 +57,7 @@
Arvin Schnell <aschnell(a)suse.de>
%prep
-%setup -n yast2-storage-2.17.20
+%setup -n yast2-storage-2.17.22
%build
%{prefix}/bin/y2tool y2autoconf
@@ -129,6 +129,8 @@
License: GPL v2 or later
Summary: YaST2 - Storage Configuration Library
Group: System/YaST
+Provides: yast2-storage-evms
+Obsoletes: yast2-storage-evms
%description lib
This package contains the library used by YaST2 to access disk devices
@@ -179,6 +181,14 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Tue Aug 26 2008 aschnell(a)suse.de
+- fixed udev data for multipath and dmraid
+- version 2.17.22
+* Fri Aug 22 2008 aschnell(a)suse.de
+- refactored zeroing devices (bnc #409528)
+* Thu Aug 21 2008 aschnell(a)suse.de
+- disallow modifications to disks in use (e.g. by multipath)
+- version 2.17.21
* Mon Aug 18 2008 aschnell(a)suse.de
- added lvm snapshot support to libstorage (fate #303613)
- version 2.17.20
++++++ yast2-storage-2.17.20.tar.bz2 -> yast2-storage-2.17.22.tar.bz2 ++++++
++++ 2396 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-qt
checked in at Thu Aug 28 02:26:01 CEST 2008.
--------
--- yast2-qt/yast2-qt.changes 2008-08-05 11:15:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-08-27 08:55:00.000000000 +0200
@@ -1,0 +2,30 @@
+Fri Aug 22 18:52:11 CEST 2008 - sh(a)suse.de
+
+- Check environment variables for button order:
+ $DESKTOP_SESSION
+ $WINDOWMANAGER
+ $Y2_BUTTON_ORDER
+
+- Added command line options (overriding the env vars above):
+ --gnome-button-order
+ --kde-button-order
+
+- V 2.17.6
+
+-------------------------------------------------------------------
+Thu Aug 21 15:28:14 CEST 2008 - sh(a)suse.de
+
+- Added YQButtonBox widget (fate #303446)
+- Dropped obsolete YFrameBuffer
+
+-------------------------------------------------------------------
+Wed Aug 13 17:20:23 CEST 2008 - tgoettlicher(a)suse.de
+
+- Fixed YQCheckBoxFrame child widget enablement initially wrong (bnc #403126)
+
+-------------------------------------------------------------------
+Wed Aug 13 16:02:56 CEST 2008 - tgoettlicher(a)suse.de
+
+- Fixed wrong icon when using several wizards (bnc #415579)
+
+-------------------------------------------------------------------
@@ -4 +34 @@
-- V 2.18.5
+- V 2.17.5
Old:
----
yast2-qt-2.17.5.tar.bz2
New:
----
yast2-qt-2.17.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.No1572/_old 2008-08-28 02:25:39.000000000 +0200
+++ /var/tmp/diff_new_pack.No1572/_new 2008-08-28 02:25:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.17.5)
+# spec file for package yast2-qt (Version 2.17.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,12 +18,12 @@
Name: yast2-qt
-Version: 2.17.5
+Version: 2.17.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.17.5.tar.bz2
+Source0: yast2-qt-2.17.6.tar.bz2
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: libdrm-devel
@@ -37,8 +37,8 @@
BuildRequires: cmake
Summary: YaST2 - Graphical User Interface
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-libyui-devel >= 2.17.5
-Requires: yast2-libyui >= 2.17.5
+BuildRequires: yast2-libyui-devel >= 2.17.6
+Requires: yast2-libyui >= 2.17.6
Requires: yast2_theme >= 2.16.1
Provides: yast2_ui
Provides: y2base:/usr/lib/YaST2/servers/qt
@@ -119,8 +119,24 @@
%_includedir/*
%changelog
+* Fri Aug 22 2008 sh(a)suse.de
+- Check environment variables for button order:
+ $DESKTOP_SESSION
+ $WINDOWMANAGER
+ $Y2_BUTTON_ORDER
+- Added command line options (overriding the env vars above):
+ --gnome-button-order
+ --kde-button-order
+- V 2.17.6
+* Thu Aug 21 2008 sh(a)suse.de
+- Added YQButtonBox widget (fate #303446)
+- Dropped obsolete YFrameBuffer
+* Wed Aug 13 2008 tgoettlicher(a)suse.de
+- Fixed YQCheckBoxFrame child widget enablement initially wrong (bnc #403126)
+* Wed Aug 13 2008 tgoettlicher(a)suse.de
+- Fixed wrong icon when using several wizards (bnc #415579)
* Tue Aug 05 2008 tgoettlicher(a)suse.de
-- V 2.18.5
+- V 2.17.5
* Tue Aug 05 2008 tgoettlicher(a)suse.de
- Fixed bnc #409612: popup menu during installation becomes
hidden because of NULL parent
++++++ yast2-qt-2.17.5.tar.bz2 -> yast2-qt-2.17.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/package/yast2-qt.changes new/yast2-qt-2.17.6/package/yast2-qt.changes
--- old/yast2-qt-2.17.5/package/yast2-qt.changes 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/package/yast2-qt.changes 2008-08-27 08:54:59.000000000 +0200
@@ -1,7 +1,37 @@
-------------------------------------------------------------------
+Fri Aug 22 18:52:11 CEST 2008 - sh(a)suse.de
+
+- Check environment variables for button order:
+ $DESKTOP_SESSION
+ $WINDOWMANAGER
+ $Y2_BUTTON_ORDER
+
+- Added command line options (overriding the env vars above):
+ --gnome-button-order
+ --kde-button-order
+
+- V 2.17.6
+
+-------------------------------------------------------------------
+Thu Aug 21 15:28:14 CEST 2008 - sh(a)suse.de
+
+- Added YQButtonBox widget (fate #303446)
+- Dropped obsolete YFrameBuffer
+
+-------------------------------------------------------------------
+Wed Aug 13 17:20:23 CEST 2008 - tgoettlicher(a)suse.de
+
+- Fixed YQCheckBoxFrame child widget enablement initially wrong (bnc #403126)
+
+-------------------------------------------------------------------
+Wed Aug 13 16:02:56 CEST 2008 - tgoettlicher(a)suse.de
+
+- Fixed wrong icon when using several wizards (bnc #415579)
+
+-------------------------------------------------------------------
Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher(a)suse.de
-- V 2.18.5
+- V 2.17.5
-------------------------------------------------------------------
Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher(a)suse.de
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/CMakeLists.txt new/yast2-qt-2.17.6/src/CMakeLists.txt
--- old/yast2-qt-2.17.5/src/CMakeLists.txt 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/CMakeLists.txt 2008-08-27 08:54:59.000000000 +0200
@@ -24,10 +24,11 @@
QY2HelpDialog.cc
QY2ListView.cc
QY2Styler.cc
- YFrameBuffer.cc
YQAlignment.cc
YQApplication.cc
YQBarGraph.cc
+ YQBusyIndicator.cc
+ YQButtonBox.cc
YQCheckBox.cc
YQCheckBoxFrame.cc
YQComboBox.cc
@@ -74,24 +75,25 @@
YQWidgetFactory.cc
YQWizard.cc
YQWizardButton.cc
- YQBusyIndicator.cc
)
SET( yast_qt_HEADERS
+
+ utf8.h
QY2CharValidator.h
QY2ComboTabWidget.h
QY2DiskUsageList.h
QY2HelpDialog.h
QY2ListView.h
QY2Styler.h
- utf8.h
- YFrameBuffer.h
+ YQi18n.h
YQAlignment.h
YQApplication.h
YQBarGraph.h
YQBusyIndicator.h
- YQCheckBoxFrame.h
+ YQButtonBox.h
YQCheckBox.h
+ YQCheckBoxFrame.h
YQComboBox.h
YQDateField.h
YQDialog.h
@@ -100,7 +102,6 @@
YQEmpty.h
YQFrame.h
YQGenericButton.h
- YQi18n.h
YQImage.h
YQInputField.h
YQIntField.h
@@ -118,8 +119,8 @@
YQPartitionSplitter.h
YQProgressBar.h
YQPushButton.h
- YQRadioButtonGroup.h
YQRadioButton.h
+ YQRadioButtonGroup.h
YQReplacePoint.h
YQRichText.h
YQSelectionBox.h
@@ -134,8 +135,8 @@
YQUI.h
YQWidgetCaption.h
YQWidgetFactory.h
- YQWizardButton.h
YQWizard.h
+ YQWizardButton.h
)
INSTALL( FILES ${yast_qt_HEADERS} DESTINATION "${LIBYUI_INCLUDE_DIR}/../yast2-qt" )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YFrameBuffer.cc new/yast2-qt-2.17.6/src/YFrameBuffer.cc
--- old/yast2-qt-2.17.5/src/YFrameBuffer.cc 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YFrameBuffer.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,164 +0,0 @@
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: YFrameBuffer.cc
-
- Author: Stefan Hundhammer <sh(a)suse.de>
-
-/-*/
-
-
-#define YUILogComponent "framebuffer"
-#include "YUILog.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-
-#include "YFrameBuffer.h"
-
-
-YFrameBuffer::YFrameBuffer( int width, int height, int depth )
-{
- _width = width;
- _height = height;
- _depth = depth;
-
- _fb = 0;
- _fb_fd = -1;
- _fb_len = 0;
-
- switch ( _depth )
- {
- case 15:
- case 16: _bytesPerPixel = 2;
- break;
-
- case 24:
- case 32: _bytesPerPixel = 4;
- break;
-
- default:
- yuiWarning() << "Pixel depth " << depth << " not supported" << endl;
- _bytesPerPixel = 0;
- break;
- }
-
- if ( _bytesPerPixel > 0 )
- mmapFB();
-}
-
-
-YFrameBuffer::~YFrameBuffer()
-{
- munmapFB();
-}
-
-
-void YFrameBuffer::mmapFB()
-{
- if ( _fb )
- {
- yuiError() << "Framebuffer already mmap()'ed" << endl;
- return;
- }
-
- _fb_fd = open( "/dev/fb0", O_RDWR );
-
- if ( _fb_fd < 0 )
- {
- yuiError() << "Can't open /dev/fb0 - errno " << errno << ": " << strerror( errno ) << endl;
- return;
- }
-
- _fb_len = _width * _height * _bytesPerPixel;
- _fb = mmap( 0, // start
- _fb_len, // length
- PROT_READ | PROT_WRITE, // prot
- MAP_SHARED, // flags
- _fb_fd, // file descriptor
- 0 ); // offset
-
- if ( _fb == MAP_FAILED )
- {
- yuiError() << "mmap() failed for /dev/fb0 - errno " << errno << ": " << strerror( errno ) << endl;
- _fb = 0;
- close( _fb_fd );
- }
-
- _fb16 = (UINT16 *) _fb;
- _fb32 = (UINT32 *) _fb;
-}
-
-
-void YFrameBuffer::munmapFB()
-{
- if ( ! _fb )
- return;
-
- munmap( _fb, _fb_len );
- close( _fb_fd );
-
- _fb = 0;
- _fb16 = 0;
- _fb32 = 0;
- _fb_fd = -1;
-}
-
-
-void YFrameBuffer::setPixel( int x, int y, FBPixel pixel )
-{
- if ( ! _fb )
- return;
-
- if ( x < _width && y < _height )
- {
- if ( _bytesPerPixel == 2 )
- {
- pixel &= 0xFFFF;
- _fb16[ y * _width + x ] = (UINT16) pixel;
- }
- else if ( _bytesPerPixel == 4 )
- {
- _fb32[ y * _width + x ] = (UINT32) pixel;
- }
- }
-}
-
-
-YFrameBuffer::FBPixel
-YFrameBuffer::pixel( int x, int y )
-{
- if ( ! _fb )
- return 0;
-
- if ( x < _width && y < _height )
- {
- if ( _bytesPerPixel == 2 )
- {
- return (FBPixel) _fb16[ y * _width + x ];
- }
- else if ( _bytesPerPixel == 4 )
- {
- return (FBPixel) _fb32[ y * _width + x ];
- }
- }
-
- return 0;
-}
-
-
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YFrameBuffer.h new/yast2-qt-2.17.6/src/YFrameBuffer.h
--- old/yast2-qt-2.17.5/src/YFrameBuffer.h 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YFrameBuffer.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,92 +0,0 @@
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: YQFrameBuffer.h
-
- Author: Stefan Hundhammer <sh(a)suse.de>
-
-/-*/
-
-
-#ifndef YFrameBuffer_h
-#define YFrameBuffer_h
-
-class YFrameBuffer
-{
-public:
-
- typedef unsigned short UINT16;
- typedef unsigned long UINT32;
- typedef UINT32 FBPixel;
-
- /**
- * Constructor
- **/
- YFrameBuffer( int screenWidth, int screenHeight, int bitDepth );
-
- /**
- * Destructor
- **/
- virtual ~YFrameBuffer();
-
- /**
- * Set the framebuffer pixel at (x, y)
- **/
- void setPixel( int x, int y, FBPixel pixel );
-
- /**
- * Get the framebuffer pixel value at (x, y)
- **/
- FBPixel pixel( int x, int y );
-
- /**
- * Returns 'true' if the framebuffer is valid, i.e. can be used.
- **/
- bool valid() const { return _fb != 0; }
-
- int width() const { return _width; }
- int height() const { return _height; }
- int depth() const { return _depth; }
- int bytesPerPixel() const { return _bytesPerPixel; }
-
-
-protected:
-
- /**
- * mmap() the framebuffer device
- **/
- void mmapFB();
-
- /**
- * release the mmaped framebuffer
- **/
- void munmapFB();
-
-
- //
- // Data members
- //
-
- int _width;
- int _height;
- int _depth;
-
- void * _fb;
- int _fb_fd;
- UINT32 * _fb32;
- UINT16 * _fb16;
- size_t _fb_len;
- int _bytesPerPixel;
-};
-
-
-#endif // ifndef YFrameBuffer_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQButtonBox.cc new/yast2-qt-2.17.6/src/YQButtonBox.cc
--- old/yast2-qt-2.17.5/src/YQButtonBox.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.17.6/src/YQButtonBox.cc 2008-08-27 08:54:59.000000000 +0200
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YQButtonBox.cc
+
+ Author: Stefan Hundhammer <sh(a)suse.de>
+
+/-*/
+
+
+#define YUILogComponent "qt-ui"
+#include "YUILog.h"
+#include "YQButtonBox.h"
+
+
+YQButtonBox::YQButtonBox( YWidget * parent )
+ : QWidget( (QWidget *) parent->widgetRep() )
+ , YButtonBox( parent )
+{
+ setWidgetRep( this );
+}
+
+
+YQButtonBox::~YQButtonBox()
+{
+ // NOP
+}
+
+
+void YQButtonBox::setEnabled( bool enabled )
+{
+ QWidget::setEnabled( enabled );
+ YWidget::setEnabled( enabled );
+}
+
+
+void YQButtonBox::setSize( int newWidth, int newHeight )
+{
+ resize( newWidth, newHeight );
+ YButtonBox::setSize( newWidth, newHeight );
+}
+
+
+void YQButtonBox::moveChild( YWidget * child, int newX, int newY )
+{
+ QWidget * qw = (QWidget *)( child->widgetRep() );
+ qw->move( newX, newY );
+}
+
+
+#include "YQButtonBox.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQButtonBox.h new/yast2-qt-2.17.6/src/YQButtonBox.h
--- old/yast2-qt-2.17.5/src/YQButtonBox.h 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.17.6/src/YQButtonBox.h 2008-08-27 08:54:59.000000000 +0200
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YQButtonBox.h
+
+ Author: Stefan Hundhammer <sh(a)suse.de>
+
+/-*/
+
+
+#ifndef YQButtonBox_h
+#define YQButtonBox_h
+
+#include <qwidget.h>
+#include "YButtonBox.h"
+
+
+class YQButtonBox : public QWidget, public YButtonBox
+{
+ Q_OBJECT
+
+public:
+
+ /**
+ * Constructor.
+ **/
+ YQButtonBox( YWidget * parent );
+
+ /**
+ * Destructor.
+ **/
+ virtual ~YQButtonBox();
+
+ /**
+ * Set enabled/disabled state.
+ *
+ * Reimplemented from YWidget.
+ **/
+ virtual void setEnabled( bool enabled );
+
+ /**
+ * Set the new size of the widget.
+ *
+ * Reimplemented from YWidget.
+ **/
+ virtual void setSize( int newWidth, int newHeight );
+
+ /**
+ * Move a child widget to a new position.
+ *
+ * Reimplemented from YButtonBox.
+ **/
+ virtual void moveChild( YWidget * child, int newX, int newY );
+};
+
+
+#endif // YQButtonBox_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQCheckBoxFrame.cc new/yast2-qt-2.17.6/src/YQCheckBoxFrame.cc
--- old/yast2-qt-2.17.5/src/YQCheckBoxFrame.cc 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQCheckBoxFrame.cc 2008-08-27 08:54:59.000000000 +0200
@@ -66,6 +66,7 @@
void YQCheckBoxFrame::setValue( bool newValue )
{
setChecked( newValue );
+ setEnabled( newValue );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQLayoutBox.cc new/yast2-qt-2.17.6/src/YQLayoutBox.cc
--- old/yast2-qt-2.17.5/src/YQLayoutBox.cc 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQLayoutBox.cc 2008-08-27 08:54:59.000000000 +0200
@@ -31,6 +31,12 @@
}
+YQLayoutBox::~YQLayoutBox()
+{
+ // NOP
+}
+
+
void YQLayoutBox::setEnabled( bool enabled )
{
QWidget::setEnabled( enabled );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQLayoutBox.h new/yast2-qt-2.17.6/src/YQLayoutBox.h
--- old/yast2-qt-2.17.5/src/YQLayoutBox.h 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQLayoutBox.h 2008-08-27 08:54:59.000000000 +0200
@@ -39,6 +39,11 @@
YQLayoutBox( YWidget * parent, YUIDimension dim );
/**
+ * Destructor.
+ **/
+ virtual ~YQLayoutBox();
+
+ /**
* Set enabled/disabled state.
*
* Reimplemented from YWidget.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQUI_core.cc new/yast2-qt-2.17.6/src/YQUI_core.cc
--- old/yast2-qt-2.17.5/src/YQUI_core.cc 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQUI_core.cc 2008-08-27 08:54:59.000000000 +0200
@@ -39,6 +39,7 @@
#include "YQOptionalWidgetFactory.h"
#include "YEvent.h"
#include "YCommandLine.h"
+#include "YButtonBox.h"
#include "YUISymbols.h"
#include "utf8.h"
@@ -142,6 +143,8 @@
// Qt keeps track to a global QApplication in qApp.
Q_CHECK_PTR( qApp );
+
+ setButtonOrderFromEnvironment();
processCommandLineArgs( _ui_argc, argv );
calcDefaultSize();
@@ -203,6 +206,17 @@
_main_win->hide();
#endif
+ YButtonBoxMargins buttonBoxMargins;
+ buttonBoxMargins.left = 8;
+ buttonBoxMargins.right = 8;
+ buttonBoxMargins.top = 6;
+ buttonBoxMargins.bottom = 6;
+
+ buttonBoxMargins.spacing = 4;
+ buttonBoxMargins.helpButtonExtraSpacing = 16;
+ YButtonBox::setDefaultMargins( buttonBoxMargins );
+
+
// Ugly hack as a workaround of bug #121872 (Segfault at program exit
// if no Qt style defined):
@@ -273,6 +287,8 @@
else if ( opt == QString( "-noborder" ) ) _noborder = true;
else if ( opt == QString( "-auto-font" ) ) yqApp()->setAutoFonts( true );
else if ( opt == QString( "-auto-fonts" ) ) yqApp()->setAutoFonts( true );
+ else if ( opt == QString( "-gnome-button-order" ) ) YButtonBox::setLayoutPolicy( YButtonBox::gnomeLayoutPolicy() );
+ else if ( opt == QString( "-kde-button-order" ) ) YButtonBox::setLayoutPolicy( YButtonBox::kdeLayoutPolicy() );
// --macro is handled by YUI_component
else if ( opt == QString( "-help" ) )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQWidgetFactory.cc new/yast2-qt-2.17.6/src/YQWidgetFactory.cc
--- old/yast2-qt-2.17.5/src/YQWidgetFactory.cc 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQWidgetFactory.cc 2008-08-27 08:54:59.000000000 +0200
@@ -75,6 +75,16 @@
}
+YQButtonBox *
+YQWidgetFactory::createButtonBox( YWidget * parent )
+{
+ YQButtonBox * buttonBox = new YQButtonBox( parent );
+ YUI_CHECK_NEW( buttonBox );
+
+ return buttonBox;
+}
+
+
//
// Common Leaf Widgets
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQWidgetFactory.h new/yast2-qt-2.17.6/src/YQWidgetFactory.h
--- old/yast2-qt-2.17.5/src/YQWidgetFactory.h 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQWidgetFactory.h 2008-08-27 08:54:59.000000000 +0200
@@ -23,6 +23,7 @@
#include "YWidgetFactory.h"
#include "YQAlignment.h"
+#include "YQButtonBox.h"
#include "YQCheckBox.h"
#include "YQCheckBoxFrame.h"
#include "YQComboBox.h"
@@ -77,6 +78,7 @@
//
virtual YQLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dim );
+ virtual YQButtonBox * createButtonBox ( YWidget * parent );
//
// Common Leaf Widgets
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQWizard.cc new/yast2-qt-2.17.6/src/YQWizard.cc
--- old/yast2-qt-2.17.5/src/YQWizard.cc 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQWizard.cc 2008-08-27 08:54:59.000000000 +0200
@@ -127,6 +127,8 @@
_sendButtonEvents = true;
_contentsReplacePoint = 0;
+ _previousWindowIcon = topLevelWidget()->windowIcon();
+
YQUI::setTextdomain( TEXTDOMAIN );
//layoutTitleBar( this );
@@ -146,6 +148,7 @@
{
YQMainWinDock::mainWinDock()->resizeVisibleChild();
}
+
}
@@ -158,6 +161,8 @@
delete _helpDlg;
QY2Styler::self()->unregisterWidget( this );
+
+ topLevelWidget()->setWindowIcon( _previousWindowIcon );
}
bool YQWizard::isSecondary() const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/src/YQWizard.h new/yast2-qt-2.17.6/src/YQWizard.h
--- old/yast2-qt-2.17.5/src/YQWizard.h 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/src/YQWizard.h 2008-08-27 08:54:59.000000000 +0200
@@ -560,6 +560,8 @@
QHash<QString,QMenu*> _menuIDs;
QHash<QAction*, string> _menuEntryIDs;
+ QIcon _previousWindowIcon;
+
private:
static YQWizard *main_wizard;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/VERSION.cmake new/yast2-qt-2.17.6/VERSION.cmake
--- old/yast2-qt-2.17.5/VERSION.cmake 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/VERSION.cmake 2008-08-27 08:54:59.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "17")
-SET(VERSION_PATCH "5")
+SET(VERSION_PATCH "6")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.5/yast2-qt.spec.in new/yast2-qt-2.17.6/yast2-qt.spec.in
--- old/yast2-qt-2.17.5/yast2-qt.spec.in 2008-08-05 11:15:28.000000000 +0200
+++ new/yast2-qt-2.17.6/yast2-qt.spec.in 2008-08-27 08:54:59.000000000 +0200
@@ -16,8 +16,8 @@
Summary: -
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-libyui-devel >= 2.17.5
-Requires: yast2-libyui >= 2.17.5
+BuildRequires: yast2-libyui-devel >= 2.17.6
+Requires: yast2-libyui >= 2.17.6
Requires: yast2_theme >= 2.16.1
Provides: yast2_ui
Provides: y2base:/usr/lib/YaST2/servers/qt
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-printer
checked in at Thu Aug 28 02:25:50 CEST 2008.
--------
--- yast2-printer/yast2-printer.changes 2008-08-14 14:12:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2008-08-27 16:29:59.804780000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 27 16:22:28 CEST 2008 - jsmeix(a)suse.de
+
+- Enhanced scripts in the tools directory to make them
+ safe for a client-only setup and two new scripts
+ cups_client_only and modify_cupsd_conf.
+- 2.17.5
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.17.4.tar.bz2
New:
----
yast2-printer-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.IT1368/_old 2008-08-28 02:25:35.000000000 +0200
+++ /var/tmp/diff_new_pack.IT1368/_new 2008-08-28 02:25:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.17.4)
+# spec file for package yast2-printer (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://en.opensuse.org/YaST/Modules/Printer
Name: yast2-printer
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.17.4.tar.bz2
+Source0: yast2-printer-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite
Recommends: netcat
@@ -64,7 +64,7 @@
Michal Zugec <mzugec(a)suse.cz>
%prep
-%setup -n yast2-printer-2.17.4
+%setup -n yast2-printer-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -117,6 +117,11 @@
%exclude %{prefix}/share/doc/packages/yast2-printer/COPYING
%exclude %{prefix}/share/doc/packages/yast2-printer/README
%changelog
+* Wed Aug 27 2008 jsmeix(a)suse.de
+- Enhanced scripts in the tools directory to make them
+ safe for a client-only setup and two new scripts
+ cups_client_only and modify_cupsd_conf.
+- 2.17.5
* Thu Aug 14 2008 mzugec(a)suse.cz
- allow to print test page also for remote queues
- changed next Button to Finish
++++++ yast2-printer-2.17.4.tar.bz2 -> yast2-printer-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/configure new/yast2-printer-2.17.5/configure
--- old/yast2-printer-2.17.4/configure 2008-08-14 14:09:40.000000000 +0200
+++ new/yast2-printer-2.17.5/configure 2008-08-27 16:24:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.3.
+# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.5.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.17.3'
-PACKAGE_STRING='yast2-printer 2.17.3'
+PACKAGE_VERSION='2.17.5'
+PACKAGE_STRING='yast2-printer 2.17.5'
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-printer 2.17.3 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.17.5 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-printer 2.17.3:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.17.5:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.17.3
+yast2-printer configure 2.17.5
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-printer $as_me 2.17.3, which was
+It was created by yast2-printer $as_me 2.17.5, 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-printer'
- VERSION='2.17.3'
+ VERSION='2.17.5'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.3"
+VERSION="2.17.5"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec <mzugec(a)novell.com>"
@@ -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-printer $as_me 2.17.3, which was
+This file was extended by yast2-printer $as_me 2.17.5, 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-printer config.status 2.17.3
+yast2-printer config.status 2.17.5
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-printer-2.17.4/configure.in new/yast2-printer-2.17.5/configure.in
--- old/yast2-printer-2.17.4/configure.in 2008-08-14 14:09:23.000000000 +0200
+++ new/yast2-printer-2.17.5/configure.in 2008-08-27 16:24:17.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-printer
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.17.3, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.17.5, http://bugs.opensuse.org/, yast2-printer)
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.3"
+VERSION="2.17.5"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec <mzugec(a)novell.com>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/src/dialogs.ycp new/yast2-printer-2.17.5/src/dialogs.ycp
--- old/yast2-printer-2.17.4/src/dialogs.ycp 2008-08-14 13:56:48.000000000 +0200
+++ new/yast2-printer-2.17.5/src/dialogs.ycp 2008-08-26 15:00:25.000000000 +0200
@@ -181,7 +181,6 @@
});
}
-
void storeAutoconfig(string key, map event){
y2internal("Store: here I am ;-)");
foreach(string key, ["configurenewprinters", "disableprintersonremoval", "defaultcupspolicy"], {
@@ -208,6 +207,50 @@
});
}
+term widgetOperationPolicy = `VBox(
+ `Left( `Label(_("Specify the operation policy")) ),
+ `Left( `ComboBox(`id("operationpolicy"), _("The operation policy"), [""]) ),
+ `HSpacing()
+);
+
+void initOperationPolicy(string key){
+# if( Printerlib::ExecuteBashCommand("{ grep -i '^DefaultPolicy ' /etc/cups/cupsd.conf.orig || echo "DefaultPolicy default" ; } | cut -d' ' -f2") ){
+ if( Printerlib::ExecuteBashCommand("grep '^<Policy ' /etc/cups/cupsd.conf|cut -d' ' -f2|cut -d'>' -f1") ){
+ UI::ChangeWidget(`id("operationpolicy"), `Items, splitstring(Printerlib::result["stdout"]:"", "\n"));
+ }
+ foreach(map conf, Printerlib::operation_policy["value", 0, "value"]:[], {
+ if (conf["name"]:""=="operationpolicy")
+ UI::ChangeWidget(`id(conf["name"]:""), `Value, conf["value"]:"");
+ else UI::ChangeWidget(`id(conf["name"]:""), `Value, conf["value"]:""=="yes" ? true : false);
+ });
+}
+
+void storeOperationPolicy(string key, map event){
+ y2internal("storeOperationPolicy: here I am ;-)");
+ foreach(string key, ["operationpolicy"], {
+ map value = $[
+ "comment" : "",
+ "kind" : "value",
+ "name" : key
+ ];
+ if (key=="operationpolicy") value["value"] = (string) UI::QueryWidget(`id(key), `Value);
+ else value["value"] = ((boolean)UI::QueryWidget(`id(key), `Value)) ? "yes" : "no";
+
+ y2internal("values for %1 : %2", key, value);
+ list<map> config=[];
+ boolean found=false;
+ foreach(map row, Printerlib::operation_policy["value", 0, "value"]:[], {
+ if (row["name"]:""==key){
+ row["value"]=value["value"]:"";
+ found=true;
+ }
+ config=add(config, row);
+ });
+ if (!found) config=add(config, value);
+ Printerlib::operation_policy["value", 0, "value"]=config;
+ });
+}
+
map<string, map<string,any> > wd = $[
"OVERVIEW" : $[
"widget" : `custom,
@@ -215,7 +258,6 @@
"init" : initOverview,
"handle" : handleOverview,
"help" : HELPS["overview"]:""
-
],
"NETWORKPRINTING" : $[
"widget" : `custom,
@@ -228,6 +270,13 @@
"custom_widget" : widgetSharing,
"help" : HELPS["sharing_dialog"]:""
],
+ "OPERATIONPOLICY" : $[
+ "widget" : `custom,
+ "custom_widget" : widgetOperationPolicy,
+ "init" : initOperationPolicy,
+ "store" : storeOperationPolicy,
+ "help" : HELPS["operation_policy"]:""
+ ],
"AUTOCONFIG" : $[
"widget" : `custom,
"custom_widget" : widgetAutoconfig,
@@ -239,29 +288,37 @@
map tabs_descr = $[
"overview" : $[
- "header" : _("Printers and Queues"),
- "tree_item_label" : _("Printers and Queues"),
+ "header" : _("Printer Configurations"),
+ "tree_item_label" : _("Printer Configurations"),
"contents" : `VBox (
"OVERVIEW"
),
"widget_names" : ["OVERVIEW"]
],
"network" : $[
- "header" : _("Printing via Network"),
- "tree_item_label" : _("Printing via Network"),
+ "header" : _("Print via Network"),
+ "tree_item_label" : _("Print via Network"),
"contents" : `VBox (
"NETWORKPRINTING"
),
"widget_names" : ["NETWORKPRINTING"]
],
"sharing" : $[
- "header" : _("Sharing and Publishing"),
- "tree_item_label" : _("Sharing and Publishing"),
+ "header" : _("Share Printers"),
+ "tree_item_label" : _("Share Printers"),
"contents" : `VBox (
"SHARING"
),
"widget_names" : ["SHARING"]
],
+ "operation_policy" : $[
+ "header" : _("Operation Policy"),
+ "tree_item_label" : _("Operation Policy"),
+ "contents" : `VBox (
+ "OPERATIONPOLICY"
+ ),
+ "widget_names" : ["OPERATIONPOLICY"]
+ ],
"autoconfig" : $[
"header" : _("Autoconfig Settings"),
"tree_item_label" : _("Autoconfig Settings"),
@@ -277,7 +334,7 @@
string caption = _("Detected Printers");
symbol ret = DialogTree::ShowAndRun ($[
- "ids_order" : [ "overview", "network", "sharing", "autoconfig" ],
+ "ids_order" : [ "overview", "network", "sharing", "operation_policy", "autoconfig" ],
"initial_screen" : "overview",
"screens" : tabs_descr,
"widget_descr" : wd,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/src/helps.ycp new/yast2-printer-2.17.5/src/helps.ycp
--- old/yast2-printer-2.17.4/src/helps.ycp 2008-08-14 07:41:04.000000000 +0200
+++ new/yast2-printer-2.17.5/src/helps.ycp 2008-08-26 14:32:22.000000000 +0200
@@ -291,14 +291,27 @@
(via 'Printing Via Network') so that the clients access the server directly.
</p>"),
+"operation_policy" :
+// Operation Policy help 1/1:
+_("<p>
+<b><big>CUPS Operation Policy</big></b><br>
+Operation policies are the rules used for each operation in CUPS.
+Such operations are for example 'print something', 'cancel a printout',
+'configure a printer', 'modify or remove a printer configuration',
+and 'enable or disable printing'.
+</p>"),
+
"autoconfig" :
+// Autoconfig help 1/1:
_("<p>
<b><big>CUPS Autoconfiguration for USB Printers</big></b><br>
-When a local printer is added to the system cups-autoconfig determines if the printer is already configured.
-If the printer is configured then the printer is enabled. If the printer is not configured then cups-autoconfig attempts to select the appropriate driver for the new printer and, if successful, creates a new print queue according <b>ConfigureNewPrinters</b> option.<br>
-Newly configured printers will be assigned the <b>DefaultCUPSPolicy</b>.<br>
-
-When a local printer is removed the <b>DisablePrintersOnRemoval</b> variable is consulted. If the variable is set to \"yes\" then the printer is disabled.
+When a USB printer is connected to the system
+cups-autoconfig determines if the printer is already configured.
+If it is already configured, printing is enabled.
+If the printer is not configured, cups-autoconfig attempts
+to select an appropriate driver for it and, if successful,
+cups-autoconfig configures it.
+When a USB printer is removed, cups-autoconfig can disable printing.
</p>"),
"useless_help" :
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/src/Printerlib.ycp new/yast2-printer-2.17.5/src/Printerlib.ycp
--- old/yast2-printer-2.17.4/src/Printerlib.ycp 2008-08-14 06:59:45.000000000 +0200
+++ new/yast2-printer-2.17.5/src/Printerlib.ycp 2008-08-26 14:53:09.000000000 +0200
@@ -47,6 +47,8 @@
return true;
}
+global map<string, any> operation_policy = $[];
+
global map<string, any> cups_autoconfig = $[];
global void Read(){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/src/printingvianetwork.ycp new/yast2-printer-2.17.5/src/printingvianetwork.ycp
--- old/yast2-printer-2.17.4/src/printingvianetwork.ycp 2008-08-14 06:59:45.000000000 +0200
+++ new/yast2-printer-2.17.5/src/printingvianetwork.ycp 2008-08-26 13:56:48.000000000 +0200
@@ -41,45 +41,45 @@
include "printer/helps.ycp";
-term widgetNetworkPrinting =
- `VBox( `VStretch(),
- `Frame( _("Use the Common Unix Printing System (CUPS) to print via network"),
+term widgetNetworkPrinting =
+ `VBox( `VStretch(),
+ `Frame( _("Use CUPS to Print Via Network"),
`RadioButtonGroup( `id(`browsing_or_client_only_check_boxs),
- `VBox( `Left( `RadioButton( `id(`cupsd_conf_browsing_on_radio_button),
+ `VBox( `Left( `RadioButton( `id(`cupsd_conf_browsing_off_radio_button),
`opt(`notify),
- _("&Receive printer information which is published by remote CUPS servers"),
+ _("&Do not Receive Printer Information from Remote CUPS servers"),
+ ! Printerlib::client_only && ! Printerlib::browsing_on
+ )
+ ),
+ `Left( `RadioButton( `id(`cupsd_conf_browsing_on_radio_button),
+ `opt(`notify),
+ _("&Receive Printer Information from Remote CUPS servers"),
! Printerlib::client_only && Printerlib::browsing_on
)
),
`HBox( `HSpacing( 3 ),
`TextEntry( `id(`cupsd_conf_browse_deny_input),
- _("&Suppress the information which is published by the following CUPS servers (separated by spaces)"),
+ _("&Show Printers Published by CUPS Servers Except the Following (separated by spaces)"),
Printerlib::cupsd_conf_browse_deny
)
),
- `Left( `RadioButton( `id(`cupsd_conf_browsing_off_radio_button),
- `opt(`notify),
- _("&Do not listen to any information which is published by remote CUPS servers"),
- ! Printerlib::client_only && ! Printerlib::browsing_on
- )
- ),
`VSpacing( 1 ),
`Left( `RadioButton( `id(`client_only_check_box),
`opt(`notify),
- _("Do all your printing directly via one single remote &CUPS server"),
+ _("Do All Your Printing Directly via One Remote &CUPS Server"),
Printerlib::client_only
)
),
`HBox( `HSpacing( 3 ),
`HWeight( 2,
`TextEntry( `id(`client_conf_server_name_input),
- _("&Hostname / IP address"),
+ _("&Hostname / IP Address"),
Printerlib::client_conf_server_name
)
),
`HWeight( 1,
`PushButton( `id(`test_client_conf_server),
- _("&Test server access")
+ _("&Test Server")
)
),
`HStretch()
@@ -88,13 +88,10 @@
)
),
`VStretch(),
- `Frame( _("Use a network printer directly or print via another kind of print server"),
- `Left( `HBox( `Label( _("Use the") + " " ),
- `PushButton( `id(`connection_wizard),
- _("&Connection Wizard")
- ),
- `Label( " " + _("to specify how the network printer is accessible") )
- )
+ `Frame( _("Use Another Print Server or Use a Network Printer Directly"),
+ `Left( `PushButton( `id(`connection_wizard),
+ _("&Connection Wizard")
+ )
)
),
`VStretch()
@@ -158,7 +155,7 @@
* @return dialog result
*/
any PrintingViaNetworkDialog()
-{ string caption = _("Printing Via Network");
+{ string caption = _("Print Via Network");
string commandline = "";
// By default there is "Browsing On" in /etc/cups/cupsd.conf
// which is even the fallback if there is no "Browsing" entry at all
@@ -193,6 +190,8 @@
{ client_conf_server_name = Printerlib::result["stdout"]:"";
}
}
+ term contents = widgetNetworkPrinting;
+/*
term contents = `VBox( `VStretch(),
`Frame( _("Use the Common Unix Printing System (CUPS) to print via network"),
`RadioButtonGroup( `id(`browsing_or_client_only_check_boxs),
@@ -250,6 +249,7 @@
),
`VStretch()
);
+*/
Wizard::SetContentsButtons( caption,
contents,
HELPS["printing_via_network_dialog"]:"",
@@ -572,7 +572,7 @@
// Exit this dialog and go to the ConnectionWizardDialog and BasicAddDialog via the sequencer in wizards.ycp:
break;
}
- y2milestone( "Ignoring unexpected returncode in DriverOptionsDialog: %1", ret );
+ y2milestone( "Ignoring unexpected returncode in PrintingViaNetworkDialog: %1", ret );
continue;
}
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/src/wizards.ycp new/yast2-printer-2.17.5/src/wizards.ycp
--- old/yast2-printer-2.17.4/src/wizards.ycp 2008-08-14 06:59:45.000000000 +0200
+++ new/yast2-printer-2.17.5/src/wizards.ycp 2008-08-26 13:53:54.000000000 +0200
@@ -62,7 +62,7 @@
`add : "add",
`modify : "modify",
`delete : "overview",
-// `printing_via_network : "printing_via_network",
+ `printing_via_network : "printing_via_network",
`connection_wizard : "printing_via_network_connection_wizard"
],
"add" : $[ `abort : `abort,
@@ -83,12 +83,10 @@
"modify_driver_options" : $[ `abort : `abort,
`next : "modify"
],
-/*
"printing_via_network" : $[ `abort : `abort,
`next : "overview",
`connection_wizard : "printing_via_network_connection_wizard"
],
-*/
"printing_via_network_connection_wizard" : $[ `abort : `abort,
`next : "add"
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/autodetect_printers new/yast2-printer-2.17.5/tools/autodetect_printers
--- old/yast2-printer-2.17.4/tools/autodetect_printers 2008-08-11 13:09:24.000000000 +0200
+++ new/yast2-printer-2.17.5/tools/autodetect_printers 2008-08-26 15:20:51.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# Johannes Meixner <jsmeix(a)suse.de>, 2007
+# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008
#set -x
@@ -31,8 +31,11 @@
exit 1
fi
-# Test if cupsd is accessible:
-echo 'Testing if cupsd is accessible...' >>$PROGRESS
+# Test if cupsd on localhost is accessible.
+# Only on localhost print queues should be set up.
+# CUPS supports even remote queue setup but this is not supported by YaST.
+# Therefore explicitely the cupsd on localhost is asked for autodetected printer information.
+echo 'Testing if cupsd on localhost is accessible...' >>$PROGRESS
if ! $LPSTAT -h localhost -r &>/dev/null
then echo "Cannot access cupsd on localhost" 1>&2
exit 2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/autodetect_print_queues new/yast2-printer-2.17.5/tools/autodetect_print_queues
--- old/yast2-printer-2.17.4/tools/autodetect_print_queues 2008-08-11 13:09:24.000000000 +0200
+++ new/yast2-printer-2.17.5/tools/autodetect_print_queues 2008-08-27 14:21:11.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# Johannes Meixner <jsmeix(a)suse.de>, 2007
+# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008
#set -x
@@ -24,11 +24,24 @@
exit 1
fi
-# Test if cupsd is accessible:
-#if ! $LPSTAT -h localhost -r &>/dev/null
-#then echo "Cannot access cupsd on localhost" 1>&2
-# exit 2
-#fi
+# Test if cupsd is accessible.
+# This is not limited to localhost.
+# Even for a system-wide 'client-only' config via /etc/cups/client.conf
+# it must work to get the queue information.
+# But on the other hand, any other kind of setting for a remote CUPS server
+# (e.g. an inherited CUPS_SERVER environment variable setting or a
+# ServerName entry in ~/.cups/client.conf of the user who runs this script)
+# is ignored to avoid that by accident an unintended CUPS server is asked.
+# The 'tr ... [:space:]' makes sure that the first active ServerName entry
+# is used if there is more than one which is a broken config.
+SERVERNAME="$( grep -i '^ServerName ' /etc/cups/client.conf | tr -s '[:space:]' ' ' | cut -s -d' ' -f2 )"
+if test -z "$SERVERNAME"
+then SERVERNAME="localhost"
+fi
+if ! $LPSTAT -h $SERVERNAME -r &>/dev/null
+then echo "Cannot access cupsd on '$SERVERNAME'" 1>&2
+ exit 2
+fi
# Input:
@@ -39,16 +52,13 @@
# and then there is also correctly no output because a DeviceURI is mandatory.
MAXIMUM_WAIT="30"
# Get queue names and DeviceURI:
-#$LPSTAT -h localhost -v >$TMP_DATA_RAW_V &
-$LPSTAT -v >$TMP_DATA_RAW_V &
+$LPSTAT -h $SERVERNAME -v >$TMP_DATA_RAW_V &
lpstatPID_V=$!
# Get additional info about the queues:
-#$LPSTAT -h localhost -l -p >$TMP_DATA_RAW_L &
-$LPSTAT -l -p >$TMP_DATA_RAW_L &
+$LPSTAT -h $SERVERNAME -l -p >$TMP_DATA_RAW_L &
lpstatPID_L=$!
# Get info whether or not the queues accept or reject jobs:
-#$LPSTAT -h localhost -a >$TMP_DATA_RAW_A &
-$LPSTAT -a >$TMP_DATA_RAW_A &
+$LPSTAT -h $SERVERNAME -a >$TMP_DATA_RAW_A &
lpstatPID_A=$!
# Timeout stuff:
for i in $( seq $MAXIMUM_WAIT )
@@ -102,7 +112,8 @@
# The very first "queue" line doesn't result an output because "$URI" is an empty string.
# Since CUPS 1.3 it does no longer work in any case (e.g for a local raw IPP queue)
# to use the "Connection:..." value in the "lpstat -l" output to distinguish between
-# a local queue (in /etc/cups/printers.conf) and a remote queue (on another host).
+# a local queue (in /etc/cups/printers.conf) and a remote queue (on another host) and
+# therefore /etc/cups/printers.conf is directly inspected to distinguish local and remote queues.
# Reason:
# In the CUPS sources systemv/lpstat.c uses CUPS_PRINTER_REMOTE to distinguish between
# its output "Connection: remote" and "Connection: direct".
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/create_printer_ppd_database new/yast2-printer-2.17.5/tools/create_printer_ppd_database
--- old/yast2-printer-2.17.4/tools/create_printer_ppd_database 2008-08-11 13:09:24.000000000 +0200
+++ new/yast2-printer-2.17.5/tools/create_printer_ppd_database 2008-08-26 15:57:36.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# Johannes Meixner <jsmeix(a)suse.de>, 2007
+# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008
#set -x
@@ -27,7 +27,10 @@
exit 1
fi
-# Test if cupsd is accessible:
+# Test if cupsd on localhost is accessible.
+# Only on localhost print queues should be set up.
+# CUPS supports even remote queue setup but this is not supported by YaST.
+# Therefore explicitely the cupsd on localhost is asked for printer driver information.
if ! $LPSTAT -h localhost -r &>/dev/null
then echo "Cannot access cupsd on localhost" 1>&2
exit 2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/cups_client_only new/yast2-printer-2.17.5/tools/cups_client_only
--- old/yast2-printer-2.17.4/tools/cups_client_only 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-printer-2.17.5/tools/cups_client_only 2008-08-27 14:21:43.000000000 +0200
@@ -0,0 +1,85 @@
+#! /bin/bash
+#
+# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008
+
+#set -x
+
+export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
+export LC_ALL="POSIX"
+export LANG="POSIX"
+umask 022
+
+SERVERNAME="$1"
+
+if test -n "$SERVERNAME"
+then # When a SERVERNAME is specified, set it in /etc/cups/client.conf
+ # if SERVERNAME is not the magic word 'none' which
+ # is used to only remove all active ServerName entries.
+ # Note that even 'localhost' is a valid entry there
+ # which is used to force client tools (e.g. lpadmin, lpinfo, lpstat)
+ # to ask the local cupsd via the IPP port on localhost (localhost:631)
+ # and not via the domain socket (/var/run/cups/cups.sock) because
+ # the latter failed in the past for certain third-party clients (e.g. Java).
+ # Note that (according to Michael Sweet) it is not a supported configuration
+ # when a cupsd listens only on the domain socket but not on localhost so that
+ # YaST can rely on that a local cupsd listens at least on localhost.
+ if test -w /etc/cups/client.conf
+ then # Remove all existing active ServerName entries with ignore case
+ # (usually there should be at most one active ServerName entry):
+ sed -i.yast2.save -e '/^ServerName/Id' /etc/cups/client.conf
+ # Append the new active ServerName entry if SERVERNAME is not 'none':
+ if test "none" != "$SERVERNAME"
+ then echo "ServerName $SERVERNAME" >>/etc/cups/client.conf
+ fi
+ else # Create a new /etc/cups/client.conf with the active ServerName entry if SERVERNAME is not 'none':
+ if test "none" != "$SERVERNAME" && echo "ServerName $SERVERNAME" >/etc/cups/client.conf
+ then exit 0
+ else echo "Failed to create /etc/cups/client.conf with 'ServerName $SERVERNAME' entry." 1>&2
+ exit 1
+ fi
+ fi
+fi
+
+# In any case report what there might be set in /etc/cups/client.conf.
+# If there is no active ServerName or when /etc/cups/client.conf does not exist,
+# the output is the empty string (i.e. nothing at all - not even a '\n' character).
+# The 'tr ... [:blank:]' makes sure that all active ServerName entries
+# are found if there is more than one which is a broken config.
+SERVERNAME="$( grep -i '^ServerName ' /etc/cups/client.conf | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 )"
+echo -n "$SERVERNAME"
+# For a nicer output on a terminal where stdout and stderr is mixed up,
+# output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt
+# or error messages because of failed tests below) on a new line:
+echo 1>&2
+
+# Test if the active ServerName is accessible, if such an entry exists.
+# If executables for the tests are missing, show an error message and skip the test.
+# If a test fails, show an error message and exit with non-zero exit code.
+if test -z "$SERVERNAME"
+then exit 0
+fi
+
+PING="$( type -P ping )"
+if ! test -x "$PING"
+then echo "Cannot execute ping" 1>&2
+else # Test if the server responds to ping:
+ if ! $PING -w 1 -c 1 $SERVERNAME &>/dev/null
+ then echo "The host '$SERVERNAME' does not respond to 'ping'." 1>&2
+ exit 2
+ fi
+fi
+
+NETCAT="$( type -P netcat )"
+if ! test -x "$NETCAT"
+then echo "Cannot execute netcat" 1>&2
+else # Test if the server is accessible via the default IPP port.
+ # It is possible to run the cupsd on another port and specify this
+ # via 'ServerName host:port' but currently this special case is ignored.
+ if ! $NETCAT -w 1 -z $SERVERNAME 631 &>/dev/null
+ then echo "No cupsd accessible on host '$SERVERNAME' via port 631 (IPP)." 1>&2
+ exit 3
+ fi
+fi
+
+exit 0
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/determine_printer_driver_options new/yast2-printer-2.17.5/tools/determine_printer_driver_options
--- old/yast2-printer-2.17.4/tools/determine_printer_driver_options 2008-08-11 13:09:24.000000000 +0200
+++ new/yast2-printer-2.17.5/tools/determine_printer_driver_options 2008-08-26 15:55:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# Johannes Meixner <jsmeix(a)suse.de>, 2007
+# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008
#set -x
@@ -30,7 +30,10 @@
exit 1
fi
-# Test if cupsd is accessible:
+# Test if cupsd on localhost is accessible.
+# Only on localhost print queue settings should be changed.
+# CUPS supports to modify even remote queues but this is not supported by YaST.
+# Therefore explicitely the cupsd on localhost is asked for printer driver options.
if ! $LPSTAT -h localhost -r &>/dev/null
then echo "Cannot access cupsd on localhost" 1>&2
exit 2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/Makefile.am new/yast2-printer-2.17.5/tools/Makefile.am
--- old/yast2-printer-2.17.4/tools/Makefile.am 2008-08-11 13:09:24.000000000 +0200
+++ new/yast2-printer-2.17.5/tools/Makefile.am 2008-08-27 10:55:04.000000000 +0200
@@ -4,6 +4,8 @@
create_printer_ppd_database \
autodetect_printers \
autodetect_print_queues \
- determine_printer_driver_options
+ determine_printer_driver_options \
+ modify_cupsd_conf \
+ cups_client_only
EXTRA_DIST = $(ybin_SCRIPTS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/Makefile.in new/yast2-printer-2.17.5/tools/Makefile.in
--- old/yast2-printer-2.17.4/tools/Makefile.in 2008-08-14 14:09:47.000000000 +0200
+++ new/yast2-printer-2.17.5/tools/Makefile.in 2008-08-27 16:24:23.000000000 +0200
@@ -168,7 +168,9 @@
create_printer_ppd_database \
autodetect_printers \
autodetect_print_queues \
- determine_printer_driver_options
+ determine_printer_driver_options \
+ modify_cupsd_conf \
+ cups_client_only
EXTRA_DIST = $(ybin_SCRIPTS)
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/tools/modify_cupsd_conf new/yast2-printer-2.17.5/tools/modify_cupsd_conf
--- old/yast2-printer-2.17.4/tools/modify_cupsd_conf 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-printer-2.17.5/tools/modify_cupsd_conf 2008-08-27 16:01:29.000000000 +0200
@@ -0,0 +1,124 @@
+#! /bin/bash
+#
+# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008
+
+#set -x
+
+export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
+export LC_ALL="POSIX"
+export LANG="POSIX"
+umask 022
+
+MY_NAME=${0##*/}
+
+KEY="$1"
+if test -z "$KEY"
+then echo -en "\nUsage:\n$MY_NAME keyword [ new value ]\n" 1>&2
+ echo "Without a new value, the current value is reported." 1>&2
+ echo "Supported keywords and possible new values are:" 1>&2
+ echo "Browsing [ On | Off ]" 1>&2
+ echo "BrowseAllow [ all | none | @LOCAL | IP-address ]" 1>&2
+ exit 1
+fi
+
+VALUE="$2"
+
+CUPSDCONF="/etc/cups/cupsd.conf"
+if ! test -r $CUPSDCONF -a -w $CUPSDCONF
+then echo "Cannot read or write $CUPSDCONF." 1>&2
+ exit 2
+fi
+
+# Function to deal with 'Browsing [On|Off]'
+Browsing()
+{ if test -n "$VALUE"
+ then # If a value was specified, only 'On' or 'Off' (case sensitive) are allowed:
+ if ! test "On" = "$VALUE" -o "Off" = "$VALUE"
+ then echo "Only '$KEY [ On | Off ]' is allowed." 1>&2
+ exit 4
+ fi
+ # Try to substitute an existing Browsing line (ignore case):
+ sed -i.yast2save -e "s/^.*$KEY.*/$KEY $VALUE/i" $CUPSDCONF
+ # There may exist no Browsing line:
+ if ! grep -q "^$KEY $VALUE$" $CUPSDCONF
+ then # Append a Browsing line below the last 'Brows' line (ignore case)
+ # to have the new Browsing line at the matching place
+ # but if no 'Brows' line exists, append at the end of the file:
+ LAST_BROWSE_LINE="$( sed -n -e '/Brows/I=' $CUPSDCONF | tail -n 1 )"
+ if test -n "$LAST_BROWSE_LINE"
+ then sed -i -e "${LAST_BROWSE_LINE}a$KEY $VALUE" $CUPSDCONF
+ else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF
+ fi
+ fi
+ fi
+ # Report the resulting setting in any case:
+ # The 'tr ... [:blank:]' makes sure that all active Browsing entries
+ # are found if there is more than one which is a broken config.
+ RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 )"
+ echo -n "$RESULT"
+ # For a nicer output on a terminal where stdout and stderr is mixed up,
+ # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt
+ # or an error message because of a failed test below) on a new line:
+ echo 1>&2
+ # Test if the result is the expected one if a value was specified:
+ if test -n "$VALUE" -a "$RESULT" != "$VALUE"
+ then echo "Failed to set '$KEY $VALUE' in $CUPSDCONF." 1>&2
+ exit 5
+ fi
+}
+
+# Function to deal with 'BrowseAllow [ all | none | @LOCAL | IP-address ]'
+BrowseAllow()
+{ if test -n "$VALUE"
+ then # If a value was specified, only 'all' or 'none' or '@LOCAL' (case sensitive)
+ # or a single IP-address is allowed:
+ if ! test "all" = "$VALUE" -o "none" = "$VALUE" -o "@LOCAL" = "$VALUE"
+ then # Test if value matches to IP-address syntax:
+ if ! echo $VALUE | egrep -q '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$'
+ then echo "Only '$KEY [ all | none | @LOCAL | IP-address ]' is allowed." 1>&2
+ exit 4
+ fi
+ fi
+ # Set 'BrowseOrder allow,deny' to deny browse packets by default
+ # and then allow them from certain sources via a BrowseAllow entry.
+ # All existing BrowseOrder lines are removed (ignore case).
+ sed -i.yast2save -e '/^BrowseOrder.*/Id' $CUPSDCONF
+ # Append the new BrowseOrder line below the last 'Brows' line (ignore case)
+ # to have the new BrowseOrder line at the matching place
+ # but if no 'Brows' line exists, append at the end of the file:
+ LAST_BROWSE_LINE="$( sed -n -e '/Brows/I=' $CUPSDCONF | tail -n 1 )"
+ if test -n "$LAST_BROWSE_LINE"
+ then sed -i -e "${LAST_BROWSE_LINE}aBrowseOrder allow,deny" $CUPSDCONF
+ else echo -en "\nBrowseOrder allow,deny\n\n" >>$CUPSDCONF
+ fi
+ # All existing BrowseAllow lines are removed (ignore case):
+ sed -i -e '/^BrowseAllow.*/Id' $CUPSDCONF
+ # Append a BrowseAllow line below the BrowseOrder line
+ # to have the new BrowseAllow line at the matching place:
+ sed -i -e "/^BrowseOrder /a$KEY from $VALUE" $CUPSDCONF
+ fi
+ # Report the resulting setting in any case:
+ # The 'tr ... [:blank:]' makes sure that all active BrowseAllow entries
+ # are found if there is more than one which is allowed.
+ RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f3 )"
+ echo -n "$RESULT"
+ # For a nicer output on a terminal where stdout and stderr is mixed up,
+ # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt
+ # or an error message because of a failed test below) on a new line:
+ echo 1>&2
+ # Test if the result is the expected one if a value was specified:
+ if test -n "$VALUE" -a "$RESULT" != "$VALUE"
+ then echo "Failed to set '$KEY from $VALUE' in $CUPSDCONF." 1>&2
+ exit 5
+ fi
+}
+
+case "$KEY" in
+ Browsing) Browsing;;
+ BrowseAllow) BrowseAllow;;
+ *) echo "Ignoring keyword '$KEY'" 1>&2
+ exit 3 ;;
+esac
+
+exit 0
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.4/VERSION new/yast2-printer-2.17.5/VERSION
--- old/yast2-printer-2.17.4/VERSION 2008-08-14 14:11:17.000000000 +0200
+++ new/yast2-printer-2.17.5/VERSION 2008-08-27 16:22:22.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-packager
checked in at Thu Aug 28 02:25:25 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-08-26 12:59:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-08-27 13:29:43.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 27 13:28:07 CEST 2008 - locilka(a)suse.cz
+
+- Initializing installation URL got from install.inf (RepoURL)
+ if exists (bnc #406162).
+- 2.17.8
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.17.7.tar.bz2
New:
----
yast2-packager-2.17.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.b32443/_old 2008-08-28 02:25:18.000000000 +0200
+++ /var/tmp/diff_new_pack.b32443/_new 2008-08-28 02:25:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.7)
+# spec file for package yast2-packager (Version 2.17.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.7
+Version: 2.17.8
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.7.tar.bz2
+Source0: yast2-packager-2.17.8.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
@@ -80,7 +80,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.17.7
+%setup -n yast2-packager-2.17.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -116,6 +116,10 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Wed Aug 27 2008 locilka(a)suse.cz
+- Initializing installation URL got from install.inf (RepoURL)
+ if exists (bnc #406162).
+- 2.17.8
* Mon Aug 25 2008 ug(a)suse.de
- post_patterns added for autoyast
- 2.17.7
++++++ yast2-packager-2.17.7.tar.bz2 -> yast2-packager-2.17.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.7/configure new/yast2-packager-2.17.8/configure
--- old/yast2-packager-2.17.7/configure 2008-08-26 12:55:22.000000000 +0200
+++ new/yast2-packager-2.17.8/configure 2008-08-27 13:33:39.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.7.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.8.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.17.7'
-PACKAGE_STRING='yast2-packager 2.17.7'
+PACKAGE_VERSION='2.17.8'
+PACKAGE_STRING='yast2-packager 2.17.8'
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-packager 2.17.7 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.17.8 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-packager 2.17.7:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.17.8:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.17.7
+yast2-packager configure 2.17.8
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-packager $as_me 2.17.7, which was
+It was created by yast2-packager $as_me 2.17.8, 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-packager'
- VERSION='2.17.7'
+ VERSION='2.17.8'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak(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-packager $as_me 2.17.7, which was
+This file was extended by yast2-packager $as_me 2.17.8, 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-packager config.status 2.17.7
+yast2-packager config.status 2.17.8
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-packager-2.17.7/configure.in new/yast2-packager-2.17.8/configure.in
--- old/yast2-packager-2.17.7/configure.in 2008-08-26 12:55:15.000000000 +0200
+++ new/yast2-packager-2.17.8/configure.in 2008-08-27 13:33:36.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
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-packager, 2.17.7, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.8, http://bugs.opensuse.org/, yast2-packager)
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.7"
+VERSION="2.17.8"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.7/src/modules/InstURL.ycp new/yast2-packager-2.17.8/src/modules/InstURL.ycp
--- old/yast2-packager-2.17.7/src/modules/InstURL.ycp 2008-03-31 16:09:50.000000000 +0200
+++ new/yast2-packager-2.17.8/src/modules/InstURL.ycp 2008-08-27 13:30:24.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Convert /etc/install.inf data to URL
*
*
- * $Id: InstURL.ycp 44413 2008-02-13 11:24:28Z jsrain $
+ * $Id: InstURL.ycp 50407 2008-08-27 11:30:24Z locilka $
*/
{
@@ -125,7 +125,15 @@
string repo_url = Linuxrc::InstallInf ("YaSTRepoURL");
if (repo_url != "" && repo_url != nil)
{
- y2milestone ("Using URL directly from install.inf: %1", repo_url);
+ y2milestone ("Using YaSTRepoURL directly from install.inf: %1", HidePassword (repo_url));
+ return repo_url;
+ }
+
+ // bnc #406162
+ repo_url = Linuxrc::InstallInf ("RepoURL");
+ if (repo_url != "" && repo_url != nil)
+ {
+ y2milestone ("Using RepoURL directly from install.inf: %1", HidePassword (repo_url));
return repo_url;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.7/VERSION new/yast2-packager-2.17.8/VERSION
--- old/yast2-packager-2.17.7/VERSION 2008-08-26 12:54:47.000000000 +0200
+++ new/yast2-packager-2.17.8/VERSION 2008-08-27 13:30:18.000000000 +0200
@@ -1 +1 @@
-2.17.7
+2.17.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-inetd
checked in at Thu Aug 28 02:25:19 CEST 2008.
--------
--- yast2-inetd/yast2-inetd.changes 2008-08-05 10:25:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-inetd/yast2-inetd.changes 2008-08-27 12:52:29.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 27 12:49:12 CEST 2008 - locilka(a)suse.cz
+
+- Using buil-in getenv instead of artificial simulation of it.
+- Adjusted RPM dependencies.
+- [Cancel] instead of [Abort].
+- 2.17.1
+
+-------------------------------------------------------------------
Old:
----
yast2-inetd-2.17.0.tar.bz2
New:
----
yast2-inetd-2.17.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-inetd.spec ++++++
--- /var/tmp/diff_new_pack.P32103/_old 2008-08-28 02:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.P32103/_new 2008-08-28 02:25:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-inetd (Version 2.17.0)
+# spec file for package yast2-inetd (Version 2.17.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,16 +19,17 @@
Name: yast2-inetd
-Version: 2.17.0
+Version: 2.17.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-inetd-2.17.0.tar.bz2
+Source0: yast2-inetd-2.17.1.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-users
Requires: yast2 >= 2.13.74
Requires: yast2-packager yast2-users
+Conflicts: yast2-core < 2.17.9
Provides: yast2-config-inet y2c_inet
Obsoletes: yast2-config-inet y2c_inet
Provides: yast2-trans-inet y2t_inet
@@ -50,7 +51,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-inetd-2.17.0
+%setup -n yast2-inetd-2.17.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -109,6 +110,11 @@
%defattr(-,root,root)
%doc %{prefix}/share/doc/packages/yast2-inetd
%changelog
+* Wed Aug 27 2008 locilka(a)suse.cz
+- Using buil-in getenv instead of artificial simulation of it.
+- Adjusted RPM dependencies.
+- [Cancel] instead of [Abort].
+- 2.17.1
* Tue Aug 05 2008 locilka(a)suse.cz
- Adjusted to the newest default configurations.
- Package documentation has been moved into new yast2-inetd-doc.
++++++ yast2-inetd-2.17.0.tar.bz2 -> yast2-inetd-2.17.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.17.0/src/dialogs.ycp new/yast2-inetd-2.17.1/src/dialogs.ycp
--- old/yast2-inetd-2.17.0/src/dialogs.ycp 2007-05-18 10:43:14.000000000 +0200
+++ new/yast2-inetd-2.17.1/src/dialogs.ycp 2008-08-27 12:52:41.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Petr Hadraba <phadraba(a)suse.cz>
* Martin Lazar <mlazar(a)suse.cz>
*
- * $Id: dialogs.ycp 33792 2006-10-27 13:24:16Z locilka $
+ * $Id: dialogs.ycp 50401 2008-08-27 10:52:41Z locilka $
*/
{
@@ -313,7 +313,7 @@
*/
/* These special options are available, if YAST2_INETD environment variable contains `EXPERT' */
/* The `expert_inetd' command-line parameter is implemented too. */
- if((getenv("YAST2_INETD") == "EXPERT\n") || (WFM::Args()[0]:"" == "expert_inetd"))
+ if((getenv("YAST2_INETD") == "EXPERT") || (WFM::Args()[0]:"" == "expert_inetd"))
expert_contents = add(expert_contents, `menu("E&xpert tools",
[
`item(`id(`all_rev), "&Invert Status"),
@@ -391,6 +391,7 @@
Label::BackButton(), Label::FinishButton());
Wizard::HideBackButton();
+ Wizard::SetAbortButton (`cancel, Label::CancelButton());
Wizard::SetScreenShotName("inetd-5-maindialog");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.17.0/src/helps.ycp new/yast2-inetd-2.17.1/src/helps.ycp
--- old/yast2-inetd-2.17.0/src/helps.ycp 2007-05-18 10:43:14.000000000 +0200
+++ new/yast2-inetd-2.17.1/src/helps.ycp 2008-08-27 12:52:41.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Petr Hadraba <phadraba(a)suse.cz>
*
- * $Id: helps.ycp 22251 2005-03-04 07:56:43Z mlazar $
+ * $Id: helps.ycp 50401 2008-08-27 10:52:41Z locilka $
*/
{
@@ -71,9 +71,9 @@
Click <b>Create</b> and complete the form.</p>
") +
"<p><br></p>" +
- _("<p><b><big>Aborting Configuration:</big></b>
-Abort the configuration by pressing the <b>Abort</b> button.
-If you do so, all your changes will be lost and the original configuration will remain untouched.</p>
+ _("<p><b><big>Canceling Configuration:</big></b>
+Leave the configuration untouched by pressing the <b>Cancel</b> button.
+If you do so, all your changes will be lost and the original configuration will remain.</p>
"),
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.17.0/src/routines.ycp new/yast2-inetd-2.17.1/src/routines.ycp
--- old/yast2-inetd-2.17.0/src/routines.ycp 2007-05-18 10:43:14.000000000 +0200
+++ new/yast2-inetd-2.17.1/src/routines.ycp 2008-08-27 12:52:41.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Petr Hadraba <phadraba(a)suse.cz>
* Martin Lazar <mlazar(a)suse.cz>
*
- * $Id: routines.ycp 27892 2006-02-13 12:05:33Z locilka $
+ * $Id: routines.ycp 50401 2008-08-27 10:52:41Z locilka $
*/
{
@@ -390,21 +390,6 @@
}
/**
- * Get contents of environment variable.
- * @param environment name of requested variable
- * @return environment variable contents
- */
-define string getenv(string environment) ``{
- string command = sformat("echo $%1", environment);
- map result = (map) SCR::Execute(.target.bash_output, command, []);
- if(result["stdout"]:"" == "") {
- return nil;
- } else {
- return (string) (result["stdout"]:"");
- }
-}
-
-/**
* Cache for @ref IsInstalled.
*/
map is_installed_cache = $[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.17.0/VERSION new/yast2-inetd-2.17.1/VERSION
--- old/yast2-inetd-2.17.0/VERSION 2008-08-05 09:45:41.000000000 +0200
+++ new/yast2-inetd-2.17.1/VERSION 2008-08-27 12:52:34.000000000 +0200
@@ -1 +1 @@
-2.17.0
+2.17.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 yast2-core
checked in at Thu Aug 28 02:25:04 CEST 2008.
--------
--- yast2-core/yast2-core.changes 2008-08-13 16:04:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2008-08-27 12:53:04.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 27 12:13:27 CEST 2008 - locilka(a)suse.cz
+
+- Enabled getenv builtin.
+- 2.17.9
+
+-------------------------------------------------------------------
Old:
----
yast2-core-2.17.8.tar.bz2
New:
----
yast2-core-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.B29660/_old 2008-08-28 02:24:37.000000000 +0200
+++ /var/tmp/diff_new_pack.B29660/_new 2008-08-28 02:24:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.17.8)
+# spec file for package yast2-core (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-core
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.17.8.tar.bz2
+Source0: yast2-core-2.17.9.tar.bz2
Prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -95,7 +95,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-core-2.17.8
+%setup -n yast2-core-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -178,6 +178,9 @@
%doc %{_datadir}/doc/yastdoc
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
%changelog
+* Wed Aug 27 2008 locilka(a)suse.cz
+- Enabled getenv builtin.
+- 2.17.9
* Wed Aug 13 2008 aschnell(a)suse.de
- added tohexstring builtin with width parameter
- 2.17.8
++++++ yast2-core-2.17.8.tar.bz2 -> yast2-core-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/agent-modules/testsuite/tests/dir.scr new/yast2-core-2.17.9/agent-modules/testsuite/tests/dir.scr
--- old/yast2-core-2.17.8/agent-modules/testsuite/tests/dir.scr 2008-06-11 15:46:58.000000000 +0200
+++ new/yast2-core-2.17.9/agent-modules/testsuite/tests/dir.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/dir.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/agent-modules/testsuite/tests/missing.scr new/yast2-core-2.17.9/agent-modules/testsuite/tests/missing.scr
--- old/yast2-core-2.17.8/agent-modules/testsuite/tests/missing.scr 2008-06-11 15:46:46.000000000 +0200
+++ new/yast2-core-2.17.9/agent-modules/testsuite/tests/missing.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/missing.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/agent-modules/testsuite/tests/read1.scr new/yast2-core-2.17.9/agent-modules/testsuite/tests/read1.scr
--- old/yast2-core-2.17.8/agent-modules/testsuite/tests/read1.scr 2008-06-11 15:46:55.000000000 +0200
+++ new/yast2-core-2.17.9/agent-modules/testsuite/tests/read1.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/read1.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/agent-modules/testsuite/tests/write1.scr new/yast2-core-2.17.9/agent-modules/testsuite/tests/write1.scr
--- old/yast2-core-2.17.8/agent-modules/testsuite/tests/write1.scr 2008-06-11 15:46:55.000000000 +0200
+++ new/yast2-core-2.17.9/agent-modules/testsuite/tests/write1.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/write1.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/agent-modules/testsuite/tests/write2.scr new/yast2-core-2.17.9/agent-modules/testsuite/tests/write2.scr
--- old/yast2-core-2.17.8/agent-modules/testsuite/tests/write2.scr 2008-06-11 15:46:56.000000000 +0200
+++ new/yast2-core-2.17.9/agent-modules/testsuite/tests/write2.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/write2.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/agent-modules/testsuite/tests/write3.scr new/yast2-core-2.17.9/agent-modules/testsuite/tests/write3.scr
--- old/yast2-core-2.17.8/agent-modules/testsuite/tests/write3.scr 2008-06-11 15:46:57.000000000 +0200
+++ new/yast2-core-2.17.9/agent-modules/testsuite/tests/write3.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/write3.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/agents-perl/doc/ycp-pm-pod.html new/yast2-core-2.17.9/agents-perl/doc/ycp-pm-pod.html
--- old/yast2-core-2.17.8/agents-perl/doc/ycp-pm-pod.html 2008-04-13 22:31:40.000000000 +0200
+++ new/yast2-core-2.17.9/agents-perl/doc/ycp-pm-pod.html 2008-05-15 17:34:26.000000000 +0200
@@ -9,8 +9,10 @@
<body style="background-color: white">
-<p><a name="__index__"></a></p>
+
<!-- INDEX BEGIN -->
+<div name="index">
+<p><a name="__index__"></a></p>
<ul>
@@ -74,9 +76,11 @@
</ul>
</ul>
+
+<hr name="index" />
+</div>
<!-- INDEX END -->
-<hr />
<p>
</p>
<h1><a name="name">NAME</a></h1>
@@ -100,31 +104,31 @@
<p>A PerlYCPValue cannot represent a term but only a term is allowed
to initialize an agent in a .scr file. Therefore <a href="#parseterm">ParseTerm</a> is provided.</p>
<dl>
-<dt><strong><a name="item_string_2c_integer_2c_boolean">string, integer, boolean</a></strong>
+<dt><strong><a name="string_integer_boolean" class="item">string, integer, boolean</a></strong>
<dd>
<p>Stored as a scalar.</p>
</dd>
</li>
-<dt><strong><a name="item_list">list</a></strong>
+<dt><strong><a name="list" class="item">list</a></strong>
<dd>
<p>Stored as a reference to a list of PerlYCPValues.</p>
</dd>
</li>
-<dt><strong><a name="item_map">map</a></strong>
+<dt><strong><a name="map" class="item">map</a></strong>
<dd>
<p>Stored as a reference to a map of PerlYCPValues.</p>
</dd>
</li>
-<dt><strong><a name="item_path">path</a></strong>
+<dt><strong><a name="path" class="item">path</a></strong>
<dd>
-<p>Stored as a reference to a string (starting with a ``.'' as expected).</p>
+<p>Stored as a reference to a string (starting with a "." as expected).</p>
</dd>
</li>
-<dt><strong><a name="item_nil">nil (void)</a></strong>
+<dt><strong><a name="nil" class="item">nil (void)</a></strong>
<dd>
<p>Stored as an undef.</p>
@@ -141,7 +145,7 @@
<p>ParseComand $line</p>
<p><code>($command, $path, $arg) = ParseCommand ('Write (.moria.gate, "mellon")');</code></p>
<p>Parse a SCR command of the form Command (.some.path, optional_argument)</p>
-<p>Returns a three element list (``Command'', ``.some.path'', $argument)
+<p>Returns a three element list ("Command", ".some.path", $argument)
where the argument is a <a href="#perlycpvalue">PerlYCPValue</a> and will be undef
if it was not specified.
Note that the path is converted to a string.</p>
@@ -182,12 +186,12 @@
<p><code>Return (["arbitrarily", "complex", "data"]);</code></p>
<p>Sends a <a href="#perlycpvalue">PerlYCPValue</a> to the partner YCP component.</p>
<p>If there's just one argment, scalars are interpreted this way:
-``true'' or ``false'' are sent as
+"true" or "false" are sent as
booleans, integers or strings of digits are sent as integers, otherwise as
strings.
If a second argument exists and is true, all scalars are written as strings.
If a second argument exists and is false, all scalars are written as byteblocks.</p>
-<p>To send a list, call Return(\@list), not Return(@list).
+<p>To send a list, call <code>Return(\@list)</code>, not <code>Return(@list)</code>.
Similarly for a map. You can use references to anonymous lists [] and hashes {}.</p>
<p>The difference from <a href="#ycpreturn">ycpReturn</a> is that Return can return scalars directly,
strings are properly escaped if needeed and paths can be returned.</p>
@@ -200,9 +204,9 @@
and logging just works. In such case, you should not need to use ycp.pm at all.
Instead, <code>use YaST::YCP (":LOGGING")</code>.</p>
<p>The log output can now be redirected, which will be useful for test suites.
-If the first command-line option is ``-l'', the second argument is taken as
-the log file. A hyphen ``-'' designates standard output.</p>
-<p>Otherwise, <em>/var/log/YaST2/y2log</em> and <em>$HOME/.y2log</em> are tried, in that order.</p>
+If the first command-line option is "-l", the second argument is taken as
+the log file. A hyphen "-" designates standard output.</p>
+<p>Otherwise, <em class="file">/var/log/YaST2/y2log</em> and <em class="file">$HOME/.y2log</em> are tried, in that order.</p>
<p>
</p>
<h2><a name="y2debug">y2debug</a></h2>
@@ -212,7 +216,7 @@
y2error,
y2security,
y2internal</p>
-<p>Logs debug messages to <em>/var/log/YaST2/y2log</em> or <em>$HOME/.y2log</em></p>
+<p>Logs debug messages to <em class="file">/var/log/YaST2/y2log</em> or <em class="file">$HOME/.y2log</em></p>
<p>Note a <strong>semantic change</strong> in y2debug: now the environment variable
Y2DEBUG is honored so y2debug will not produce output unless this
variable is set. This is for compatibility with the logging system in libycp.</p>
@@ -227,11 +231,11 @@
<p>
</p>
<h2><a name="ycpargismap">ycpArgIsMap</a></h2>
-<p>Obsolete. Use (ref($arg) eq ``HASH'') instead.</p>
+<p>Obsolete. Use (ref($arg) eq "HASH") instead.</p>
<p>
</p>
<h2><a name="ycpargislist">ycpArgIsList</a></h2>
-<p>Obsolete. Use (ref($arg) eq ``ARRAY'') instead.</p>
+<p>Obsolete. Use (ref($arg) eq "ARRAY") instead.</p>
<p>
</p>
<h2><a name="ycpargisinteger">ycpArgIsInteger</a></h2>
@@ -247,7 +251,7 @@
<p>
</p>
<h2><a name="ycpargisnil">ycpArgIsNil</a></h2>
-<p>Obsolete. Use (ref($arg) eq ``SCALAR'' && $$arg eq ``nil'') instead.</p>
+<p>Obsolete. Use (ref($arg) eq "SCALAR" && $$arg eq "nil") instead.</p>
<p>
</p>
<h2><a name="ycpargisnone">ycpArgIsNone</a></h2>
@@ -255,23 +259,23 @@
<p>
</p>
<h2><a name="ycpcommandisdir">ycpCommandIsDir</a></h2>
-<p>Obsolete. Use ($command eq ``Dir'')</p>
+<p>Obsolete. Use ($command eq "Dir")</p>
<p>
</p>
<h2><a name="ycpcommandisread">ycpCommandIsRead</a></h2>
-<p>Obsolete. Use ($command eq ``Read'')</p>
+<p>Obsolete. Use ($command eq "Read")</p>
<p>
</p>
<h2><a name="ycpcommandiswrite">ycpCommandIsWrite</a></h2>
-<p>Obsolete. Use ($command eq ``Write'')</p>
+<p>Obsolete. Use ($command eq "Write")</p>
<p>
</p>
<h2><a name="ycpcommandisexecute">ycpCommandIsExecute</a></h2>
-<p>Obsolete. Use ($command eq ``Execute'')</p>
+<p>Obsolete. Use ($command eq "Execute")</p>
<p>
</p>
<h2><a name="ycpcommandisresult">ycpCommandIsResult</a></h2>
-<p>Obsolete. Use ($command eq ``result''), note the lowercase 'r'.</p>
+<p>Obsolete. Use ($command eq "result"), note the lowercase 'r'.</p>
<p>
</p>
<h2><a name="ycpgetcommand">ycpGetCommand</a></h2>
@@ -309,7 +313,7 @@
<p>
</p>
<h2><a name="ycpreturnskalarasboolean">ycpReturnSkalarAsBoolean</a></h2>
-<p>Obsolete. Use <a href="#return">Return</a>(``true'' or ``false'')</p>
+<p>Obsolete. Use <a href="#return">Return</a>("true" or "false")</p>
<p>
</p>
<h2><a name="ycpreturnskalarasstring">ycpReturnSkalarAsString</a></h2>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/configure new/yast2-core-2.17.9/configure
--- old/yast2-core-2.17.8/configure 2008-08-13 15:37:30.000000000 +0200
+++ new/yast2-core-2.17.9/configure 2008-08-27 12:53:28.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-core 2.17.8.
+# Generated by GNU Autoconf 2.61 for yast2-core 2.17.9.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-core'
PACKAGE_TARNAME='yast2-core'
-PACKAGE_VERSION='2.17.8'
-PACKAGE_STRING='yast2-core 2.17.8'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2-core 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1472,7 +1472,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-core 2.17.8 to adapt to many kinds of systems.
+\`configure' configures yast2-core 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1543,7 +1543,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-core 2.17.8:";;
+ short | recursive ) echo "Configuration of yast2-core 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-core configure 2.17.8
+yast2-core configure 2.17.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1674,7 +1674,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-core $as_me 2.17.8, which was
+It was created by yast2-core $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2495,7 +2495,7 @@
# Define the identity of the package.
PACKAGE='yast2-core'
- VERSION='2.17.8'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2723,7 +2723,7 @@
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
@@ -24383,7 +24383,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-core $as_me 2.17.8, which was
+This file was extended by yast2-core $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24436,7 +24436,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-core config.status 2.17.8
+yast2-core 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-core-2.17.8/configure.in new/yast2-core-2.17.9/configure.in
--- old/yast2-core-2.17.8/configure.in 2008-08-13 15:37:15.000000000 +0200
+++ new/yast2-core-2.17.9/configure.in 2008-08-27 12:53:20.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.17.8, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.17.9, http://bugs.opensuse.org/, yast2-core)
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.8"
+VERSION="2.17.9"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/libycp/src/YCPBuiltinMisc.cc new/yast2-core-2.17.9/libycp/src/YCPBuiltinMisc.cc
--- old/yast2-core-2.17.8/libycp/src/YCPBuiltinMisc.cc 2008-07-30 11:14:33.000000000 +0200
+++ new/yast2-core-2.17.9/libycp/src/YCPBuiltinMisc.cc 2008-08-27 12:12:30.000000000 +0200
@@ -216,13 +216,11 @@
}
-
-#if 0
static YCPString
Getenv (const YCPString & name)
{
/**
- * @bu iltin getenv
+ * @builtin getenv
* @short Change or add an environment variable
* @description
* The getenv(variable) function returns the value of variable from
@@ -231,7 +229,8 @@
*
* @param string name
* @return string value
- * @usage getenv("name")
+ * @usage getenv ("USER") -> "root"
+ * @usage getenv ("LC_CTYPE") -> "en_US.UTF-8"
*/
char *value = getenv(name->value().c_str());
@@ -241,9 +240,8 @@
} else {
return YCPNull();
}
-
}
-#endif
+
static YCPValue
Eval (const YCPValue & v)
@@ -625,7 +623,7 @@
{ "random", "integer (integer)", (void *)Random },
{ "setenv", "boolean (string,string)", (void *)Setenv1 },
{ "setenv", "boolean (string,string,boolean)", (void *)Setenv2 },
- //{ "getenv", "string (string)", (void *)Getenv }, //function exist in other module
+ { "getenv", "string (string)", (void *)Getenv },
{ "srandom", "integer ()", (void *)Srandom1 },
{ "srandom", "void (integer)", (void *)Srandom2 },
{ "eval", "flex (block <flex>)", (void *)Eval, DECL_NIL|DECL_FLEX },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.17.8/VERSION new/yast2-core-2.17.9/VERSION
--- old/yast2-core-2.17.8/VERSION 2008-08-13 15:10:43.000000000 +0200
+++ new/yast2-core-2.17.9/VERSION 2008-08-27 12:52:55.000000000 +0200
@@ -1 +1 @@
-2.17.8
+2.17.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 trousers
checked in at Thu Aug 28 02:24:15 CEST 2008.
--------
--- trousers/trousers.changes 2008-04-15 15:08:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/trousers/trousers.changes 2008-08-27 12:18:46.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Aug 22 13:28:38 CEST 2008 - meissner(a)suse.de
+
+- upgraded to 0.3.1
+ - TPM 1.2 support throughout the code, see ChangeLog
+ - lots of new features
+ - lots of bugfixes
+- dropped secondary TPM support patches. is either already
+ upstream (differently), or will be.
+
+-------------------------------------------------------------------
Old:
----
trousers-0.2.9.1.tar.bz2
trousers_0.2.9-tpm_1.2_dual_v20070206_changelog.txt
trousers_0.2.9-tpm_1.2_dual_v20070206.patch
trousers_0.2.9-tpm_1.2_dual_v20070206_tpm1.2-readme.txt
trousers-limits.patch
New:
----
trousers-0.3.1.tar.bz2
trousers-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trousers.spec ++++++
--- /var/tmp/diff_new_pack.B27746/_old 2008-08-28 02:23:56.000000000 +0200
+++ /var/tmp/diff_new_pack.B27746/_new 2008-08-28 02:23:56.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package trousers (Version 0.2.9.1)
+# spec file for package trousers (Version 0.3.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -16,16 +23,13 @@
License: Other uncritical OpenSource License
Group: Productivity/Security
AutoReqProv: on
-Version: 0.2.9.1
-Release: 7
+Version: 0.3.1
+Release: 1
Summary: TSS (TCG Software Stack) access daemon for a TPM chip
Source0: %name-%version.tar.bz2
Source1: tcsd.init
-Source2: trousers_0.2.9-tpm_1.2_dual_v20070206_changelog.txt
-Source3: trousers_0.2.9-tpm_1.2_dual_v20070206_tpm1.2-readme.txt
-Patch0: %name-%version.diff
-Patch1: trousers_0.2.9-tpm_1.2_dual_v20070206.patch
-Patch2: trousers-limits.patch
+Patch0: %name-0.2.9.1.diff
+Patch1: %name-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %install_info_prereq pwdutils
@@ -56,6 +60,7 @@
AutoReqProv: on
Summary: TSS (TCG Software Stack) access daemon for a TPM chip
Requires: trousers = %version libtspi1 = %version
+Requires: libopenssl-devel glibc-devel
%description devel
The trousers package provides a TSS implementation through the help of
@@ -109,9 +114,8 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p0
-%patch2
-cp %{S:1} %{S:2} %{S:3} .
+%patch1
+cp %{S:1} .
%build
CC=gcc
@@ -161,8 +165,6 @@
%defattr(-,root,root)
%config(noreplace) %attr(600,tss,tss) /etc/tcsd.conf
%doc README AUTHORS ChangeLog LICENSE NICETOHAVES TODO doc/*
-%doc trousers_0.2.9-tpm_1.2_dual_v20070206_changelog.txt
-%doc trousers_0.2.9-tpm_1.2_dual_v20070206_tpm1.2-readme.txt
%{_mandir}/man5/*
%{_mandir}/man8/*
/var/lib/tpm
@@ -183,6 +185,13 @@
/usr/%{_lib}/*.so.*
%changelog
+* Fri Aug 22 2008 meissner(a)suse.de
+- upgraded to 0.3.1
+ - TPM 1.2 support throughout the code, see ChangeLog
+ - lots of new features
+ - lots of bugfixes
+- dropped secondary TPM support patches. is either already
+ upstream (differently), or will be.
* Tue Apr 15 2008 ro(a)suse.de
- added baselibs.conf file for multilib support
* Tue Apr 15 2008 meissner(a)suse.de
++++++ trousers-0.2.9.1.tar.bz2 -> trousers-0.3.1.tar.bz2 ++++++
++++ 181921 lines of diff (skipped)
++++++ trousers-fixes.diff ++++++
--- src/include/obj_context.h
+++ src/include/obj_context.h
@@ -76,7 +76,7 @@
TSS_RESULT obj_context_get_loadkey_ordinal(TSS_HCONTEXT, TPM_COMMAND_CODE *);
void obj_context_close(TSS_HCONTEXT);
-struct tcs_api_table *obj_context_get_tcs_api();
+struct tcs_api_table *obj_context_get_tcs_api(TSS_HCONTEXT tspContext);
#define TCS_API(c) obj_context_get_tcs_api(c)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 tftp
checked in at Thu Aug 28 02:23:40 CEST 2008.
--------
--- tftp/tftp.changes 2008-08-06 16:05:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/tftp/tftp.changes 2008-08-27 16:48:26.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 27 16:20:32 CEST 2008 - olh(a)suse.de
+
+- do not require autoconf 2.61
+ binutils-devel is not available in 11.0 or earlier
+
+-------------------------------------------------------------------
New:
----
tftp-hpa-0.43_old-autoconf.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tftp.spec ++++++
--- /var/tmp/diff_new_pack.h24596/_old 2008-08-28 02:23:07.000000000 +0200
+++ /var/tmp/diff_new_pack.h24596/_new 2008-08-28 02:23:08.000000000 +0200
@@ -19,14 +19,17 @@
Name: tftp
-BuildRequires: binutils-devel libedit-devel tcpd-devel
+%if 0%{?suse_version} > 1110
+BuildRequires: binutils-devel
+%endif
+BuildRequires: libedit-devel tcpd-devel
Url: http://www.kernel.org/pub/software/network/tftp/
License: BSD 3-Clause
Group: Productivity/Networking/Ftp/Clients
Requires: inet-daemon netcfg
AutoReqProv: on
Version: 0.48
-Release: 90
+Release: 98
Summary: Trivial File Transfer Protocol (TFTP)
Source: tftp-hpa-git-%{version}.tar.bz2
Source1: tftp.xinetd
@@ -34,6 +37,7 @@
Patch1: tftp-hpa-0.46_colon_check.patch
Patch2: tftp-hpa-0.43_readline.diff
Patch3: tftp-hpa-0.46_libedit.patch
+Patch42: tftp-hpa-0.43_old-autoconf.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -53,6 +57,9 @@
%patch1
%patch2
%patch3
+%if 0%{?suse_version} < 1030
+%patch42
+%endif
%build
%{__make}
@@ -75,6 +82,9 @@
%config(noreplace) /etc/xinetd.d/tftp
%changelog
+* Wed Aug 27 2008 olh(a)suse.de
+- do not require autoconf 2.61
+ binutils-devel is not available in 11.0 or earlier
* Wed Aug 06 2008 kkeil(a)suse.de
- Update to current git version with enhanced IPv6 support included
* Fri Jul 18 2008 kkeil(a)suse.de
++++++ tftp-hpa-0.43_old-autoconf.diff ++++++
openSuSE 10.3 shipped with autoconf 2.61
openSuSE 10.1 shipped with autoconf 2.60
openSuSE 9.1 shipped with autoconf 2.59
---
configure.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- configure.in.orig
+++ configure.in
@@ -2,11 +2,10 @@ dnl
dnl autoconf input file to generate MCONFIG
dnl
-AC_PREREQ(2.61)
+AC_PREREQ(2.42)
AC_INIT(MCONFIG.in)
AC_PREFIX_DEFAULT(/usr)
-AC_USE_SYSTEM_EXTENSIONS
AC_ISC_POSIX
AC_PROG_CC
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 swfdec-mozilla
checked in at Thu Aug 28 02:23:09 CEST 2008.
--------
--- swfdec-mozilla/swfdec-mozilla.changes 2008-08-23 09:49:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/swfdec-mozilla/swfdec-mozilla.changes 2008-08-27 12:21:10.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 27 12:21:00 CEST 2008 - meissner(a)suse.de
+
+- removed unneeded mozilla-xulrunner181 from BuildRequires
+ (part of bnc#420641) (from wolfgang)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swfdec-mozilla.spec ++++++
--- /var/tmp/diff_new_pack.V24005/_old 2008-08-28 02:22:57.000000000 +0200
+++ /var/tmp/diff_new_pack.V24005/_new 2008-08-28 02:22:57.000000000 +0200
@@ -20,7 +20,7 @@
Name: swfdec-mozilla
Url: http://swfdec.freedesktop.org/
-BuildRequires: alsa-devel gtk2-devel liboil-devel mozilla-xulrunner181-devel pkg-config swfdec-devel
+BuildRequires: alsa-devel gtk2-devel liboil-devel pkg-config swfdec-devel
# Prevent "have choice for swfdec: swfdec swfdec-orig":
BuildRequires: swfdec
License: LGPL v2.1 or later
@@ -28,7 +28,7 @@
AutoReqProv: on
Summary: Browser plugin for swfdec
Version: 0.7.4
-Release: 1
+Release: 6
Source0: http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/%name-%version.ta…
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -71,6 +71,9 @@
/usr/share/icons/hicolor/scalable/apps/swfdec-mozilla.svg
%changelog
+* Wed Aug 27 2008 meissner(a)suse.de
+- removed unneeded mozilla-xulrunner181 from BuildRequires
+ (part of bnc#420641) (from wolfgang)
* Sat Aug 23 2008 meissner(a)suse.de
- Upgraded to 0.7.4 ("Whites won again")
- adjusted to 0.7.4 swfdec release
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 isns
checked in at Thu Aug 28 02:22:47 CEST 2008.
--------
--- isns/isns.changes 2007-09-18 21:52:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/isns/isns.changes 2008-08-28 01:37:36.892396000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 28 01:37:33 CEST 2008 - ro(a)suse.de
+
+- fix init script
+
+-------------------------------------------------------------------
New:
----
isns-init.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ isns.spec ++++++
--- /var/tmp/diff_new_pack.g22909/_old 2008-08-28 02:22:37.000000000 +0200
+++ /var/tmp/diff_new_pack.g22909/_new 2008-08-28 02:22:37.000000000 +0200
@@ -1,15 +1,23 @@
#
# spec file for package isns (Version 2.1.02)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: isns
Url: http://sourceforge.net/projects/linuxisns/
License: BSD 3-Clause
@@ -18,12 +26,13 @@
AutoReqProv: on
BuildRequires: gdbm-devel
Version: 2.1.02
-Release: 1
+Release: 56
Provides: linux-isns
%define iscsi_release 01
Summary: Internet Storage Naming Service
Source: %{name}-2.1-02.tar.bz2
Source1: %{name}.services
+Patch: isns-init.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -34,6 +43,7 @@
%prep
%setup -n %{name}-2.1-02
+%patch
%build
%{__make} OPTFLAGS="${RPM_OPT_FLAGS}" -C isnsclient
@@ -64,30 +74,32 @@
%attr(644,root,root)/etc/sysconfig/SuSEfirewall2.d/services/isns
%changelog
-* Tue Sep 18 2007 - wrwhitehead(a)novell.com
+* Thu Aug 28 2008 ro(a)suse.de
+- fix init script
+* Tue Sep 18 2007 wrwhitehead(a)novell.com
- Fixed bug 326133 - incorrect return of iSCSI node index when doing
a node domain discovery query.
-* Tue Aug 28 2007 - wrwhitehead(a)novell.com
+* Tue Aug 28 2007 wrwhitehead(a)novell.com
- Updated to newer version of isns which fixes tcp buffer overun,
portal groups, and improved client speed
-* Wed Apr 04 2007 - hare(a)suse.de
+* Wed Apr 04 2007 hare(a)suse.de
- Added service definition for SUSEFirewall2 (#254456)
-* Sat Mar 31 2007 - agraf(a)suse.de
+* Sat Mar 31 2007 agraf(a)suse.de
- Add build requirement for gdbm-devel
- Remove binaries from source tar
-* Fri Mar 30 2007 - wrwhitehead(a)novell.com
+* Sat Mar 31 2007 wrwhitehead(a)novell.com
- Update to version 2.0-04 - Fixed defect 257976 - Was not searching
all Discovery Domains
-* Thu Mar 15 2007 - wrwhitehead(a)novell.com
+* Fri Mar 16 2007 wrwhitehead(a)novell.com
- Update to version 2.0-04 - add socket timeout (comm.c). This fixes
the defects against the isnsadm from hanging when invalid ip address
-* Wed Feb 07 2007 - wrwhitehead(a)novell.com
+* Thu Feb 08 2007 wrwhitehead(a)novell.com
- Update to version 2.0-03 - adds the new isnsadm
-* Wed Jan 17 2007 - wrwhitehead(a)novell.com
+* Thu Jan 18 2007 wrwhitehead(a)novell.com
- Update to version 2.0.02 - which fixes the script files
-* Fri Jan 12 2007 - wrwhitehead(a)novell.com
+* Fri Jan 12 2007 wrwhitehead(a)novell.com
- Submit isns 2.0, significant upgrades to 1.5 from initial checkin
-* Thu Jan 11 2007 - ihno(a)suse.de
+* Thu Jan 11 2007 ihno(a)suse.de
- Fate ID is 300651 and 233
-* Fri Dec 08 2006 - wrwhitehead(a)novell.com
+* Sat Dec 09 2006 wrwhitehead(a)novell.com
- Initial Checkin of isns
++++++ isns-init.diff ++++++
--- isnsserver/etc/initd.suse
+++ isnsserver/etc/initd.suse
@@ -6,7 +6,7 @@
# Provides: isns
# Required-Start: $network
# Should-Start:
-# Required-Stop:
+# Required-Stop: $network
# Should-Stop:
# Default-Start: 3 5
# Default-Stop:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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