February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit kdebase4 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Thu Feb 25 02:28:54 CET 2010. -------- --- KDE/kdebase4/kdebase4.changes 2010-02-04 11:39:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2010-02-10 16:01:57.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 10 15:01:47 UTC 2010 - llunak(a)novell.com + +- add kwebkitpart-devel buildrequires + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.JxrQaB/_old 2010-02-25 02:22:15.000000000 +0100 +++ /var/tmp/diff_new_pack.JxrQaB/_new 2010-02-25 02:22:15.000000000 +0100 @@ -20,7 +20,7 @@ Name: kdebase4 BuildRequires: NetworkManager-devel bluez-devel libkde4-devel libqimageblitz-devel libraw1394-devel BuildRequires: libkde4-devel libsmbclient-devel libsoprano-devel libxklavier-devel xine-devel -BuildRequires: soprano-backend-redland +BuildRequires: kwebkitpart-devel soprano-backend-redland %if %suse_version > 1020 BuildRequires: fdupes libusb-devel %else @@ -34,7 +34,7 @@ Summary: The Base KDE Apps Url: http://www.kde.org/ Version: 4.4.0 -Release: 1 +Release: 2 Source0: kdebase-%version.tar.bz2 Source1: baselibs.conf Source2: rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit kbluetooth for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package kbluetooth for openSUSE:Factory checked in at Thu Feb 25 02:28:48 CET 2010. -------- --- KDE/kbluetooth/kbluetooth.changes 2010-02-03 09:34:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/kbluetooth/kbluetooth.changes 2010-02-22 20:07:21.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 22 19:04:30 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 0.4.2 + * Fix speed calculation when receiving and sending filesI + * Pairing request are accepted also when clicking on Trust button + * Important dialogs are modal, so they’re not hidden by other + applications + * Fix a crash that happens when the sender device disconnects + before the file transfer is accepted + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kbluetooth-0.4.tar.bz2 New: ---- kbluetooth-0.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbluetooth.spec ++++++ --- /var/tmp/diff_new_pack.C9fVsJ/_old 2010-02-25 02:21:58.000000000 +0100 +++ /var/tmp/diff_new_pack.C9fVsJ/_new 2010-02-25 02:21:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kbluetooth (Version 0.4) +# spec file for package kbluetooth (Version 0.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,10 +24,10 @@ Group: System/GUI/KDE Summary: The bluetooth framework for KDE4 Url: http://www.kde-apps.org/content/show.php/kbluetooth?content=112110 -Version: 0.4 +Version: 0.4.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: kbluetooth-0.4.tar.bz2 +Source0: kbluetooth-%{version}.tar.bz2 Requires: obex-data-server kdebase4-workspace >= 4.1.96 Requires: bluez >= 4 Requires: obex-data-server >= 0.4 @@ -63,7 +63,7 @@ Tom Patzig <tpatzig(a)suse.de> %prep -%setup -q -n kbluetooth-0.4 +%setup -q -n kbluetooth-%{version} %patch0 -p1 %build ++++++ kbluetooth-0.4.tar.bz2 -> kbluetooth-0.4.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/agent/agent.cpp new/kbluetooth-0.4.2/src/agent/agent.cpp --- old/kbluetooth-0.4/src/agent/agent.cpp 2010-02-01 21:37:39.000000000 +0100 +++ new/kbluetooth-0.4.2/src/agent/agent.cpp 2010-02-21 23:21:47.000000000 +0100 @@ -69,6 +69,7 @@ int ret; currentDialog = dialog; + currentDialog->setModal(true); ret = currentDialog->exec(); currentDialog = 0; @@ -93,8 +94,7 @@ return; } case(1): { - QDBusMessage error = msg.createErrorReply("org.bluez.Error.Rejected", "Authorization rejected"); - QDBusConnection::systemBus().send(error); + //No error no anything means OK, and this case is for the Trust button return; } case(0): { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/obexserver/obexserversession.cpp new/kbluetooth-0.4.2/src/obexserver/obexserversession.cpp --- old/kbluetooth-0.4/src/obexserver/obexserversession.cpp 2010-02-01 21:37:38.000000000 +0100 +++ new/kbluetooth-0.4.2/src/obexserver/obexserversession.cpp 2010-02-21 23:21:47.000000000 +0100 @@ -53,6 +53,7 @@ ObexServerSession::~ObexServerSession() { delete manager; + delete fileTransfer; } void ObexServerSession::accept() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/obexserver/obexserversessionfiletransfer.cpp new/kbluetooth-0.4.2/src/obexserver/obexserversessionfiletransfer.cpp --- old/kbluetooth-0.4/src/obexserver/obexserversessionfiletransfer.cpp 2010-02-01 21:37:38.000000000 +0100 +++ new/kbluetooth-0.4.2/src/obexserver/obexserversessionfiletransfer.cpp 2010-02-21 23:21:47.000000000 +0100 @@ -31,6 +31,7 @@ ObexServerSessionFileTransfer::ObexServerSessionFileTransfer(ObexServerSession* serverSession, QDBusInterface* session, const QString& filename, const QString& path, qulonglong size) { + setAutoDelete(false); m_serverSession = serverSession; m_dbusSession = session; m_fileName = filename; @@ -76,15 +77,24 @@ setTotalAmount(Bytes, m_totalFileSize); setProcessedAmount(Bytes, 0); m_dbusSession->call("Accept"); + m_time = QTime::currentTime(); + m_procesedBytes = 0; } void ObexServerSessionFileTransfer::slotTransferProgress(qulonglong transferred) { - kDebug() << "Transfer progress ..."; - ulong currentPercent = percent(); + kDebug() << "Transfer progress ..." << transferred; + + QTime currentTime = QTime::currentTime(); + int time = m_time.secsTo(currentTime); + if (time != 0) { + qulonglong diffBytes = transferred - m_procesedBytes; + float speed = diffBytes / time; + kDebug() << "Bytes: " << diffBytes << " Speed: " << speed; + emitSpeed(speed); + m_time = currentTime; + m_procesedBytes = transferred; + } setProcessedAmount(Bytes, transferred); - ulong newPercent = percent(); - double unit = m_totalFileSize / 100.0; - emitSpeed(newPercent*unit - currentPercent*unit); } void ObexServerSessionFileTransfer::slotTransferCompleted() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/obexserver/obexserversessionfiletransfer.h new/kbluetooth-0.4.2/src/obexserver/obexserversessionfiletransfer.h --- old/kbluetooth-0.4/src/obexserver/obexserversessionfiletransfer.h 2010-02-01 21:37:38.000000000 +0100 +++ new/kbluetooth-0.4.2/src/obexserver/obexserversessionfiletransfer.h 2010-02-21 23:21:47.000000000 +0100 @@ -61,6 +61,8 @@ QString m_remoteName; QString m_remoteAddr; Solid::Control::BluetoothRemoteDevice bluetoothDevice; + QTime m_time; + qlonglong m_procesedBytes; }; #endif // OBEXSERVERSESSIONFILETRANSFER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/obexsession/obexsession.cpp new/kbluetooth-0.4.2/src/obexsession/obexsession.cpp --- old/kbluetooth-0.4/src/obexsession/obexsession.cpp 2010-02-01 21:37:39.000000000 +0100 +++ new/kbluetooth-0.4.2/src/obexsession/obexsession.cpp 2010-02-21 23:21:48.000000000 +0100 @@ -111,7 +111,9 @@ void ObexSession::disconnect() { + kDebug() << "CAlling disconnect"; session->call("Disconnect"); + session->call("Close"); } void ObexSession::close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/obexsession/obexsessionfiletransfer.cpp new/kbluetooth-0.4.2/src/obexsession/obexsessionfiletransfer.cpp --- old/kbluetooth-0.4/src/obexsession/obexsessionfiletransfer.cpp 2010-02-01 21:37:39.000000000 +0100 +++ new/kbluetooth-0.4.2/src/obexsession/obexsessionfiletransfer.cpp 2010-02-21 23:21:48.000000000 +0100 @@ -71,15 +71,24 @@ setTotalAmount(Bytes, totalSize); m_totalFileSize = totalSize; setProcessedAmount(Bytes, 0); + m_time = QTime::currentTime(); + m_procesedBytes = 0; } void ObexSessionFileTransfer::slotTransferProgress(qulonglong transferred) { - kDebug() << "Transfer progress ..."; - ulong currentPercent = percent(); + kDebug() << "Transfer progress ..." << transferred; + + QTime currentTime = QTime::currentTime(); + int time = m_time.secsTo(currentTime); + if (time != 0) { + qulonglong diffBytes = transferred - m_procesedBytes; + float speed = diffBytes / time; + kDebug() << "Bytes: " << diffBytes << " Speed: " << speed; + emitSpeed(speed); + m_time = currentTime; + m_procesedBytes = transferred; + } setProcessedAmount(Bytes, transferred); - ulong newPercent = percent(); - double unit = m_totalFileSize / 100.0; - emitSpeed(newPercent*unit - currentPercent*unit); } void ObexSessionFileTransfer::slotTransferCompleted() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/obexsession/obexsessionfiletransfer.h new/kbluetooth-0.4.2/src/obexsession/obexsessionfiletransfer.h --- old/kbluetooth-0.4/src/obexsession/obexsessionfiletransfer.h 2010-02-01 21:37:39.000000000 +0100 +++ new/kbluetooth-0.4.2/src/obexsession/obexsessionfiletransfer.h 2010-02-21 23:21:48.000000000 +0100 @@ -21,6 +21,7 @@ #define OBEXSESSIONFILETRANSFER_H #include <KJob> +#include <QDate> class ObexSession; class QDBusInterface; @@ -48,5 +49,7 @@ QDBusInterface* m_dbusSession; QString m_localPath; qulonglong m_totalFileSize; + QTime m_time; + qlonglong m_procesedBytes; }; #endif // OBEXSESSIONFILETRANSFER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbluetooth-0.4/src/trayicon.cpp new/kbluetooth-0.4.2/src/trayicon.cpp --- old/kbluetooth-0.4/src/trayicon.cpp 2010-02-01 21:37:39.000000000 +0100 +++ new/kbluetooth-0.4.2/src/trayicon.cpp 2010-02-21 23:21:49.000000000 +0100 @@ -73,7 +73,7 @@ m_kBlueLock = 0; m_wallet = 0; modes << "Off" << "Discoverable" << "Connectable" ; - + setParent(kapp); setIconByName("kbluetooth"); setToolTip("kbluetooth", "KBluetooth", "KDE bluetooth framework"); @@ -132,18 +132,18 @@ server->close(); delete server; } - + if(serversession) { serversession->cancel(); serversession->disconnect(); delete serversession; } - + delete confGroup; delete config; - + delete m_kBlueLock; - + delete m_aboutDialog; qDebug() << "bye bye"; } @@ -250,7 +250,7 @@ agent->setExitOnRelease(false); updateTooltip(); - + sendToAction->setEnabled(true); wizardAction->setEnabled(true); adapterAction->setEnabled(true); @@ -316,32 +316,32 @@ } void KBlueTray::updateTooltip() { - kDebug() << "Updating Tooltip"; + kDebug() << "Updating Tooltip"; if(!online) { toolTipInfo = i18n("No Bluetooth Adapter"); return; } - if(!adapter || !server ) + if(!adapter || !server ) return; - - + + toolTipInfo = "Name: " + adapter->name() + " " \ + "Address: " + adapter->address() + " " \ + "KBlueLock: "; if (!kblueLockEnabled) - toolTipInfo += "Disabled"; + toolTipInfo += "Disabled"; else toolTipInfo += ("Enabled for " + lockDeviceName); - + toolTipInfo += " Receiving Files: "; if(server) { toolTipInfo += ((server->isStarted()) ? "Enabled" : "Disabled"); } else { toolTipInfo += "Disabled"; } - + //tray->setToolTip(toolTipInfo); } @@ -383,7 +383,7 @@ m_aboutDialog = new KAboutApplicationDialog(KGlobal::mainComponent().aboutData()); m_aboutDialog->exec(); } - + if(m_aboutDialog->isVisible()){ m_aboutDialog->raise(); }else{ @@ -507,7 +507,7 @@ obexSessionReady(); }else{ kDebug() << "Calling disconnect"; - connect(session,SIGNAL(disconnected()),this,SLOT(fileTransferFinal())); + connect(session,SIGNAL(closed()),this,SLOT(fileTransferFinal())); session->disconnect(); } } @@ -583,18 +583,18 @@ { m_kBlueLock->disable(); kDebug() << "Periodic Discovery Stopped"; - + m_kBlueLock = new KBlueLock(adapter); m_kBlueLock->unlockEnable(true); lockSelector = new DeviceSel(this,QString("computer,phone").split(',')); lockSelector->setOkButtonText("Select"); lockSelector->setInfoLabel(i18n("Selecting a device enables KBlueLock (a balloon message will pop up from the tray when your target device is found and KBlueLock is ready).\nIf the device disappears, your screen will be locked.")); - + connect(lockSelector, SIGNAL(deviceSelected(QString)), m_kBlueLock, SLOT(enable(QString))); connect(lockSelector,SIGNAL(selectorCancelled()),this,SLOT(slotBlueSelectorCancelled())); connect(lockSelector, SIGNAL(unlockChanged(bool)), m_kBlueLock, SLOT(unlockEnable(bool))); - + connect(m_kBlueLock, SIGNAL(lockEnabled()), this, SLOT(lockEnabled())); connect(m_kBlueLock, SIGNAL(lockDisabled()), this, SLOT(lockDisabled())); connect(m_kBlueLock, SIGNAL(lockReady()), this, SLOT(lockReady())); @@ -631,6 +631,7 @@ dialog->setCaption(i18n("Received files directory:")); dialog->setButtons(KDialog::Ok | KDialog::Cancel); dialog->setMinimumWidth(430); + dialog->setModal(true); int response = dialog->exec(); QString saveUrl = urlR->url().path(); @@ -640,7 +641,7 @@ config->group("ObexServer").sync(); } delete dialog; - + } void KBlueTray::openObexError() { @@ -774,6 +775,9 @@ fileTransfer->setLocalPath(saveUrl); } kDebug() << "transfer started"; + if (!fileTransfer) { + return; + } #ifdef HAVE_NEPOMUK connect(fileTransfer, SIGNAL( result(KJob*) ), this, SLOT( slotFileReceiveComplete(KJob*) )); #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit k3b for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at Thu Feb 25 02:21:53 CET 2010. -------- --- KDE/k3b/k3b.changes 2009-11-28 20:38:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/k3b/k3b.changes 2010-02-10 13:14:12.000000000 +0100 @@ -1,0 +2,49 @@ +Tue Feb 9 16:37:40 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 1.70 (2.0 Beta 1) + Changes: + * Added Blu-ray support + * Added "Options" button to file browser toolbar with view options menu + (e.g. "Show Hidden Files") (bko#196992) + * Image and project files can be opened directly from K3b file browser + * Using Oxygen icons (many thanks for Oxygen Team!) + + Bugfixes: + * Fixed visual glitch when panes are in "locked" state. + Patch by Craig Drummond <craig(a)kde.org> + * Fixed hang up when "Create Image" option is checked (bko#217301) + * "Hide main window while writing" option is working again + * "Show OSD progress" option is working again + * Improved message when ISO with incorrect size is detected (bko#216812) + * Improved consistency: K3b now uses system-wide + Positive/Neutral/Negative colors where possible instead of + hard-coded green/yellow/red + * Fixed incorrect default value "4gb." in "Custom Size" dialog (bko#215539) + * Fixed usability issues with project size menu: + "Custom..." and "From Medium..." menu entries are non-checkable now (bko#215539) + * Show correct message at the end of CD-RW erasing (bko#207972) + * Fixed issue with too small configuration dialog for external encoder (bko#218613) + * Track number is now stored in ripped MP3 files when using lame (bko#218614) + * "Defaults" button in encoder configuration dialogs are working now + * Fixed usability problems of audio project list + * Fixed linking error on Windows + * Fixed crash during verification process (bko#219962) + * Fixed crash in external encoder plug-in + * Brought back SOX encoder configuration dialog + * Fixed checking free space in temporary folder + * Fixed videodvd:/ KIO slave + * Fixed hang-up for mixed projects after reloading medium for verification + * Converting audio tracks from audio project is working again + * Fixed burning bootable discs + * Custom widgets are now properly rendered for Right-to-Left languages + * Progress bar in image writing dialog is shown again + * Fixed crash while analysing invalid medium (bko#223362) + * Acquire lock also on storage interface. This prevents HAL from + polling medium during burning which might disrupt burning process. + * Fixed bug in external programs detection (bko#221638) + * Improved usability: don't show popups when clicking on DVD, VCD or + audio discs. Added appriopriate actions on toolbars instead. + * Fixed crash while analysing invalid medium (bko#195436) + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- k3b-1.69.0alpha4.tar.bz2 New: ---- k3b-1.70.0beta1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.JAonje/_old 2010-02-25 02:21:41.000000000 +0100 +++ /var/tmp/diff_new_pack.JAonje/_new 2010-02-25 02:21:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package k3b (Version 1.69.0) +# spec file for package k3b (Version 1.70.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -41,11 +41,11 @@ Group: Productivity/Multimedia/CD/Record Summary: A Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools -Version: 1.69.0 +Version: 1.70.0 Release: 1 %define rversion %version # svn.kde.org/home/kde/trunk/extragear/multimedia/k3b -Source0: k3b-1.69.0alpha4.tar.bz2 +Source0: k3b-1.70.0beta1.tar.bz2 Source1: k3b-translation.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -110,6 +110,8 @@ %find_lang libk3b k3b.lang %find_lang libk3bdevice k3b.lang %find_lang kio_videodvd k3b.lang + mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps + cp $RPM_BUILD_ROOT/usr/share/kde4/apps/k3b/icons/oxygen/scalable/apps/k3b.svgz $RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps/k3b.svgz %post -p /sbin/ldconfig @@ -126,10 +128,9 @@ /usr/%_lib/kde4/k3b*.so /usr/%_lib/kde4/kcm_k3b*.so /usr/%_lib/kde4/kio_videodvd.so -/usr/%_lib/libk3b.so.* +/usr/%_lib/libk3blib.so.* /usr/%_lib/libk3bdevice.so.* /usr/share/applications/kde4/k3b.desktop -/usr/share/icons/hicolor/*/apps/k3b.* /usr/share/kde4/apps/k3b /usr/share/kde4/apps/konqsidebartng/virtual_folders/services/videodvd.desktop /usr/share/kde4/services/ServiceMenus/k3b_* @@ -142,6 +143,7 @@ %dir /usr/share/kde4/apps/solid/actions /usr/share/kde4/apps/solid/actions/k3b_*.desktop /usr/share/mime/packages/x-k3b.xml +/usr/share/icons/hicolor/scalable/apps/k3b.svgz %if %suse_version < 1120 # work-around bnc#457911 %dir /usr/share/doc/kde/HTML/* @@ -152,7 +154,7 @@ %files devel %defattr(-,root,root) /usr/include/k3b* -/usr/%_lib/libk3b.so +/usr/%_lib/libk3blib.so /usr/%_lib/libk3bdevice.so %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit gv for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package gv for openSUSE:Factory checked in at Thu Feb 25 02:21:48 CET 2010. -------- --- gv/gv.changes 2008-03-28 11:49:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/gv/gv.changes 2010-02-24 15:24:17.000000000 +0100 @@ -1 +1,21 @@ -------------------------------------------------------------------- +--------------------------------------------------------------- +Wed Feb 24 15:18:22 CET 2010 - werner(a)suse.de + +- Update to gv 3.6.8 + * Various fixes + + DSC parser now respects the level of BeginDocument/EndDocument + + Possible segfault has been fixed + + Fixed bug #21239: Vlist.c produces garbage if International is set + + Fixed bug #21740: popup windows may partly invisible as not on the screen + + The escape key is now working in more contexts + + The filename can optionally be shown insted of the title + + Fixed bug #23199: No error message for errors in opened file + + Got rid of non-free code. + * New feartures + +--------------------------------------------------------------- +Wed Feb 24 14:45:32 CET 2010 - werner(a)suse.de + +- Ensure that button and titles are reset to its default values (bnc#582290) + +--------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gv-3.6.3-I18N-mb.patch gv-3.6.3-bzip2.patch gv-3.6.3-deb.patch gv-3.6.3-intptr_t.patch gv-3.6.3-security.patch gv-3.6.3.dif gv-3.6.3.tar.bz2 New: ---- gv-3.6.8-I18N-mb.patch gv-3.6.8.dif gv-3.6.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gv.spec ++++++ --- /var/tmp/diff_new_pack.5Cgo8T/_old 2010-02-25 02:21:34.000000000 +0100 +++ /var/tmp/diff_new_pack.5Cgo8T/_new 2010-02-25 02:21:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gv (Version 3.6.3) +# spec file for package gv (Version 3.6.8) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -28,7 +28,7 @@ %if %suse_version < 1100 BuildRequires: desktop-data-SuSE %endif -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Publishing/PS PreReq: %install_info_prereq Requires: ghostscript_x11 @@ -39,21 +39,17 @@ AutoReqProv: on Url: http://www.gnu.org/software/gv/ Summary: A Program to View PostScript Files -Version: 3.6.3 -Release: 53 -Source0: gv-3.6.3.tar.bz2 +Version: 3.6.8 +Release: 1 +Source0: gv-3.6.8.tar.bz2 Source1: gv.desktop Source2: gv.png -Patch0: gv-3.6.3-deb.patch -Patch1: gv-3.6.3.dif -Patch2: gv-3.6.3-security.patch -Patch3: gv-3.6.3-bzip2.patch +Patch1: gv-3.6.8.dif # I18N patch originally from: # http://www.on.cs.keio.ac.jp/~yasu/jp_xaw.html # http://www.on.cs.keio.ac.jp/~yasu/linux/Xaw/gv-3.5.8-I18N-mb.patch # changed a little bit for SuSE: -Patch4: gv-3.6.3-I18N-mb.patch -Patch5: gv-3.6.3-intptr_t.patch +Patch4: gv-3.6.8-I18N-mb.patch Patch6: gv-3.6.3-settitle.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -80,19 +76,12 @@ -------- Tim Theisen <tim(a)cs.wisc.edu> Johannes Plass <plass(a)dipmza.physik.uni-mainz.de> - Jos� E. Marchesi <jemarch(a)gnu.org> %prep %setup echo >> src/Makefile.am -%patch0 -p1 -b .deb %patch1 -p0 -%patch2 -p0 -b .sec -# fzopen from libzio does not work due ftell() -#patch3 -p0 -b .bzip2 -# %patch4 -p0 -b .I18N-mb -%patch5 -p0 -b .intptr_t %patch6 -p0 -b .settitle %build @@ -133,15 +122,16 @@ --disable-memmove-code \ --disable-setenv-code \ --with-default-papersize=a4 -make pkglibdir='%{_x11data}/gv' +make pkgdatadir='%{_x11data}/gv' %install rm -rf %{buildroot} mkdir %{buildroot} -make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install -make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-info -make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-man -make -C src DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-nls +make DESTDIR=%{buildroot} pkgdatadir='%{_x11data}/gv' install +make DESTDIR=%{buildroot} pkgdatadir='%{_x11data}/gv' install-info +make DESTDIR=%{buildroot} pkgdatadir='%{_x11data}/gv' install-man +make -C src DESTDIR=%{buildroot} pkgdatadir='%{_x11data}/gv' install-nls + mkdir -p %{buildroot}/%{_defaultdocdir}/gv install -m 0444 NOTE %{buildroot}/%{_defaultdocdir}/gv/Copyright # add font settings to app-defaults: @@ -180,7 +170,9 @@ %dir %{_x11data}/*/app-defaults %config %{_x11data}/*/app-defaults/GV %{_bindir}/gv +%{_bindir}/gv-update-userconfig %doc %{_mandir}/man1/gv.1.gz +%doc %{_mandir}/man1/gv-update-userconfig.1.gz %doc %{_infodir}/gv.info.gz %dir %{_defaultdocdir}/gv %docdir %{_defaultdocdir}/gv ++++++ gv-3.6.3-I18N-mb.patch -> gv-3.6.8-I18N-mb.patch ++++++ --- gv/gv-3.6.3-I18N-mb.patch 2008-03-27 17:44:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/gv/gv-3.6.8-I18N-mb.patch 2010-02-24 15:22:41.000000000 +0100 @@ -1,5 +1,5 @@ --- README.I18N -+++ README.I18N 2005-05-23 19:45:33.000000000 +0200 ++++ README.I18N 2005-05-23 17:45:33.000000000 +0000 @@ -0,0 +1,28 @@ +GV I18N Fontset Patch for Japanese + Keio University in Japan @@ -30,39 +30,37 @@ + /* Load pieces does this logic for us, but it shouldn't. Its messy.*/ + --- src/Makefile.am -+++ src/Makefile.am 2008-03-27 17:03:55.202558681 +0100 -@@ -12,7 +12,7 @@ appdefaultsdir = $(pkglibdir) ++++ src/Makefile.am 2010-02-24 12:15:17.160125983 +0000 +@@ -14,7 +14,7 @@ appdefaultsdir = $(pkgdatadir) - appdefaults_DATA = GV + appdefaults_DATA = ../GV -EXTRA_DIST=ad2c gv_font_res.dat gv_layout_res.dat gv_misc_res.dat Aaa_bison.yacc \ +EXTRA_DIST=ad2c gv_font_res.dat gv_font_res-I18N_mb.dat gv_layout_res.dat gv_misc_res.dat Aaa_bison.yacc \ gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \ gv_selected.xbm gv_unmark.xbm -@@ -208,7 +208,7 @@ $(srcdir)/gv_class.h : $(srcdir)/gv_clas +@@ -217,7 +217,7 @@ gv_class.h : gv_class.ad @echo "creating gv_class.h" - @sh $(srcdir)/ad2c $(srcdir)/gv_class.ad > $(srcdir)/gv_class.h + @sh $(srcdir)/ad2c gv_class.ad > gv_class.h --$(srcdir)/gv_class.ad : $(srcdir)/gv_font_res.dat $(srcdir)/gv_layout_res.dat $(srcdir)/gv_make_res.dat $(srcdir)/gv_misc_res.dat $(srcdir)/gv_user_res.dat $(srcdir)/gv_intern_res_unix.dat -+$(srcdir)/gv_class.ad : $(srcdir)/gv_font_res-I18N_mb.dat $(srcdir)/gv_layout_res.dat $(srcdir)/gv_make_res.dat $(srcdir)/gv_misc_res.dat $(srcdir)/gv_user_res.dat $(srcdir)/gv_intern_res_unix.dat +-gv_class.ad : $(srcdir)/gv_font_res.dat $(srcdir)/gv_layout_res.dat gv_make_res.dat $(srcdir)/gv_misc_res.dat $(srcdir)/gv_user_res.dat gv_intern_res_unix.dat ++gv_class.ad : $(srcdir)/gv_font_res.dat $(srcdir)/gv_font_res-I18N_mb.dat $(srcdir)/gv_layout_res.dat gv_make_res.dat $(srcdir)/gv_misc_res.dat $(srcdir)/gv_user_res.dat gv_intern_res_unix.dat @echo "creating gv_class.ad" - cp $(srcdir)/gv_copyright.dat $(srcdir)/gv_class.ad - @echo "!" >> $(srcdir)/gv_class.ad -@@ -221,7 +221,7 @@ $(srcdir)/gv_class.ad : $(srcdir)/gv_fon - @cat $(srcdir)/gv_user_res.dat >> $(srcdir)/gv_class.ad - @cat $(srcdir)/gv_intern_res_unix.dat >> $(srcdir)/gv_class.ad - @cat $(srcdir)/gv_make_res.dat >> $(srcdir)/gv_class.ad -- @cat $(srcdir)/gv_font_res.dat >> $(srcdir)/gv_class.ad -+ @cat $(srcdir)/gv_font_res-I18N_mb.dat >> $(srcdir)/gv_class.ad - @cat $(srcdir)/gv_misc_res.dat >> $(srcdir)/gv_class.ad - @cat $(srcdir)/gv_layout_res.dat >> $(srcdir)/gv_class.ad - -@@ -262,3 +262,14 @@ endif - if USE_MEMDEBUG_CODE + cp $(srcdir)/gv_copyright.dat gv_class.ad + chmod u+w gv_class.ad +@@ -231,6 +231,7 @@ gv_class.ad : $(srcdir)/gv_font_res.dat + @cat $(srcdir)/gv_user_res.dat >> gv_class.ad + @cat gv_intern_res_unix.dat >> gv_class.ad + @cat gv_make_res.dat >> gv_class.ad ++ @cat $(srcdir)/gv_font_res-I18N_mb.dat >> gv_class.ad + @cat $(srcdir)/gv_font_res.dat >> gv_class.ad + @cat $(srcdir)/gv_misc_res.dat >> gv_class.ad + @cat $(srcdir)/gv_layout_res.dat >> gv_class.ad +@@ -278,3 +279,14 @@ if USE_MEMDEBUG_CODE gv_SOURCES += d_mem.c d_mem.h d_xtmem.c d_xtmem.h endif -+ + +install-nls: + @for LNG in ja_JP.UTF-8 ko_KR.UTF-8; do \ + test -f gv_nls_$$LNG.dat || continue; \ @@ -73,32 +71,18 @@ + $(INSTALL) $(INSTALLFLAGS) \ + $(srcdir)/GV_$$LNG.ad $(DESTDIR)$(datadir)/X11/$$LNG/app-defaults/GV; \ + done ---- src/callbacks.c -+++ src/callbacks.c 2005-05-23 19:45:33.000000000 +0200 -@@ -767,12 +767,6 @@ cb_openFile(w, client_data, call_data) - BEGINMESSAGE(cb_openFile) - - XawFileSelectionRemoveButton(FileSel, 3); -- n=0; -- XtSetArg(args[n], XtNtitle, "Open File"); ++n; -- XtSetValues(FileSel_popup, args, n); -- n=0; -- XtSetArg(args[n], XtNlabel, "Open File"); ++n; -- XtSetValues(button, args, n); - XtRemoveAllCallbacks(button, XtNcallback); - XtAddCallback(button, XtNcallback,cb_doOpenFile,NULL); - ++ --- src/dialog.c -+++ src/dialog.c 2008-03-27 15:52:18.179200931 +0100 -@@ -29,6 +29,7 @@ - */ ++++ src/dialog.c 2010-02-24 13:05:21.608126304 +0000 +@@ -31,6 +31,7 @@ + #include "ac_config.h" #include "config.h" +#include "VlistP.h" #include <stdio.h> -@@ -270,20 +271,27 @@ void DialogPopupSetText(s) +@@ -272,20 +273,27 @@ void DialogPopupSetText(s) Arg args[10]; Cardinal n; Widget response; @@ -127,7 +111,7 @@ XtSetArg(args[n], XtNleftMargin, &lm); n++; XtSetArg(args[n], XtNrightMargin, &rm); n++; XtSetArg(args[n], XtNborderWidth, &bw); n++; -@@ -291,8 +299,12 @@ void DialogPopupSetText(s) +@@ -293,8 +301,12 @@ void DialogPopupSetText(s) XtSetArg(args[n], XtNwidth, &width); n++; XtGetValues(response, args, n); n=0; @@ -143,13 +127,14 @@ if (nw>width) { INFIMESSAGE(new width,nw) --- src/gv_font_res-I18N_mb.dat -+++ src/gv_font_res-I18N_mb.dat 2005-05-23 19:46:28.000000000 +0200 -@@ -0,0 +1,52 @@ ++++ src/gv_font_res-I18N_mb.dat 2010-02-24 12:16:33.728125910 +0000 +@@ -0,0 +1,55 @@ + +!########## gv_font_res_linux.dat ++ +GV*international: True + -+!##### Fonts ++!##### FontSets + +GV*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* +GV*SmeBSB.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* @@ -160,6 +145,8 @@ +GV.?.locator*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* +GV.?.dateButton*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* +GV.?.titleButton*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* ++GV*optiongvPopup*infoVerboseButton.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* ++GV.?.infoVerboseButton*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* +GV.?.prevPage*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* +GV.?.nextPage*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* +GV*newtoc.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* @@ -198,7 +185,7 @@ +GV*versionPopup*versionTextb*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* +GV*infoPopup*Text*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,* --- src/gv_misc_res.dat -+++ src/gv_misc_res.dat 2005-05-23 19:45:33.000000000 +0200 ++++ src/gv_misc_res.dat 2005-05-23 17:45:33.000000000 +0000 @@ -220,6 +220,10 @@ GV*optionsetupPopup*scalesFrame.forcedWi GV*optionsetupPopup*mediasFrame.forcedWidth: 240 GV*optionsetupPopup*mediasFrame.forcedHeight: 400 @@ -210,7 +197,7 @@ !##### Panner GV*pannerFrame.frameType: sunken -@@ -317,6 +321,7 @@ GV*checkFile.label: Check File +@@ -321,6 +325,7 @@ GV*checkFile.label: Check File GV*filters.label: Filters: GV*dirs.label: Directories GV*button1.label: Cancel @@ -219,7 +206,7 @@ GV*screenSizeLabel.label: Screen Size (mm) --- src/gv_nls_ja_JP.UTF-8.dat -+++ src/gv_nls_ja_JP.UTF-8.dat 2008-03-27 16:17:51.247892392 +0100 ++++ src/gv_nls_ja_JP.UTF-8.dat 2008-03-27 15:17:51.000000000 +0000 @@ -0,0 +1,202 @@ +! +!** Copyright (C) 1995, 1996, 1997 Johannes Plass @@ -424,7 +411,7 @@ +GV*miscMenu.save_marked.label: マーク部分保存 + --- src/gv_nls_ko_KR.UTF-8.dat -+++ src/gv_nls_ko_KR.UTF-8.dat 2008-03-27 16:41:29.417781453 +0100 ++++ src/gv_nls_ko_KR.UTF-8.dat 2008-03-27 15:41:29.000000000 +0000 @@ -0,0 +1,202 @@ +! +!** Copyright (C) 1995, 1996, 1997 Johannes Plass @@ -629,16 +616,16 @@ +GV*miscMenu.save_marked.label: 표시 저장 + --- src/info.c -+++ src/info.c 2008-03-27 15:58:13.548742759 +0100 -@@ -35,6 +35,7 @@ ++++ src/info.c 2008-03-27 14:58:14.000000000 +0000 +@@ -36,6 +36,7 @@ #include "message.h" #include "config.h" +#include "VlistP.h" #include <stdio.h> - -@@ -68,6 +69,20 @@ static Bool infoPopupCreated = False; + #include <stdlib.h> +@@ -70,6 +71,20 @@ static Bool infoPopupCreated = False; static Bool infoPopupVisible = False; static int info_length; @@ -659,7 +646,7 @@ /*############################################################################### cb_popupInfoPopup ###############################################################################*/ -@@ -183,7 +198,9 @@ void makeInfoPopup() +@@ -193,7 +208,9 @@ void makeInfoPopup(void) Cardinal n; Dimension bottomMargin, leftMargin, rightMargin, topMargin; Dimension width, height; @@ -669,7 +656,7 @@ BEGINMESSAGE(makeInfoPopup) -@@ -211,20 +228,30 @@ void makeInfoPopup() +@@ -221,20 +238,30 @@ void makeInfoPopup(void) XtSetArg(args[n], XtNleft, XtChainLeft); n++; XtSetArg(args[n], XtNright, XtChainRight); n++; infodismiss = XtCreateManagedWidget("dismiss", buttonWidgetClass,infoform,args,n); @@ -704,8 +691,8 @@ n=0; XtSetArg(args[0], XtNwidth, width); n++; --- src/main.c -+++ src/main.c 2008-03-27 15:58:52.821773601 +0100 -@@ -380,6 +380,32 @@ int main(argc, argv) ++++ src/main.c 2008-03-27 14:58:53.000000000 +0000 +@@ -408,6 +408,32 @@ int main(argc, argv) /*### initializing toolkit and the application context ########*/ @@ -739,8 +726,8 @@ XtToolkitInitialize(); app_con = XtCreateApplicationContext(); --- src/misc_private.c -+++ src/misc_private.c 2008-03-27 16:02:51.532357064 +0100 -@@ -47,6 +47,7 @@ ++++ src/misc_private.c 2010-02-24 13:11:25.712127659 +0000 +@@ -48,6 +48,7 @@ #include "types.h" #include "misc_private.h" @@ -748,7 +735,7 @@ /*############################################################*/ /* update_label */ -@@ -58,6 +59,7 @@ update_label(widget,text) +@@ -59,6 +60,7 @@ update_label(widget,text) char *text; { LabelWidget w = (LabelWidget) widget; @@ -756,7 +743,7 @@ int shadow; BEGINMESSAGE1(update_label) -@@ -77,26 +79,41 @@ update_label(widget,text) +@@ -78,26 +80,41 @@ update_label(widget,text) if (text) { /* most of the following comes from X11/Xaw/Label.c */ Position x,y; INFSMESSAGE(update_label,text) ++++++ gv-3.6.3.dif -> gv-3.6.8.dif ++++++ --- gv/gv-3.6.3.dif 2008-03-27 18:28:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/gv/gv-3.6.8.dif 2010-02-24 15:22:42.000000000 +0100 @@ -1,7 +1,3 @@ ---- .pkgextract -+++ .pkgextract 2006-02-28 15:49:27.000000000 +0100 -@@ -0,0 +1 @@ -+patch -p1 -b -s --suffix=".debian" < ../gv-3.6.3-deb.patch --- NOTE +++ NOTE 2008-03-27 13:49:41.452894000 +0100 @@ -0,0 +1,52 @@ @@ -57,62 +53,44 @@ + * UUCP: uwvax!tim University of Wisconsin-Madison + * Phone: (608)262-0438 1210 West Dayton Street + * FAX: (608)262-9777 Madison, WI 53706 ---- src/Ghostview.c -+++ src/Ghostview.c 2008-03-27 13:50:57.606662000 +0100 -@@ -1419,6 +1419,12 @@ StartInterpreter(w) - if (gvw->ghostview.safer) - { - argv[argc++] = "-dSAFER"; -+# ifdef ALLOW_PDF -+ /* The file created by pdf2dsc opens the original -+ pdf file with the read operator. */ -+ if (gv_filename_dsc && (!gvw->ghostview.filename || !strcmp(gvw->ghostview.filename,"-"))) -+ argv[argc++] = "-dDELAYSAFER"; -+# endif - } - - if (gvw->ghostview.arguments) { --- src/Makefile.am -+++ src/Makefile.am 2008-03-27 17:36:23.280458747 +0100 -@@ -6,9 +6,9 @@ - - # File distribution - bin_PROGRAMS = gv --dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat -+dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat ++++ src/Makefile.am 2010-02-24 14:55:52.632125725 +0100 +@@ -10,7 +10,7 @@ bin_SCRIPTS = gv-update-userconfig + dist_pkgdata_DATA = gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat + pkgdata_DATA = gv_system.ad gv_user.ad gv_class.ad --appdefaultsdir = $(pkglibdir) +-appdefaultsdir = $(pkgdatadir) +appdefaultsdir = $(datadir)/X11/app-defaults - appdefaults_DATA = GV + appdefaults_DATA = ../GV -@@ -172,7 +172,7 @@ $(srcdir)/gv_user.ad : $(srcdir)/gv_user - @echo "! gv_user.ad" >> $(srcdir)/gv_user.ad - @echo "! User specific application defaults for gv" >> $(srcdir)/gv_user.ad - @echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> $(srcdir)/gv_user.ad -- @echo "! Copyright (C) 2004,2005,2006,2007 Jos� E. Marchesi" >> $(srcdir)/gv_user.ad -+ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> $(srcdir)/gv_user.ad - @echo "!" >> $(srcdir)/gv_user.ad - @cat $(srcdir)/gv_user_res.dat >> $(srcdir)/gv_user.ad - @cat $(srcdir)/gv_intern_res_unix.dat >> $(srcdir)/gv_user.ad -@@ -215,7 +215,7 @@ $(srcdir)/gv_class.ad : $(srcdir)/gv_fon - @echo "! gv_class.ad" >> $(srcdir)/gv_class.ad - @echo "! Application class defaults for gv" >> $(srcdir)/gv_class.ad - @echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> $(srcdir)/gv_class.ad -- @echo "! Copyright (C) 2004,2005,2006,2007 Jos� E. Marchesi" >> $(srcdir)/gv_class.ad -+ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> $(srcdir)/gv_class.ad - @echo "!" >> $(srcdir)/gv_class.ad - @echo "" >> $(srcdir)/gv_class.ad - @cat $(srcdir)/gv_user_res.dat >> $(srcdir)/gv_class.ad -@@ -236,7 +236,7 @@ $(srcdir)/gv_make_res.dat : - @echo "GV.useBackingPixmap: $(USE_BACKING_PIXMAP)" >> $(srcdir)/gv_make_res.dat - @echo "GV*dirs: Home\n\\" >> $(srcdir)/gv_make_res.dat - @echo " Tmp\n\\" >> $(srcdir)/gv_make_res.dat -- @echo " /usr/doc\n\\" >> $(srcdir)/gv_make_res.dat -+ @echo " /usr/share/doc\n\\" >> $(srcdir)/gv_make_res.dat - @echo " /usr/local/doc" >> $(srcdir)/gv_make_res.dat - @echo "GV*filter: no .*" >> $(srcdir)/gv_make_res.dat - @echo "GV*filters: None\n\\" >> $(srcdir)/gv_make_res.dat +@@ -176,7 +176,7 @@ gv_user.ad : $(srcdir)/gv_user_res.dat g + @echo "! gv_user.ad" >> gv_user.ad + @echo "! User specific application defaults for gv" >> gv_user.ad + @echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> gv_user.ad +- @echo "! Copyright (C) 2004,2005,2006,2007 Jos� E. Marchesi" >> gv_user.ad ++ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> gv_user.ad + @echo "!" >> gv_user.ad + @cat $(srcdir)/gv_user_res.dat >> gv_user.ad + @cat gv_intern_res_unix.dat >> gv_user.ad +@@ -225,7 +225,7 @@ gv_class.ad : $(srcdir)/gv_font_res.dat + @echo "! gv_class.ad" >> gv_class.ad + @echo "! Application class defaults for gv" >> gv_class.ad + @echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> gv_class.ad +- @echo "! Copyright (C) 2004,2005,2006,2007 Jos� E. Marchesi" >> gv_class.ad ++ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> gv_class.ad + @echo "!" >> gv_class.ad + @echo "" >> gv_class.ad + @cat $(srcdir)/gv_user_res.dat >> gv_class.ad +@@ -247,7 +247,7 @@ gv_make_res.dat : + @echo "GV.useBackingPixmap: $(USE_BACKING_PIXMAP)" >> gv_make_res.dat + @echo "GV*dirs: Home\n\\" >> gv_make_res.dat + @echo " Tmp\n\\" >> gv_make_res.dat +- @echo " $(sysdocdir)\n\\" >> gv_make_res.dat ++ @echo " /usr/share/doc\n\\" >> gv_make_res.dat + @echo " /usr/local/doc" >> gv_make_res.dat + @echo "GV*filter: no .*" >> gv_make_res.dat + @echo "GV*filters: None\n\\" >> gv_make_res.dat --- src/gv_misc_res.dat +++ src/gv_misc_res.dat 2006-02-28 15:49:27.000000000 +0100 @@ -50,7 +50,7 @@ GV*Scrollbar.background: gray78 @@ -124,54 +102,3 @@ GV*optionsetupPopup*Text*Scrollbar.background:gray71 GV*optionfsPopup*Text*Scrollbar.background:gray71 ---- src/misc.c -+++ src/misc.c 2006-02-28 15:49:27.000000000 +0100 -@@ -1337,7 +1337,8 @@ set_new_orientation(pagenumber) - else if ( no == O_LANDSCAPE) w = landscapeEntry; - else if ( no == O_UPSIDEDOWN) w = upsidedownEntry; - else w = seascapeEntry; -- set_newBitmapIfChanged(w,bitmap); -+ if (w) -+ set_newBitmapIfChanged(w,bitmap); - - if (gv_swap_landscape != gv_swap_landscape_old) - widgets_setSelectedBitmap(swapEntry,gv_swap_landscape); -@@ -1369,13 +1370,17 @@ set_pagemediaButton_label(media_id) - Widget w; - if (pagemediaEntry[media_id]) w = pagemediaEntry[media_id]; - else w = pagemediaEntry[media_id-1]; -+ if (!w) -+ goto out; - XtSetArg(args[0], XtNlabel, &s); - XtGetValues(w, args, ONE); - } - else s = "?"; - XtSetArg(args[0], XtNlabel, s); - XtSetValues(pagemediaButton, args, ONE); -+out: - ENDMESSAGE(set_pagemediaButton_label) -+ return; - } - - /*------------------------------------------------------------*/ -@@ -1443,7 +1448,8 @@ set_new_pagemedia(pagenumber) - else bitmap = app_res.selected_bitmap; - if (pagemediaEntry[gv_pagemedia]) w = pagemediaEntry[gv_pagemedia]; - else w = pagemediaEntry[gv_pagemedia-1]; -- set_newBitmapIfChanged(w,bitmap); -+ if (w) -+ set_newBitmapIfChanged(w,bitmap); - } - - if (gv_pagemedia_auto != gv_pagemedia_auto_old) widgets_setSelectedBitmap(autoMediaEntry,gv_pagemedia_auto); ---- src/ps.c -+++ src/ps.c 2008-03-27 18:28:32.973306228 +0100 -@@ -75,6 +75,8 @@ - #define BUFSIZ 1024 - #endif - #include <ctype.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #include "paths.h" - #include INC_X11(Intrinsic.h) ++++++ gv-3.6.3.tar.bz2 -> gv-3.6.8.tar.bz2 ++++++ ++++ 30223 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

commit cron for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package cron for openSUSE:Factory checked in at Thu Feb 25 02:20:37 CET 2010. -------- --- cron/cron.changes 2009-12-19 18:13:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/cron/cron.changes 2010-02-19 14:57:44.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 19 13:58:34 UTC 2010 - mseben(a)novell.com + +- added race-mtime_new.patch : to fix crontab -e crontab file + timestamp race condition (bnc#580800) (CVE-2010-0424) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- vixie-cron-4.1-race-mtime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cron.spec ++++++ --- /var/tmp/diff_new_pack.dqrriX/_old 2010-02-25 02:20:03.000000000 +0100 +++ /var/tmp/diff_new_pack.dqrriX/_new 2010-02-25 02:20:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cron (Version 4.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -28,7 +28,7 @@ AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq Version: 4.1 -Release: 206 +Release: 207 Summary: Cron Daemon Source0: vixie-%name-%version.tar.bz2 Source1: %name.init @@ -57,6 +57,8 @@ Patch19: vixie-cron-4.1-selinux.diff #PATCH-FIX-UPSTREAM verify return value of initgroups (bnc#537178) (CVE-2006-2607) Patch20: vixie-cron-4.1-initgroups_check.patch +#fix crontab -e crontab file timestamp race condition (bnc#580800) (CVE-2010-0424) +Patch21: vixie-cron-4.1-race-mtime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -96,6 +98,7 @@ %patch18 -p1 %patch19 -p1 %patch20 -p1 +%patch21 -p1 %build make %{?jobs:-j%jobs} DEFS="$RPM_OPT_FLAGS -DWITH_PAM -DWITH_SELINUX -Wno-comment -fpie -fstack-protector" LDFLAGS="-pie" ++++++ vixie-cron-4.1-race-mtime.patch ++++++ --- vixie-cron-4.1/crontab.c.CVE-2010-0424 2010-02-18 04:51:54.000000000 -0500 +++ vixie-cron-4.1/crontab.c 2010-02-18 04:56:32.000000000 -0500 @@ -378,8 +378,6 @@ edit_cmd(void) { perror("fstat"); goto fatal; } - utimebuf.actime = statbuf.st_atime; - utimebuf.modtime = statbuf.st_mtime; /* Turn off signals. */ (void)signal(SIGHUP, SIG_IGN); @@ -463,7 +461,17 @@ edit_cmd(void) { perror(Filename); exit(ERROR_EXIT); } + if (swap_uids() < OK) { + perror("swapping uids"); + exit(ERROR_EXIT); + } + utimebuf.actime = statbuf.st_atime; + utimebuf.modtime = statbuf.st_mtime; utime(Filename, &utimebuf); + if (swap_uids_back() < OK) { + perror("swapping uids back"); + exit(ERROR_EXIT); + } again: rewind(NewCrontab); if (ferror(NewCrontab)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit cmake for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at Thu Feb 25 02:19:56 CET 2010. -------- --- cmake/cmake.changes 2010-02-13 16:09:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2010-02-25 00:55:45.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Feb 24 22:46:26 CET 2010 - dmueller(a)suse.de + +- update to cmake 2.8.1 (rc3): + * many bugfixes + - CTest: Setup command-line dashboard support with Git + - CPack: Improve RPM spec files + - CTest: Improve host system introspection + - FindCUDA: Respect CUDA version differences + - FindCURL: Find import libraries on Windows + - FindGTK2: Look in fink locations on Mac OS X + - FindJNI: Honor find_package() REQUIRED and QUIET options + - FindOpenSSL: Fix MinGW support + - FindPythonLibs: Look in config for static library + - FindQt4: Misc enhancements, sync with KDE vesion + - FindX11: Improve documentation + - link_directories(): Treat relative paths consistently (CMP0015) + - Modernize FindLibXslt and FindLibXml.cmake + - UseQt4: Provide dependencies only for static Qt (#10021) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cmake-2.8.0.tar.bz2 New: ---- cmake-2.8.1-rc3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.UytVN3/_old 2010-02-25 02:19:47.000000000 +0100 +++ /var/tmp/diff_new_pack.UytVN3/_new 2010-02-25 02:19:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cmake (Version 2.8.0) +# spec file for package cmake (Version 2.8.0+2.8.1rc3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: cmake -Version: 2.8.0 -Release: 2 +Version: 2.8.0+2.8.1rc3 +Release: 1 License: BSD3c Group: Development/Tools/Building -%define tar_version %version +%define tar_version 2.8.1-rc3 Url: http://www.cmake.org/ Source0: %{name}-%{tar_version}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff @@ -125,7 +125,7 @@ /usr/bin/cmake-gui /usr/share/applications/CMake.desktop /usr/share/mime/packages/cmakecache.xml -/usr/share/pixmaps/CMakeSetup.png +/usr/share/pixmaps/CMakeSetup32.png %endif %changelog ++++++ fortify-buffer-overflows.diff ++++++ --- /var/tmp/diff_new_pack.UytVN3/_old 2010-02-25 02:19:47.000000000 +0100 +++ /var/tmp/diff_new_pack.UytVN3/_new 2010-02-25 02:19:47.000000000 +0100 @@ -1,14 +1,14 @@ --- Source/kwsys/SystemInformation.cxx +++ Source/kwsys/SystemInformation.cxx -@@ -139,7 +139,7 @@ - void RunMemoryCheck(); +@@ -152,7 +152,7 @@ + public: #define VENDOR_STRING_LENGTH (12 + 1) -#define CHIPNAME_STRING_LENGTH (48 + 1) +#define CHIPNAME_STRING_LENGTH (70 + 1) #define SERIALNUMBER_STRING_LENGTH (29 + 1) - typedef struct tagID + typedef struct tagID --- Utilities/cmtar/encode.c +++ Utilities/cmtar/encode.c @@ -32,7 +32,10 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at Thu Feb 25 02:19:09 CET 2010. -------- --- build/build.changes 2010-01-13 16:22:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/build/build.changes 2010-02-20 11:50:40.000000000 +0100 @@ -1,0 +2,30 @@ +Sat Feb 20 10:49:00 UTC 2010 - adrian(a)suse.de + +- update to current git + * fix for permissions for debian (done by Jan-Simon) + +------------------------------------------------------------------- +Thu Feb 11 19:09:11 UTC 2010 - adrian(a)suse.de + +- update to current git + * fixed handling of kiwi build results + +------------------------------------------------------------------- +Mon Feb 8 15:52:12 UTC 2010 - adrian(a)suse.de + +- update to current git + * support kiwi 4.1 schema files + +------------------------------------------------------------------- +Tue Jan 19 14:57:22 UTC 2010 - adrian(a)suse.de + +- update to current git + * fixed missing --root parameter for substitutedeps call + +------------------------------------------------------------------- +Mon Jan 18 16:38:58 UTC 2010 - adrian(a)suse.de + +- update to current git + * create .sha256 files for kiwi image results + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- build-2010.01.13.tar.gz New: ---- build-2010.02.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.M77Ljz/_old 2010-02-25 02:17:14.000000000 +0100 +++ /var/tmp/diff_new_pack.M77Ljz/_new 2010-02-25 02:17:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.01.13) +# spec file for package build (Version 2010.02.19) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.01.13 +Version: 2010.02.19 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -43,9 +43,11 @@ BuildArch: noarch # Manual requires to avoid hard require to bash-static AutoReqProv: off -Requires: /bin/bash -Requires: /usr/bin/perl +# Keep the following dependencies in sync with obs-worker package +Requires: bash +Requires: perl Requires: perl-TimeDate +Requires: binutils %description This package provides a script for building RPMs for SUSE Linux in a ++++++ build-2010.01.13.tar.gz -> build-2010.02.19.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/Build/Kiwi.pm new/build-2010.02.19/Build/Kiwi.pm --- old/build-2010.01.13/Build/Kiwi.pm 2010-01-03 13:59:11.000000000 +0100 +++ new/build-2010.02.19/Build/Kiwi.pm 2010-02-20 11:47:37.000000000 +0100 @@ -113,7 +113,13 @@ } for my $type (@{$preferences->{'type'} || []}) { next unless @{$preferences->{'type'}} == 1 || !$type->{'optional'}; - push @types, $type->{'_content'}; + if (defined $type->{'image'}) { + # for kiwi 4.1 + push @types, $type->{'image'}; + } else { + # for kiwi 3.8 and before + push @types, $type->{'_content'}; + } push @packages, "kiwi-filesystem:$type->{'filesystem'}" if $type->{'filesystem'}; if (defined $type->{'boot'}) { if ($type->{'boot'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/Build/Zypp.pm new/build-2010.02.19/Build/Zypp.pm --- old/build-2010.01.13/Build/Zypp.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.02.19/Build/Zypp.pm 2010-02-20 11:47:37.000000000 +0100 @@ -0,0 +1,33 @@ +package Build::Zypp; + +use strict; + +our $root = ''; + +sub parsecfg($) +{ + my $file = shift; + my $repocfg = "$root/etc/zypp/repos.d/$file.repo"; + local *REPO; + open(REPO, '<', $repocfg) or return undef; + my $name; + my $repo = {}; + while (<REPO>) { + chomp; + if (/^\[(.+)\]/) { + $name = $1; + } else { + my ($key, $value) = split(/=/,$_,2); + $repo->{$key} = $value; + } + } + close(REPO); + return undef unless $name; + $repo->{'description'} = $repo->{'name'} if exists $repo->{'name'}; + $repo->{'name'} = $name; + return $repo; +} + +1; + +# vim: sw=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/Build.pm new/build-2010.02.19/Build.pm --- old/build-2010.01.13/Build.pm 2010-01-03 13:59:11.000000000 +0100 +++ new/build-2010.02.19/Build.pm 2010-02-20 11:47:37.000000000 +0100 @@ -392,7 +392,7 @@ while (@s) { if ($s[0] =~ /^[$<=>|]/) { $ss[-1] .= " $s[0] $s[1]"; - $ss[-1] =~ s/\((.*)$/$1/; + $ss[-1] =~ s/ $(.*)$/ $1/; $ss[-1] =~ s/(<|>){2}/$1/; splice(@s, 0, 2); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/Makefile new/build-2010.02.19/Makefile --- old/build-2010.01.13/Makefile 2010-01-13 16:19:41.000000000 +0100 +++ new/build-2010.02.19/Makefile 2010-02-20 11:47:37.000000000 +0100 @@ -49,6 +49,9 @@ createrepomddeps \ createyastdeps \ changelog2spec \ + spec2changelog \ + download \ + spec_add_patch \ spectool \ unrpm \ $(DESTDIR)$(pkglibdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/build new/build-2010.02.19/build --- old/build-2010.01.13/build 2010-01-13 16:19:41.000000000 +0100 +++ new/build-2010.02.19/build 2010-02-20 11:47:37.000000000 +0100 @@ -121,16 +121,20 @@ --no-checks Do not run post-build checks + --repository PATH + Use package repository at PATH. Supported formats are + rpm-md and yast2. + Alternatively zypp://NAME specifies the zypp + repository NAME. The repo must be refreshed with zypp + so package meta data is available locally. With emtpy + NAME all enabled repositories are used. + --rpms path1:path2:... Specify path where to find the RPMs for the build system --arch arch1:arch2:... Specify what architectures to select from the RPMs - --useusedforbuild - Do not expand dependencies but search the specfile for - usedforbuild lines. - --verify Run verify when initializing the build root --extra-packs pack @@ -216,6 +220,7 @@ exec /bin/bash -c 'mount -n -o remount,ro / ; halt -f -p' halt -f -p else + umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true umount -n $BUILD_ROOT/proc 2>/dev/null || true umount -n $BUILD_ROOT/dev/pts 2>/dev/null || true test "$VM_IMAGE" = 1 && VM_IMAGE= @@ -823,7 +828,7 @@ if [ -z "$RPMLIST" ]; then if [ -z "$repos" -a -z "$BUILD_RPMS" ]; then - BUILD_RPMS="/media/dvd/suse" + repos=(--repository 'zypp://') fi else repos=() @@ -1096,6 +1101,7 @@ echo -n "repos=(" >> $BUILD_ROOT/.build/build.data shellquote "${repos[@]}" >> $BUILD_ROOT/.build/build.data echo ")" >> $BUILD_ROOT/.build/build.data + umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true umount -n $BUILD_ROOT/proc 2> /dev/null || true umount -n $BUILD_ROOT/dev/pts 2> /dev/null || true umount -n $BUILD_ROOT/mnt 2> /dev/null || true @@ -1204,7 +1210,7 @@ cleanup_and_exit ${BUILDSTATUS#BUILDSTATUS} ;; *) - echo "argh, no buildstatus set, assuming bad build host..." + echo "No buildstatus set, packager broke either the base system (glibc/bash) or the build host has a problem, server will retry..." cleanup_and_exit 3 ;; esac @@ -1237,8 +1243,7 @@ fi if test -z "$BUILD_DIST" -a -e "$BUILD_ROOT/.guessed_dist" ; then - BUILD_DIST=`cat $BUILD_ROOT/.guessed_dist` - echo "assuming dist $BUILD_DIST" + read BUILD_DIST < $BUILD_ROOT/.guessed_dist fi # @@ -1363,7 +1368,7 @@ if test -n "$RELEASE"; then args=(--release "$RELEASE") fi - substitutedeps "${args[@]}" --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$BUILD_DIR/configs" $CHANGELOGARGS "$BUILD_ROOT$TOPDIR/SOURCES/$SPECFILE" "$BUILD_ROOT/.spec.new" || cleanup_and_exit 1 + substitutedeps "${args[@]}" --root "$BUILD_ROOT" --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$BUILD_DIR/configs" $CHANGELOGARGS "$BUILD_ROOT$TOPDIR/SOURCES/$SPECFILE" "$BUILD_ROOT/.spec.new" || cleanup_and_exit 1 # extract macros from configuration getmacros --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$BUILD_DIR/configs" > $BUILD_ROOT/root/.rpmmacros if test -n "$BUILD_DEBUG" ; then @@ -1413,7 +1418,7 @@ if test "$BUILDTYPE" = dsc ; then rm -rf $BUILD_ROOT$TOPDIR/BUILD mkdir -p $BUILD_ROOT$TOPDIR/SOURCES.DEB - test $BUILD_USER = abuild && chown 399:399 $BUILD_ROOT$TOPDIR + test $BUILD_USER = abuild && chown -R 399:399 $BUILD_ROOT$TOPDIR DEB_TRANSFORM= DEB_SOURCEDIR=$TOPDIR/SOURCES DEB_DSCFILE=$SPECFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/build_kiwi.sh new/build-2010.02.19/build_kiwi.sh --- old/build-2010.01.13/build_kiwi.sh 2010-01-03 13:59:11.000000000 +0100 +++ new/build-2010.02.19/build_kiwi.sh 2010-02-20 11:47:37.000000000 +0100 @@ -5,7 +5,7 @@ imagename=$(perl -I$BUILD_DIR -MBuild::Kiwi -e Build::Kiwi::show $BUILD_ROOT/$TOPDIR/SOURCES/$SPECFILE filename) imageversion=$(perl -I$BUILD_DIR -MBuild::Kiwi -e Build::Kiwi::show $BUILD_ROOT/$TOPDIR/SOURCES/$SPECFILE version) # prepare rpms as source and createrepo on the repositories - if test -d $BUILD_ROOT/$TOPDIR/SOURCES/repos ; then + if test -d $BUILD_ROOT/$TOPDIR/SOURCES/repos -a "$DO_INIT" != false ; then ( ln -sf $TOPDIR/SOURCES/repos $BUILD_ROOT/repos cd $BUILD_ROOT/$TOPDIR/SOURCES/repos @@ -117,92 +117,120 @@ if test -n "$RELEASE"; then buildnum="-Build$RELEASE" fi + imageout="$imagename.$imagearch-$imageversion" for imgtype in $imagetype ; do case "$imgtype" in oem) - pushd $BUILD_ROOT/$TOPDIR/KIWI-oem > /dev/null - echo "compressing images... " - tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-raw.tar.bz2 \ - --exclude=$imagename.$imagearch-$imageversion.iso \ - --exclude=$imagename.$imagearch-$imageversion.raw \ - * || cleanup_and_exit 1 - if [ -e $imagename.$imagearch-$imageversion.iso ]; then - echo "Copy iso file and create md5..." - mv $imagename.$imagearch-$imageversion.iso \ - $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum.iso || cleanup_and_exit 1 - pushd $BUILD_ROOT/$TOPDIR/KIWI > /dev/null - md5sum $imagename.$imagearch-$imageversion$buildnum.iso \ - > "$imagename.$imagearch-$imageversion$buildnum.iso.md5" || cleanup_and_exit 1 - popd > /dev/null - fi - if [ -e $imagename.$imagearch-$imageversion.raw ]; then - echo "Copy raw file and create md5..." - mv $imagename.$imagearch-$imageversion.raw \ - $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum.raw || cleanup_and_exit 1 - pushd $BUILD_ROOT/$TOPDIR/KIWI > /dev/null - bzip2 $imagename.$imagearch-$imageversion$buildnum.raw && \ - md5sum $imagename.$imagearch-$imageversion$buildnum.raw.bz2 \ - > "$imagename.$imagearch-$imageversion$buildnum.raw.bz2.md5" || cleanup_and_exit 1 - popd > /dev/null - fi - popd > /dev/null + cat > $BUILD_ROOT/kiwi_post.sh << EOF +echo "compressing oem images... " +cd /$TOPDIR/KIWI-oem +if [ -e "$imageout.iso" ]; then + echo "take iso file and create sha256..." + mv "$imageout.iso" "/$TOPDIR/KIWI/$imageout$buildnum.iso" + pushd /$TOPDIR/KIWI + sha256sum "$imageout$buildnum.iso" > "$imageout$buildnum.iso.sha256" + popd +fi +if [ -e "$imageout.raw" ]; then + mv "$imageout.raw" "/$TOPDIR/KIWI/$imageout$buildnum.raw" + pushd /$TOPDIR/KIWI + echo "bzip2 raw file..." + bzip2 "$imageout$buildnum.raw" + echo "Create sha256 file..." + sha256sum "$imageout$buildnum.raw.bz2" > "$imageout$buildnum.raw.bz2.sha256" + popd +fi + +tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-raw.tar.bz2" \ + --exclude="$imageout.iso" --exclude="$imageout.raw" * +cd /$TOPDIR/KIWI +sha256sum "$imageout$buildnum-raw.tar.bz2" > "$imageout$buildnum-raw.tar.bz2.sha256" +EOF ;; vmx) - pushd $BUILD_ROOT/$TOPDIR/KIWI-vmx > /dev/null - echo "compressing images... " - if [ -e $imagename.$imagearch-$imageversion.xenconfig ] ; then - tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-xenvmx.tar.bz2 \ - $imagename.$imagearch-$imageversion.raw \ - $imagename.$imagearch-$imageversion.xenconfig || cleanup_and_exit 1 - else - tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2 \ - $imagename.$imagearch-$imageversion.vmx \ - $imagename.$imagearch-$imageversion.vmdk || cleanup_and_exit 1 - if [ -e $imagename.$imagearch-$imageversion.ovf ] ; then - tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-ovf.tar.bz2 \ - $imagename.$imagearch-$imageversion.ovf \ - $imagename.$imagearch-$imageversion-disk*.vmdk || cleanup_and_exit 1 - fi - fi - popd > /dev/null + cat > $BUILD_ROOT/kiwi_post.sh << EOF +echo "compressing vmx images... " +cd /$TOPDIR/KIWI-vmx +# This option has a number of format parameters +VMXFILES="" +SHAFILES="" +for i in "$imageout.vmx" "$imageout.vmdk" "$imageout-disk*.vmdk"; do + ls \$i >& /dev/null && VMXFILES="\$VMXFILES \$i" +done +if [ -n "\$VMXFILES" ]; then + tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2" \$VMXFILES + SHAFILES="\$SHAFILES $imageout$buildnum-vmx.tar.bz2" +fi + +if [ -e "$imageout.xenconfig" ]; then + tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2" $imageout.xenconfig $imageout.raw initrd-* + SHAFILES="\$SHAFILES $imageout$buildnum-vmx.tar.bz2" +fi +for i in "$imageout.ovf"; do + [ -e \$i ] && SHAFILES="\$SHAFILES \$i" +done +# FIXME: do we need a single .raw file in any case ? + +cd /$TOPDIR/KIWI +if [ -n "\$SHAFILES" ]; then + for i in \$SHAFILES; do + echo "Create sha256 file..." + sha256sum "\$i" > "\$i.sha256" + done +fi +EOF ;; xen) - pushd $BUILD_ROOT/$TOPDIR/KIWI-xen > /dev/null - echo "compressing images... " - tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-xen.tar.bz2 \ - `grep ^kernel $imagename.$imagearch-$imageversion.xenconfig | cut -d'"' -f2` \ - `grep ^ramdisk $imagename.$imagearch-$imageversion.xenconfig | cut -d'"' -f2` \ - $imagename.$imagearch-$imageversion.xenconfig \ - $imagename.$imagearch-$imageversion || cleanup_and_exit 1 - popd > /dev/null + cat > $BUILD_ROOT/kiwi_post.sh << EOF +echo "compressing xen images... " +cd /$TOPDIR/KIWI-xen +tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-xen.tar.bz2" \ + `grep ^kernel $imageout.xenconfig | cut -d'"' -f2` \ + `grep ^ramdisk $imageout.xenconfig | cut -d'"' -f2` \ + initrd-* \ + "$imageout.xenconfig" \ + "$imageout" +echo "Create sha256 file..." +cd $TOPDIR/KIWI +sha256sum "$imageout$buildnum-xen.tar.bz2" > "$imageout$buildnum-xen.tar.bz2.sha256" +EOF ;; pxe) - pushd $BUILD_ROOT/$TOPDIR/KIWI-pxe > /dev/null - echo "compressing images... " - tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-pxe.tar.bz2 \ - $imagename.$imagearch-$imageversion* \ - initrd-* || cleanup_and_exit 1 - popd > /dev/null + cat > $BUILD_ROOT/kiwi_post.sh << EOF +echo "compressing pxe images... " +cd /$TOPDIR/KIWI-pxe +tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-pxe.tar.bz2" "$imageout"* initrd-*" +echo "Create sha256 file..." +cd $TOPDIR/KIWI +sha256sum "$imageout$buildnum-pxe.tar.bz2" > "$imageout$buildnum-pxe.tar.bz2.sha256" +EOF ;; iso) - pushd $BUILD_ROOT/$TOPDIR/KIWI-iso > /dev/null - echo "creating md5 sum for iso images... " - for i in *.iso; do - pushd $BUILD_ROOT/$TOPDIR/KIWI/ > /dev/null - mv $BUILD_ROOT/$TOPDIR/KIWI-iso/$i ${i%.iso}$buildnum.iso || cleanup_and_exit 1 - md5sum ${i%.iso}$buildnum.iso > ${i%.iso}$buildnum.iso.md5 || cleanup_and_exit 1 - popd > /dev/null - done - popd > /dev/null + cat > $BUILD_ROOT/kiwi_post.sh << EOF +cd /$TOPDIR/KIWI-iso +for i in *.iso; do + mv "\$i" "/$TOPDIR/KIWI/\${i%.iso}$buildnum.iso" +done +echo "creating sha256 sum for iso images... " +cd $TOPDIR/KIWI +for i in *.iso; do + sha256sum "\$i" > "\$i.sha256" +done +EOF ;; *) - pushd $BUILD_ROOT/$TOPDIR/KIWI-$imgtype > /dev/null - echo "compressing unkown images... " - tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-$imgtype.tar.bz2 \ - * || cleanup_and_exit 1 - popd > /dev/null + cat > $BUILD_ROOT/kiwi_post.sh << EOF +echo "compressing unkown images... " +cd /$TOPDIR/KIWI-$imgtype +tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-$imgtype.tar.bz2" * +echo "Create sha256 file..." +cd /$TOPDIR/KIWI +sha256sum "$imageout$buildnum-$imgtype.tar.bz2" > "$imageout$buildnum-$imgtype.tar.bz2.sha256" +EOF ;; esac + chroot $BUILD_ROOT su -c "sh -e -x /kiwi_post.sh" || cleanup_and_exit 1 + rm -f $BUILD_ROOT/kiwi_post.sh done fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/createrepomddeps new/build-2010.02.19/createrepomddeps --- old/build-2010.01.13/createrepomddeps 2010-01-03 13:59:11.000000000 +0100 +++ new/build-2010.02.19/createrepomddeps 2010-02-20 11:47:37.000000000 +0100 @@ -360,21 +360,41 @@ }); #my $url = '/mounts/mirror/SuSE/ftp.suse.com/pub/suse/update/10.1/'; -foreach my $url (@ARGV) { - $url .= '/' unless $url =~ /\/$/; +for my $url (@ARGV) { + my $dir; + if ($url =~ /^zypp:\/\/([^\/]*)\/?/) { + use Build::Zypp; + my $repo = Build::Zypp::parsecfg($1); + die "can't parse $1\n" unless $repo; + my $type = $repo->{'type'}; + if($type eq 'rpm-md') { + my $name = $repo->{'name'}; + $dir = "/var/cache/zypp/raw/$name/"; + $baseurl = $url; + $baseurl .= '/' unless $baseurl =~ /\/$/; + } elsif ($type eq 'yast2') { + # XXX + exec ($INC[0].'/createyastdeps', $url); + } else { + die "unsupported repo type: $type\n"; + } + } else { + $dir = $url; + $dir .= '/' unless $dir =~ /\/$/; + $baseurl = $dir; + } - $baseurl = $url; @primaryfiles = (); @cursor = ([undef, $repomdparser]); - $p->parsefile($url . 'repodata/repomd.xml'); + $p->parsefile($dir . 'repodata/repomd.xml'); # print Dumper(\@primaryfiles); foreach my $f (@primaryfiles) { @cursor = ([undef, $primaryparser]); - my $u = $url . $f->{'location'}; + my $u = $dir . $f->{'location'}; $u = 'gzip -cd ' . $u . '|' if ($u =~ /\.gz$/); # XXX my $fh; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/createyastdeps new/build-2010.02.19/createyastdeps --- old/build-2010.01.13/createyastdeps 2010-01-03 13:59:11.000000000 +0100 +++ new/build-2010.02.19/createyastdeps 2010-02-20 11:47:37.000000000 +0100 @@ -60,10 +60,18 @@ return 0; } -while (@ARGV) -{ - my $url = shift; - $url .= '/' unless $url =~ /\/$/; +for my $url (@ARGV) { + my $dir; + if ($url =~ /^zypp:\/\/([^\/]*)\/?/) { + use Build::Zypp; + my $repo = Build::Zypp::parsecfg($1); + die "can't parse $1\n" unless $repo; + die "only yast2 repos supported\n" unless $repo->{'type'} eq 'yast2'; + my $name = $repo->{'name'}; + $dir = "/var/cache/zypp/raw/$name/"; + } else { + $dir = $url; + } # a really fucked up system # if (-e $url."/yast/order") { @@ -85,7 +93,9 @@ # } # } # XXX: location is actually defined in content file - my $packages = $url.'suse/setup/descr/packages'; + my $packages = $dir.'/suse/setup/descr/packages'; + + $url .= '/' unless $url =~ /\/$/; my @order = (); my $pkgs = Build::Susetags::parse($packages, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/download new/build-2010.02.19/download --- old/build-2010.01.13/download 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.02.19/download 2010-02-20 11:47:37.000000000 +0100 @@ -0,0 +1,41 @@ +#!/usr/bin/perl -w + +BEGIN { + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); +} + +use LWP::UserAgent; +use URI; +use File::Path; +use File::Basename; + +use strict; + +die "USAGE: $0 DIR URLS..." unless $#ARGV >= 1; + +my $dir = shift @ARGV; + +my $ua = LWP::UserAgent->new( + agent => "openSUSE build script", + env_proxy => 1, + timeout => 42); + +for my $url (@ARGV) { + my $dest = $dir; + if ($url =~ /^zypp:\/\/([^\/]*)\/?/) { + use Build::Zypp; + my $repo = Build::Zypp::parsecfg($1); + die "can't parse $1\n" unless $repo; + die "missing url in repo ".$repo->{'name'}."\n" unless exists $repo->{'baseurl'}; + my $u = $repo->{'baseurl'}; + $u .= '/' unless substr($u, -1, 1) eq '/'; + $url =~ s/^zypp:\/\/[^\/]*\/*//; + $url = URI->new($u.$url) + } else { + $url = URI->new($url); + } + my $res = $ua->mirror($url, $dest.'/'.basename($url->path)); + die "reqesting $url failed: ".$res->status_line."\n" unless $res->is_success; +} + +# vim:sw=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/expanddeps new/build-2010.02.19/expanddeps --- old/build-2010.01.13/expanddeps 2010-01-03 13:59:11.000000000 +0100 +++ new/build-2010.02.19/expanddeps 2010-02-20 11:47:37.000000000 +0100 @@ -137,8 +137,11 @@ $dist = 'default'; } else { my $rpmfn = $fn{"rpm.$rpmarch"}; - my %res = Build::Rpm::rpmq($rpmfn, 1010); - my $rpmdist = $res{1010}->[0] || ''; + my $rpmdist = ''; + if ($rpmfn =~ /^\// && -e $rpmfn) { + my %res = Build::Rpm::rpmq($rpmfn, 1010); + $rpmdist = $res{1010}->[0] || ''; + } $rpmdist = lc($rpmdist); $rpmdist =~ s/-/_/g; $rpmdist =~ s/opensuse/suse linux/; @@ -162,6 +165,7 @@ $dist = 'default'; } } + print STDERR "Warning: distribution not specified, assuming '$dist' (see $configdir).\n"; } my $cf = Build::read_config_dist($dist, $archs[0], $configdir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/init_buildsystem new/build-2010.02.19/init_buildsystem --- old/build-2010.01.13/init_buildsystem 2010-01-03 13:59:11.000000000 +0100 +++ new/build-2010.02.19/init_buildsystem 2010-02-20 11:47:37.000000000 +0100 @@ -92,6 +92,7 @@ [ "$BUILD_ROOT" != / ] || chown $browner $BUILD_ROOT # umount so init_buildsystem can be used standalone # XXX: use stat -f /dev/pts/ -c %T to check whether it's mounted and not suppress errors then? + umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true umount -n $BUILD_ROOT/proc 2> /dev/null || true umount -n $BUILD_ROOT/dev/pts 2> /dev/null || true umount -n $BUILD_ROOT/mnt 2> /dev/null || true @@ -100,6 +101,7 @@ function clean_build_root () { test -n "$BUILD_ROOT" && { + umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true umount -n $BUILD_ROOT/proc 2> /dev/null || true umount -n $BUILD_ROOT/dev/pts 2> /dev/null || true umount -n $BUILD_ROOT/mnt 2> /dev/null || true @@ -244,8 +246,28 @@ DEVLIST } +# check whether the repo list contains a plain "zypp://". Add all +# enabled zypp repos in this case +maybe_add_all_zypp_repos() +{ + local i j + r=() + for i in "${repos[@]}"; do + if [ "$i" = "zypp://" ]; then + for j in `grep -l enabled=1 /etc/zypp/repos.d/*.repo`; do + j="${j#/etc/zypp/repos.d/}" + r=("${r[@]}" "zypp://${j%.repo}") + done + else + r=("${r[@]}" "$i") + fi + done + repos=("${r[@]}") +} + function validate_cache_file { local findonly='' + maybe_add_all_zypp_repos test "${repos[*]} ${BUILD_RPMS//:/ /}" != "$(cat $CACHE_FILE.id 2>/dev/null)" && rm -f $CACHE_FILE.id test -f $CACHE_FILE || rm -f $CACHE_FILE.id for SRC in "${repos[@]}" ${BUILD_RPMS//:/ /}; do @@ -260,7 +282,9 @@ continue fi test -z "$SRC" && SRC=`pwd` - if [ ! -e "$SRC" ]; then + if [ "${SRC#zypp://}" != "$SRC" ]; then + set -- $BUILD_DIR/createrepomddeps "$SRC" + elif [ ! -e "$SRC" ]; then echo "*** $SRC does not exist" >&2 cleanup_and_exit 1 elif [ -z "$findonly" -a -e "$SRC"/suse/setup/descr/packages -o -e "$SRC"/suse/setup/descr/packages.gz ]; then @@ -310,6 +334,32 @@ cleanup_and_exit 1 } +# modify $SRC +download_zypp() +{ + local url="$1" + local zd="/var/cache/zypp/packages/" + SRC=$zd${url#zypp://} + if [ ! -e "$SRC" ]; then + local destdir="$zd/tmp" + mkdir -p "$destdir" + echo "downloading $url ... "; + $BUILD_DIR/download "$destdir" "$url" || cleanup_and_exit 1 + local destfile="$destdir/${url##*/}" + if [ ! -e "$destfile" ]; then + echo "expected $destfile after download but it's missing" >&2 + cleanup_and_exit 1 + fi + rpm -K "$destfile" > $destfile.v || { echo "rpm verify failed" >&2; rm -rf "$destdir"; cleanup_and_exit 1; } + if grep "NOT OK" $destfile.v; then + rm -rf "$destdir" + cleanup_and_exit 1 + fi + rm -f "$destfile.v" + mv "$destfile" "$SRC" || cleanup_and_exit 1 + fi +} + set_build_arch trap fail_exit EXIT @@ -328,6 +378,7 @@ if test -e $BUILD_IS_RUNNING ; then echo It seems that there was an incomplete setup of $BUILD_ROOT. echo To be sure, we will build it again completely... + umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true umount -n $BUILD_ROOT/proc 2> /dev/null umount -n $BUILD_ROOT/dev/pts 2> /dev/null umount -n $BUILD_ROOT/mnt 2> /dev/null @@ -439,6 +490,18 @@ echo "${SRC#*:}" > $BUILD_ROOT/.init_b_cache/rpms/${SRC%%:*}.id continue fi + if [ "${SRC#/}" = "$SRC" ]; then + url="$SRC" + case "$url" in + zypp://*) + download_zypp "$url" + ;; + *) + echo "unsupported url: $url" >&2 + cleanup_and_exit 1 + ;; + esac + fi ln -s "$SRC" "$BUILD_ROOT/.init_b_cache/rpms/$PKG.${SRC##*.}" PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL $PKG" done < $RPMLIST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/spec2changelog new/build-2010.02.19/spec2changelog --- old/build-2010.01.13/spec2changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.02.19/spec2changelog 2010-02-20 11:47:37.000000000 +0100 @@ -0,0 +1,79 @@ +#!/usr/bin/perl +# +# Tiny perl script that parses a .spec file (STDIN), extracts +# its %changelog entries and prints (STDOUT) them in the +# format of a .changes file, ordered. +# +# Usage: cat foo.spec | spec2changes.pl > foo.changes +# +# Copyright 2009 by Pascal Bleser <pascal.bleser(a)opensuse.org> +# This script is licensed under the GNU General Public License version 2 +# http://www.gnu.org/licenses/gpl-2.0.html +# + +use warnings; +use strict; +use Date::Language; +use POSIX qw(strftime setlocale LC_ALL); + +# make sure date printed in correct locale +$ENV{'TZ'} = 'UTC'; +setlocale(LC_ALL, 'C'); + +my $sep = "-" x 67; +my @days = qw{Mon Tue Wed Thu Fri Sat Sun}; +my @months = qw{Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec}; + +#---------------------------------------------------------------------- +# +my %dh = map { $_ => 1 } @days; +my %mh = map { $_ => 1 } @months; + +my $date_parser = Date::Language->new('English'); + +my %items = (); +my $current_block = undef; +my $time = undef; +while (<>) { + if (/^%changelog/ .. eof()) { + next if /^%/; + next if /^\s*#/; + + chomp; + s/\s+$//; + + if (/^\*\s+(([A-Z][a-z]{2})\s+([A-Z][a-z]{2})\s+\d{1,2}\s+\d{4})(\s+(.*)\s*)$/ and exists $dh{$2} and exists $mh{$3}) { + $items{$time} = $current_block if defined $current_block and defined $time; + $time = $date_parser->str2time($1); + $current_block = []; + $_ = $4; + } elsif (/^\*/) { + warn("not matching a headline: \"$_\"\n"); + } + push(@$current_block, $_); + } +} +$items{$time} = $current_block if defined $current_block and defined $time; + +foreach my $time (sort { $b <=> $a } (keys(%items))) { + print $sep, "\n"; + my $item = $items{$time}; + my $head = shift(@$item); + $head =~ s/^\s+//; + $head =~ s/^\-\s+//; + if ($head =~ m/^(.+?)\s*<(.+?\@.+?\..+?)>(\s*.*)$/) { + $head = $2; + } elsif ($head =~ m/^<(.+?\@.+?\..+?)>(\s*.*)$/) { + $head = $1; + } + if ($head =~ m/^\s*-\s*(.+)$/) { + $head = $1; + } + + print strftime("%a %b %e %H:%M:%S %Z %Y", localtime($time)), " - ", $head, "\n"; + my $first = shift(@$item); + print "\n" unless defined($first) && ($first eq ''); + print $first, "\n"; + print join("\n", @$item), "\n" if @$item; + print "\n"; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.01.13/spec_add_patch new/build-2010.02.19/spec_add_patch --- old/build-2010.01.13/spec_add_patch 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.02.19/spec_add_patch 2010-02-20 11:47:37.000000000 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# vim:sw=4:et +# Author: Dirk Mueller + +use strict; + +my $diffname = $ARGV[0]; +my $specname = $ARGV[1]; + +if (!defined($diffname) || ! -f $diffname) { + + print "$0: <diffname>\n"; + exit 1; +} + +sub find_specfile() +{ + opendir(D, "."); + my @specs = grep { /\.spec$/ } readdir(D); + closedir(D); + + # choose the one with the shortest name (heuristic) + $specname = ( sort { length($a) - length($b) } @specs)[0]; + +} + +if (!defined($specname) || ! -f $specname) { + &find_specfile(); +} + + +open(S, "<$specname") or die; + +my $ifdef_level = 0; +my $in_prep = 0; +my $in_global = 1; +my $last_patch_in_prep_index = 0; +my $last_patch_in_global_index = 0; +my $already_found_patch = 0; +my @c = (); +my $index = 0; + +# first read the specfile, parse useful information +while(<S>) +{ + + if(/^\s*%\s*endif/) { + $ifdef_level--; + $last_patch_in_prep_index = $index if ($in_prep && $ifdef_level == 0); + } + die if ($ifdef_level < 0); + $ifdef_level++ if(/^\s*%\s*if/); + + if ($ifdef_level == 0 && !$in_prep && $in_global + && /^\%(?:prep|build|install|package|description|doc)/) { + $in_global = 0; + } + + if (!$in_prep && /^%prep/i) { + $in_prep = 1; + die if ($in_global); + } + + if ($in_prep + && /^%setup\b/) { + $last_patch_in_prep_index = $index; + } + + if ($in_prep + && /^\%(?:build|install|package|description|doc)/) { + $in_prep = 0; + } + + die if (($in_prep + $in_global) > 1); + + if ($in_global && /^Patch(?:\d+)?:/) { + $last_patch_in_global_index = $index; + } + + if ($in_global && $ifdef_level == 0 && /^Source(?:\d+)?:/) { + $last_patch_in_global_index = $index; + } + + if ($in_global && /^Patch.*?:\s+$diffname/) { + $already_found_patch = 1; + } + + if ($in_prep && $ifdef_level == 0 && /^\%patch/) { + $last_patch_in_prep_index = $index; + } + push(@c, $_); + $index++; +} +close(S); + +exit 0 if ($already_found_patch); + +print "Adding patch $diffname to $specname\n"; + +die if ($ifdef_level > 0); +die if ($in_global || $in_prep); +die if ($last_patch_in_prep_index == 0); +die if ($last_patch_in_global_index == 0); + +#print "adding Patch: $diffname to line $last_patch_in_global_index\n"; +#print "adding %patch to line $last_patch_in_prep_index\n"; + +# determine patch number +my $patchnum = 0; +$patchnum = $1+1 if ($c[$last_patch_in_global_index] =~ /Patch(\d+):/); +$patchnum = 1 if ($c[$last_patch_in_global_index] =~ /Patch:/); + +# determine strip level +my $striplevel = ""; +open(P, "<$diffname") or die; +while() { + $striplevel = " -p1" if (m/^--- a/ or m/^--- [^\/]+-\d+\./); + last if (/^--- /); + +} +close(P); + + +splice @c, $last_patch_in_prep_index+1, 0, ("\%patch$patchnum$striplevel\n"); +splice @c, $last_patch_in_global_index+1, 0, + (sprintf "Patch%s:%s%s\n", $patchnum, ' ' x (10-length($patchnum)), $diffname); + +open(O, ">$specname.new") or die; +print O @c; +close(O); + +system("diff", "-u", $specname, "$specname.new"); +rename("$specname.new", $specname); ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.M77Ljz/_old 2010-02-25 02:17:14.000000000 +0100 +++ /var/tmp/diff_new_pack.M77Ljz/_new 2010-02-25 02:17:14.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.01.13 +Version: 2010.02.19 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.M77Ljz/_old 2010-02-25 02:17:14.000000000 +0100 +++ /var/tmp/diff_new_pack.M77Ljz/_new 2010-02-25 02:17:14.000000000 +0100 @@ -1,3 +1,10 @@ +build (2010.02.02-1) unstable; urgency=low + + * Update to current git trunk + - Support new kiwi 4.1 schema files + + -- Adrian Schroeter <adrian(a)suse.de> Tue, 02 Feb 2010 10:03:54 +0200 + build (2009.09.23-1) unstable; urgency=low * Update to current svn trunk ++++++ debian.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/build.install new/debian/build.install --- old/debian/build.install 2009-02-02 12:00:34.000000000 +0100 +++ new/debian/build.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -Build/* usr/lib/build/Build -Build.pm usr/lib/build -baselibs_global.conf usr/lib/build -build usr/lib/build -changelog2spec usr/lib/build -configs/* usr/lib/build/configs -createrpmdeps usr/lib/build -debtransform usr/lib/build -expanddeps usr/lib/build -extractbuild usr/lib/build -getmacros usr/lib/build -getbinaryid usr/lib/build -getoptflags usr/lib/build -init_buildsystem usr/lib/build -killchroot usr/lib/build -mkbaselibs usr/lib/build -order usr/lib/build -substitutedeps usr/lib/build -unrpm usr/bin -xen.conf usr/lib/build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/build.links new/debian/build.links --- old/debian/build.links 2007-03-02 21:05:45.000000000 +0100 +++ new/debian/build.links 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/build/build usr/bin/build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control --- old/debian/control 2007-03-02 21:05:45.000000000 +0100 +++ new/debian/control 2009-12-09 09:47:57.000000000 +0100 @@ -1,7 +1,7 @@ Source: build Section: devel Priority: optional -Maintainer: Rene Engelhard <rengelhard(a)suse.de> +Maintainer: Adrian Schroeter <adrian(a)suse.de> Build-Depends: debhelper (>= 4) Standards-Version: 3.7.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/rules new/debian/rules --- old/debian/rules 2007-03-02 21:05:45.000000000 +0100 +++ new/debian/rules 2009-11-12 15:22:36.000000000 +0100 @@ -27,7 +27,7 @@ build-stamp: configure-stamp dh_testdir - touch $@ + touch build-stamp clean: dh_testdir @@ -41,28 +41,25 @@ dh_testroot dh_clean -k dh_installdirs - - dh_install + make DESTDIR=$(CURDIR)/debian/build install binary-arch: build install - -binary-indep: build install dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs dh_installexamples - dh_installman build.1 + dh_installman dh_link dh_strip dh_compress - dh_fixperms - dh_perl usr/lib/build dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb +binary-indep: build install + binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit autofs for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at Thu Feb 25 01:40:03 CET 2010. -------- --- autofs/autofs.changes 2010-02-10 12:17:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/autofs/autofs.changes 2010-02-24 16:53:07.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 24 16:50:02 CET 2010 - mszeredi(a)suse.cz + +- add "network-remotefs" to Should-Start: and Should-Stop: in the + init script (bnc#522224) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.b9uLAU/_old 2010-02-25 01:39:44.000000000 +0100 +++ /var/tmp/diff_new_pack.b9uLAU/_new 2010-02-25 01:39:44.000000000 +0100 @@ -25,7 +25,7 @@ Group: System/Daemons AutoReqProv: on Version: 5.0.5 -Release: 2 +Release: 3 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 ++++++ autofs-suse-autofs_init.patch ++++++ --- /var/tmp/diff_new_pack.b9uLAU/_old 2010-02-25 01:39:44.000000000 +0100 +++ /var/tmp/diff_new_pack.b9uLAU/_new 2010-02-25 01:39:44.000000000 +0100 @@ -36,9 +36,9 @@ -# Description: Automounts filesystems on demand +# Provides: autofs +# Required-Start: $network $syslog $remote_fs -+# Should-Start: $portmap ypbind keyserv ldap gssd nfsserver ++# Should-Start: $portmap ypbind keyserv ldap gssd nfsserver network-remotefs +# Required-Stop: $network $syslog $remote_fs -+# Should-Stop: $portmap ypbind keyserv ldap gssd nfsserver ++# Should-Stop: $portmap ypbind keyserv ldap gssd nfsserver network-remotefs +# Default-Start: 3 5 +# Default-Stop: +# Short-Description: automatic mounting of filesystems ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit amarok for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at Thu Feb 25 01:39:13 CET 2010. -------- --- KDE/amarok/amarok.changes 2010-02-01 15:29:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2010-02-14 22:39:12.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Feb 14 21:32:51 UTC 2010 - wstephenson(a)novell.com + +- update to 2.3 Beta 1 + * Improved podcast UI + * New main toolbar + * Use USB Mass Storage devices as collections automatically + * Dynamic Collection + * Last.fm interactive cover search + * for detailed changes, see http://amarok.kde.org/en/releases/2.3/beta/1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 2.2.2_patch.diff amarok-2.2.2.tar.bz2 New: ---- amarok-2.2.2.90.tar.bz2 version-2.2.90.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.V5QML3/_old 2010-02-25 01:38:48.000000000 +0100 +++ /var/tmp/diff_new_pack.V5QML3/_new 2010-02-25 01:38:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package amarok (Version 2.2.2) +# spec file for package amarok (Version 2.2.90) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,16 +42,16 @@ License: GPLv2+ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE -Version: 2.2.2 -Release: 2 -Source0: %{name}-2.2.2.tar.bz2 +Version: 2.2.90 +Release: 1 +Source0: %{name}-2.2.2.90.tar.bz2 Source100: %{name}-rpmlintrc Patch: cmakelist.diff Patch3: errmsg-mysql-embedded.diff Patch4: errmsg-mysql51-embedded.diff # PATCH-FIX-OPENSUSE no_buildtime.patch cmorve69(a)yahoo.es -- Remove build time from code so build-compare can make its work Patch5: no_buildtime.patch -Patch99: 2.2.2_patch.diff +Patch6: version-2.2.90.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kde4-amarok = 2.0.90 Obsoletes: kde4-amarok <= 2.0.89 @@ -86,7 +86,7 @@ %lang_package %prep -%setup -q -n %name-2.2.2 +%setup -q -n %name-2.2.2.90 #%patch %if %suse_version > 1110 %patch4 @@ -94,7 +94,7 @@ %patch3 %endif %patch5 -p0 -%patch99 -p1 +%patch6 -p1 %build %ifarch ppc ppc64 @@ -109,6 +109,8 @@ cd .. install -m 0644 /usr/share/mysql/english/errmsg.sys $RPM_BUILD_ROOT/usr/share/kde4/apps/amarok/errmsg.sys %suse_update_desktop_file -r amarok AudioVideo Player + rm -rf $RPM_BUILD_ROOT//usr/share/locale/sr@ijekavian + rm -rf $RPM_BUILD_ROOT//usr/share/locale/sr@ijekavianlatin %find_lang amarok %find_lang amarokcollectionscanner_qt amarok.lang %find_lang amarok_scriptengine_qscript amarok.lang @@ -138,6 +140,7 @@ %_libdir/libamaroklib.so.* %_libdir/libamarokpud.so.* %_libdir/libamarokocsclient.so.* +%_libdir/libamarok-sqlcollection.so.* %_libdir/strigi/strigita_audible.so %_libdir/strigi/strigita_mp4.so %{_datadir}/applications/kde4/amarok.desktop @@ -165,5 +168,6 @@ %{_libdir}/libamaroklib.so %{_libdir}/libamarokpud.so %{_libdir}/libamarokocsclient.so +%{_libdir}/libamarok-sqlcollection.so %changelog ++++++ amarok-2.2.2.tar.bz2 -> amarok-2.2.2.90.tar.bz2 ++++++ KDE/amarok/amarok-2.2.2.tar.bz2 /mounts/work_src_done/STABLE/amarok/amarok-2.2.2.90.tar.bz2 differ: char 11, line 1 ++++++ cmakelist.diff ++++++ --- /var/tmp/diff_new_pack.V5QML3/_old 2010-02-25 01:38:48.000000000 +0100 +++ /var/tmp/diff_new_pack.V5QML3/_new 2010-02-25 01:38:48.000000000 +0100 @@ -1,5 +1,5 @@ ---- cmake/modules/FindQtScriptQtBindings.cmake -+++ cmake/modules/FindQtScriptQtBindings.cmake +--- cmake/modules/FindQtScriptQtBindings.cmake 2010-02-03 09:28:07.000000000 +0100 ++++ cmake/modules/FindQtScriptQtBindings.cmake 2010-02-03 10:16:20.804007620 +0100 @@ -28,6 +28,7 @@ message( STATUS "includes ${CMAKE_REQUIRED_INCLUDES} libraries ${CMAKE_REQUIRED_LIBRARIES}" ) CHECK_CXX_SOURCE_RUNS( "${source}" BINDINGS_RUN_RESULT) @@ -8,10 +8,10 @@ if(BINDINGS_RUN_RESULT EQUAL 1) message( STATUS "QtBindings found") set(QTSCRIPTQTBINDINGS_FOUND TRUE) ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -55,6 +55,7 @@ - macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" ) +--- CMakeLists.txt 2010-02-03 09:28:07.000000000 +0100 ++++ CMakeLists.txt 2010-02-03 10:16:20.805007757 +0100 +@@ -77,6 +77,7 @@ + macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.3.0" "" ) find_package( QtScriptQtBindings REQUIRED ) + set(QTSCRIPTQTBINDINGS_FOUND TRUE) ++++++ errmsg-mysql-embedded.diff ++++++ --- /var/tmp/diff_new_pack.V5QML3/_old 2010-02-25 01:38:48.000000000 +0100 +++ /var/tmp/diff_new_pack.V5QML3/_new 2010-02-25 01:38:48.000000000 +0100 @@ -1,6 +1,6 @@ ---- src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp -+++ src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp -@@ -64,7 +64,7 @@ +--- src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 09:28:08.000000000 +0100 ++++ src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 10:20:47.240107457 +0100 +@@ -68,7 +68,7 @@ dir.mkpath( "." ); } @@ -9,7 +9,7 @@ char **server_options = new char* [ num_elements + 1 ]; server_options[0] = const_cast<char*>( "amarokmysqld" ); server_options[1] = defaultsLine; -@@ -78,6 +78,7 @@ +@@ -82,6 +82,7 @@ server_options[7] = const_cast<char*>( "--myisam-recover=FORCE" ); server_options[8] = const_cast<char*>( "--character-set-server=utf8" ); server_options[9] = const_cast<char*>( "--collation-server=utf8_bin" ); ++++++ errmsg-mysql51-embedded.diff ++++++ --- /var/tmp/diff_new_pack.V5QML3/_old 2010-02-25 01:38:48.000000000 +0100 +++ /var/tmp/diff_new_pack.V5QML3/_new 2010-02-25 01:38:48.000000000 +0100 @@ -1,6 +1,6 @@ ---- src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp -+++ src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp -@@ -64,20 +64,19 @@ +--- src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 09:28:08.000000000 +0100 ++++ src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 10:18:01.491257523 +0100 +@@ -68,20 +68,19 @@ dir.mkpath( "." ); } @@ -28,4 +28,3 @@ server_options[num_elements] = 0; char **server_groups = new char* [ 3 ]; - ++++++ no_buildtime.patch ++++++ --- /var/tmp/diff_new_pack.V5QML3/_old 2010-02-25 01:38:48.000000000 +0100 +++ /var/tmp/diff_new_pack.V5QML3/_new 2010-02-25 01:38:48.000000000 +0100 @@ -3,9 +3,9 @@ --- src/App.cpp +++ src/App.cpp @@ -119,7 +119,7 @@ - ki18n( "Amarok" ), APP_VERSION, + ki18n( "Amarok" ), AMAROK_VERSION, ki18n( "The audio player for KDE" ), KAboutData::License_GPL, - ki18n( "(C) 2002-2003, Mark Kretschmann\n(C) 2003-2009, The Amarok Development Squad" ), + ki18n( "(C) 2002-2003, Mark Kretschmann\n(C) 2003-2010, The Amarok Development Squad" ), - ki18n( "IRC:\nirc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n\nFeedback:\namarok@kde.org\n\n(Build Date: %1)" ).subs( __DATE__ ), + ki18n( "IRC:\nirc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n\nFeedback:\namarok@kde.org" ), ( "http://amarok.kde.org" ) ); ++++++ version-2.2.90.patch ++++++ Subject: Amend version because the amarok release team got it wrong, don't want to change it upstream and say it doesn't matter anyway. From: wstephenson(a)suse.de Patch-upstream: no Index: amarok-2.2.2.90/Version.h =================================================================== --- amarok-2.2.2.90.orig/Version.h +++ amarok-2.2.2.90/Version.h @@ -22,7 +22,7 @@ //#ifdef CURRENT_GIT_VERSION //#define AMAROK_VERSION #CURRENT_GIT_VERSION //#else -#define AMAROK_VERSION "2.2.2.90" +#define AMAROK_VERSION "2.2.90" //#endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit zypper for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Wed Feb 24 02:35:56 CET 2010. -------- --- zypper/zypper.changes 2010-02-08 20:43:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2010-02-22 17:24:23.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Feb 22 17:22:14 CET 2010 - jkupec(a)suse.cz + +- Avoiding confirmation of unchanged license on upgrade + (bnc #394396) + +------------------------------------------------------------------- +Sun Feb 21 14:17:39 CET 2010 - jkupec(a)suse.cz + +- clean --all: clean also garbage and zypper cache (bnc #467693) +- 1.2.18 + +------------------------------------------------------------------- +Fri Feb 19 12:01:39 CET 2010 - jkupec(a)suse.cz + +- Fixed broken --type (bnc #580571) + +------------------------------------------------------------------- +Wed Feb 10 16:01:15 CET 2010 - ma(a)suse.de + +- Fix 'zypper products' failing to list installed products under + certain conditions (bnc #578721) +- Fix SEGV if $HOME or $PWD are unset in the environment (bnc #578684) +- 1.2.17 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zypper-1.2.16.tar.bz2 New: ---- zypper-1.2.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.AMrcMN/_old 2010-02-24 02:35:51.000000000 +0100 +++ /var/tmp/diff_new_pack.AMrcMN/_new 2010-02-24 02:35:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 1.2.16) +# spec file for package zypper (Version 1.2.19) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: zypper -BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 6.28.0 +BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 6.30.0 BuildRequires: augeas-devel >= 0.5.0 readline-devel >= 5.1 BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1 Requires: procps @@ -31,7 +31,7 @@ AutoReqProv: on PreReq: permissions Summary: Command line software manager using libzypp -Version: 1.2.16 +Version: 1.2.19 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -61,6 +61,7 @@ %build mkdir build cd build + # Use different translation set for SUSE Linux Enterprise 10 SP1 # # The code base is the same, but SLES11-SP1 (suse_version == 1110) @@ -68,6 +69,7 @@ %if 0%{?suse_version} == 1110 %define use_translation_set sle-zypper %endif + cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DMANDIR=%{_mandir} \ @@ -77,6 +79,7 @@ -DCMAKE_BUILD_TYPE=Release \ %{?use_translation_set:-DUSE_TRANSLATION_SET=%use_translation_set} \ .. + #gettextize -f make %{?jobs:-j %jobs} make -C po %{?jobs:-j %jobs} translations @@ -85,6 +88,7 @@ cd build make install DESTDIR=$RPM_BUILD_ROOT make -C po install DESTDIR=$RPM_BUILD_ROOT + # Create filelist with translations cd .. %{find_lang} zypper @@ -94,6 +98,7 @@ %post /sbin/ldconfig %run_permissions + %verifyscript %verify_permissions -e %{_sbindir}/zypp-refresh-wrapper ++++++ zypper-1.2.16.tar.bz2 -> zypper-1.2.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/.gitignore new/zypper-1.2.19/.gitignore --- old/zypper-1.2.16/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/zypper-1.2.19/.gitignore 2010-02-22 17:23:33.000000000 +0100 @@ -0,0 +1,2 @@ +.* +build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/VERSION.cmake new/zypper-1.2.19/VERSION.cmake --- old/zypper-1.2.16/VERSION.cmake 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/VERSION.cmake 2010-02-22 17:23:33.000000000 +0100 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") -SET(VERSION_PATCH "16") +SET(VERSION_PATCH "19") -# LAST RELEASED: 1.2.16 +# LAST RELEASED: 1.2.19 #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/doc/zypper.8 new/zypper-1.2.19/doc/zypper.8 --- old/zypper-1.2.16/doc/zypper.8 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/doc/zypper.8 2010-02-22 17:23:33.000000000 +0100 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "1.2.16" "zypper" "System Tools" +.TH "zypper" "8" "1.2.19" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/package/zypper.changes new/zypper-1.2.19/package/zypper.changes --- old/zypper-1.2.16/package/zypper.changes 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/package/zypper.changes 2010-02-22 17:23:33.000000000 +0100 @@ -1,4 +1,29 @@ ------------------------------------------------------------------- +Mon Feb 22 17:22:14 CET 2010 - jkupec(a)suse.cz + +- Avoiding confirmation of unchanged license on upgrade + (bnc #394396) + +------------------------------------------------------------------- +Sun Feb 21 14:17:39 CET 2010 - jkupec(a)suse.cz + +- clean --all: clean also garbage and zypper cache (bnc #467693) +- 1.2.18 + +------------------------------------------------------------------- +Fri Feb 19 12:01:39 CET 2010 - jkupec(a)suse.cz + +- Fixed broken --type (bnc #580571) + +------------------------------------------------------------------- +Wed Feb 10 16:01:15 CET 2010 - ma(a)suse.de + +- Fix 'zypper products' failing to list installed products under + certain conditions (bnc #578721) +- Fix SEGV if $HOME or $PWD are unset in the environment (bnc #578684) +- 1.2.17 + +------------------------------------------------------------------- Mon Feb 8 20:30:08 CET 2010 - jkupec(a)suse.cz - Replaced .po files in source tree by tarballs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/src/Zypper.cc new/zypper-1.2.19/src/Zypper.cc --- old/zypper-1.2.16/src/Zypper.cc 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/src/Zypper.cc 2010-02-22 17:23:33.000000000 +0100 @@ -698,9 +698,13 @@ string histfile; try { - Pathname p (getenv ("HOME")); - p /= ".zypper_history"; - histfile = p.asString (); + const char * env = getenv ("HOME"); + if ( env ) + { + Pathname p( env ); + p /= ".zypper_history"; + histfile = p.asString (); + } } catch (...) { // no history } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/src/install.cc new/zypper-1.2.19/src/install.cc --- old/zypper-1.2.16/src/install.cc 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/src/install.cc 2010-02-22 17:23:33.000000000 +0100 @@ -637,6 +637,28 @@ // parse the rest of the string as standard zypp package specifier Capability parsedcap = Capability::guessPackageSpec(str); Capability namecap("", str, "", "", kind); + sat::Solvable::SplitIdent splid(parsedcap.detail().name()); + + // set the right kind (bnc #580571) + // prefer those specified in args + // if not in args, use the one from --type + if (zypper.cOpts().count("type") && splid.kind() != kind) + { + // kind specified in arg, too - just warn and let it be + if (parsedcap.detail().name().asString().find(':') != string::npos) + zypper.out().warning(str::form( + _("Different package type specified in '%s' option and '%s' argument. Will use the latter."), + "--type", str.c_str())); + // no kind specified in arg, use --type + else + parsedcap = Capability( + Arch(parsedcap.detail().arch()), + splid.name().asString(), + parsedcap.detail().op(), + parsedcap.detail().ed(), + kind); + } + MIL << "got '" << parsedcap << "'" << endl; // mark by name by force diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/src/misc.cc new/zypper-1.2.19/src/misc.cc --- old/zypper-1.2.16/src/misc.cc 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/src/misc.cc 2010-02-22 17:23:33.000000000 +0100 @@ -132,6 +132,28 @@ if (it->status().isToBeInstalled() && !it->resolvable()->licenseToConfirm().empty()) { + ui::Selectable::Ptr selectable = + God->pool().proxy().lookup(it->resolvable()->kind(), it->resolvable()->name()); + + // this is an upgrade, check whether the license changed + // for now we only do dumb string comparison (bnc #394396) + if (selectable->hasInstalledObj()) + { + bool differ = false; + for_(inst, selectable->installedBegin(), selectable->installedEnd()) + if (inst->resolvable()->licenseToConfirm() != it->resolvable()->licenseToConfirm()) + { differ = true; break; } + + if (!differ) + { + DBG << "old and new license does not differ for " + << it->resolvable()->name() << endl; + continue; + } + DBG << "new license for " << it->resolvable()->name() + << " is different, needs confirmation " << endl; + } + if (license_auto_agree) { zypper.out().info(boost::str( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/src/repos.cc new/zypper-1.2.19/src/repos.cc --- old/zypper-1.2.16/src/repos.cc 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/src/repos.cc 2010-02-22 17:23:33.000000000 +0100 @@ -1309,6 +1309,19 @@ } } + if (zypper.arguments().empty() && copts.find("all") != copts.end()) + { + // clean up garbage + // this could also be done with a special option or on each 'clean' + // regardless of the options used ... + manager.cleanCacheDirGarbage(); + + // clean zypper's cache + // this could also be done with a special option + filesystem::recursive_rmdir( + Pathname(zypper.globalOpts().root_dir) / ZYPPER_RPM_CACHE_DIR); + } + if (error_count >= enabled_repo_count) { zypper.out().error(_("Could not clean the repositories because of errors.")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/src/search.cc new/zypper-1.2.19/src/search.cc --- old/zypper-1.2.16/src/search.cc 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/src/search.cc 2010-02-22 17:23:33.000000000 +0100 @@ -551,6 +551,26 @@ cout << "</product-list>" << endl; } +// common product_table_row data +static void add_product_table_row( Zypper & zypper, TableRow & tr, const Product::constPtr & product ) +{ + // repository + if (!zypper.globalOpts().is_rug_compatible) + tr << product->repoInfo().name(); + // name + tr << product->name () << product->edition().asString(); + if (zypper.globalOpts().is_rug_compatible) + // rug 'Category' + tr << (product->isTargetDistribution() ? "base" : ""); + else + { + // architecture + tr << product->arch().asString(); + // is base + tr << (product->isTargetDistribution() ? _("Yes") : _("No")); + } +} + static void list_product_table(Zypper & zypper) { MIL << "Going to list packages." << std::endl; @@ -589,27 +609,33 @@ if (!s->installedEmpty()) installed = s->installedObj(); + bool missedInstalled = installed; // if no available hits, we need to print it + // show available objects for_(it, s->availableBegin(), s->availableEnd()) { Product::constPtr product = asKind<Product>(it->resolvable()); TableRow tr; zypp::PoolItem pi = *it; - string repo = product->repoInfo().name(); if (installed) { - if (notinst_only) - continue; if (equalNVRA(*installed.resolvable(), *pi.resolvable())) { + if (notinst_only) + continue; tr << "i"; // this is needed, other isTargetDistribution would not return // true for the installed base product product = asKind<Product>(installed); + missedInstalled = false; } else + { + if (installed_only) + continue; tr << "v"; + } } else { @@ -617,21 +643,19 @@ continue; tr << ""; } - // repository - if (!zypper.globalOpts().is_rug_compatible) - tr << repo; - // name - tr << product->name () << product->edition().asString(); - if (zypper.globalOpts().is_rug_compatible) - // rug 'Category' - tr << (product->isTargetDistribution() ? "base" : ""); - else - { - // architecture - tr << product->arch().asString(); - // is base - tr << (product->isTargetDistribution() ? _("Yes") : _("No")); - } + add_product_table_row( zypper, tr, product ); + tbl << tr; + } + + if ( missedInstalled ) // no available hit, we need to print it + { + // show installed product in ablence of an available one: + if (notinst_only) + continue; + + TableRow tr; + tr << "i"; + add_product_table_row( zypper, tr, installed->asKind<Product>() ); tbl << tr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/src/utils/Augeas.cc new/zypper-1.2.19/src/utils/Augeas.cc --- old/zypper-1.2.16/src/utils/Augeas.cc 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/src/utils/Augeas.cc 2010-02-22 17:23:33.000000000 +0100 @@ -35,7 +35,8 @@ want_custom = true; if (filepath.relative()) { - string wd = ::getenv("PWD"); + const char * env = ::getenv("PWD"); + string wd = env ? env : "."; filepath = wd / filepath; } @@ -44,7 +45,9 @@ } else { - _homedir = ::getenv("HOME"); + const char * env = ::getenv("HOME"); + if ( env ) + _homedir = env; if (_homedir.empty()) WAR << "Cannot figure out user's home directory. Skipping user's config." << endl; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.16/zypper.spec.cmake new/zypper-1.2.19/zypper.spec.cmake --- old/zypper-1.2.16/zypper.spec.cmake 2010-02-08 21:26:37.000000000 +0100 +++ new/zypper-1.2.19/zypper.spec.cmake 2010-02-22 17:23:33.000000000 +0100 @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 6.28.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 +BuildRequires: libzypp-devel >= 6.30.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit zisofs-tools for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package zisofs-tools for openSUSE:Factory checked in at Wed Feb 24 02:35:50 CET 2010. -------- --- zisofs-tools/zisofs-tools.changes 2007-03-29 15:44:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/zisofs-tools/zisofs-tools.changes 2010-02-15 16:17:02.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 15 15:54:10 CET 2010 - dimstar(a)opensuse.org + +- Update to version 1.0.8: + + This release fixes the --sloppy option, which was documented + but did not work. +- Spec cleanup. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zisofs-tools-1.0.6.tar.bz2 New: ---- zisofs-tools-1.0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zisofs-tools.spec ++++++ --- /var/tmp/diff_new_pack.iy5Mad/_old 2010-02-24 02:35:41.000000000 +0100 +++ /var/tmp/diff_new_pack.iy5Mad/_new 2010-02-24 02:35:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package zisofs-tools (Version 1.0.6) +# spec file for package zisofs-tools (Version 1.0.8) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -21,12 +21,12 @@ Name: zisofs-tools BuildRequires: zlib-devel Url: ftp://ftp.kernel.org/pub/linux/utils/fs/zisofs/ -License: GPL v2 or later +License: GPLv2+ Group: System/Filesystems Requires: mkisofs AutoReqProv: on -Version: 1.0.6 -Release: 138 +Version: 1.0.8 +Release: 1 Summary: User tools for zisofs Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,30 +39,23 @@ such a filesystem and read compressed files on a system without zisofs support. - - -Authors: --------- - H. Peter Anvin <hpa(a)zytor.com> - %prep %setup -#%patch %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --mandir=%{_mandir} -make +make %{?jobs:-j%jobs} %install make INSTALLROOT=$RPM_BUILD_ROOT install %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf %{buildroot} %files %defattr(-,root,root) %doc CHANGES COPYING INSTALL README -/usr/bin/mkzftree +%{_bindir}/mkzftree %doc %{_mandir}/man1/mkzftree.1* %changelog ++++++ zisofs-tools-1.0.6.tar.bz2 -> zisofs-tools-1.0.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/compress.c new/zisofs-tools-1.0.8/compress.c --- old/zisofs-tools-1.0.6/compress.c 2001-07-31 05:20:52.000000000 +0200 +++ new/zisofs-tools-1.0.8/compress.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,7 +1,7 @@ -/* $Id: compress.c,v 1.3 2001/07/31 03:20:52 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -11,19 +11,21 @@ * * ----------------------------------------------------------------------- */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdlib.h> #include <stdio.h> #include <utime.h> #include <unistd.h> #include <zlib.h> -#include "mkzftree.h" + #include "iso9660.h" int block_compress_file(FILE *input, FILE *output, off_t size) { struct compressed_file_header hdr; - char inbuf[CBLOCK_SIZE], outbuf[2*CBLOCK_SIZE]; + Bytef inbuf[CBLOCK_SIZE], outbuf[2*CBLOCK_SIZE]; size_t bytes, pointer_bytes, nblocks, block; uLong cbytes; /* uLong is a zlib datatype */ char *pointer_block, *curptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/configure new/zisofs-tools-1.0.8/configure --- old/zisofs-tools-1.0.6/configure 2004-07-20 06:24:29.000000000 +0200 +++ new/zisofs-tools-1.0.8/configure 2007-05-17 07:49:53.000000000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.7 2004/07/20 04:04:22 hpa Exp . +# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/configure.in new/zisofs-tools-1.0.8/configure.in --- old/zisofs-tools-1.0.6/configure.in 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/configure.in 2007-05-17 07:49:47.000000000 +0200 @@ -3,7 +3,7 @@ dnl AC_PREREQ(2.57) -AC_REVISION([$Id: configure.in,v 1.7 2004/07/20 04:04:22 hpa Exp $]) +AC_REVISION([$Id$]) AC_INIT(MCONFIG.in) AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/copytime.c new/zisofs-tools-1.0.8/copytime.c --- old/zisofs-tools-1.0.6/copytime.c 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/copytime.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: copytime.c,v 1.1 2004/07/20 04:04:22 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * * Copyright 2004 H. Peter Anvin - All Rights Reserved @@ -12,12 +12,12 @@ * ----------------------------------------------------------------------- */ /* - * copytime.h + * copytime.c * * Copy time(s) from a struct stat */ -#include "mkzftree.h" +#include "mkzftree.h" /* Must be included first! */ #include <utime.h> #include <sys/time.h> @@ -52,4 +52,3 @@ #endif } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/hash.c new/zisofs-tools-1.0.8/hash.c --- old/zisofs-tools-1.0.6/hash.c 2003-07-11 05:24:01.000000000 +0200 +++ new/zisofs-tools-1.0.8/hash.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -#ident "$Id: hash.c,v 1.2 2003/07/11 03:24:01 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved @@ -17,7 +17,7 @@ * Hash table used to find hard-linked files */ -#include "mkzftree.h" +#include "mkzftree.h" /* Must be included first! */ #define HASH_BUCKETS 2683 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/iso9660.c new/zisofs-tools-1.0.8/iso9660.c --- old/zisofs-tools-1.0.6/iso9660.c 2001-07-27 16:37:08.000000000 +0200 +++ new/zisofs-tools-1.0.8/iso9660.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: iso9660.c,v 1.1 2001/07/27 14:37:08 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/iso9660.h new/zisofs-tools-1.0.8/iso9660.h --- old/zisofs-tools-1.0.6/iso9660.h 2001-07-27 21:49:08.000000000 +0200 +++ new/zisofs-tools-1.0.8/iso9660.h 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -#ident "$Id: iso9660.h,v 1.3 2001/07/27 19:49:08 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved @@ -13,6 +13,9 @@ /* zisofs definitions */ +#ifndef ISO9660_H +#define ISO9660_H + #ifndef CBLOCK_SIZE_LG2 #define CBLOCK_SIZE_LG2 15 /* Compressed block size */ #endif @@ -43,3 +46,5 @@ void set_733(void *, unsigned int); #define get_723(x) get_721(x) #define get_733(x) get_731(x) + +#endif /* ISO9660_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/mkzftree.1 new/zisofs-tools-1.0.8/mkzftree.1 --- old/zisofs-tools-1.0.6/mkzftree.1 2004-07-20 06:03:53.000000000 +0200 +++ new/zisofs-tools-1.0.8/mkzftree.1 2007-05-17 07:49:48.000000000 +0200 @@ -1,4 +1,4 @@ -.\" $Id: mkzftree.1,v 1.13 2004/07/20 04:03:53 hpa Exp $ +.\" $Id$ .\" ----------------------------------------------------------------------- .\" .\" Copyright 2001 H. Peter Anvin - All Rights Reserved diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/mkzftree.c new/zisofs-tools-1.0.8/mkzftree.c --- old/zisofs-tools-1.0.6/mkzftree.c 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/mkzftree.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: mkzftree.c,v 1.17 2004/07/20 04:04:22 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved @@ -59,6 +59,8 @@ * The block data is compressed according to "zlib". */ +#include "mkzftree.h" /* Must be included first! */ + #include <errno.h> #include <stdlib.h> #include <string.h> @@ -69,13 +71,12 @@ #include <sys/types.h> #include <sys/time.h> -#include "mkzftree.h" -#include "version.h" - #ifdef HAVE_GETOPT_H #include <getopt.h> #endif +#include "version.h" + /* Command line options */ struct cmdline_options opt = { 0, /* Force compression */ @@ -94,7 +95,7 @@ const char *program; /* Long options */ -#define OPTSTRING "fz:up:xXC:lLFvqV:hw" +#define OPTSTRING "fz:up:xXC:lLFvqV:hws" #ifdef HAVE_GETOPT_LONG const struct option long_options[] = { { "force", 0, 0, 'f' }, @@ -112,6 +113,7 @@ { "verbosity", 1, 0, 'V' }, { "help", 0, 0, 'h' }, { "version", 0, 0, 'w' }, + { "sloppy", 0, 0, 's' }, { 0, 0, 0, 0 } }; #define LO(X) X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/mkzftree.h new/zisofs-tools-1.0.8/mkzftree.h --- old/zisofs-tools-1.0.6/mkzftree.h 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/mkzftree.h 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -#ident "$Id: mkzftree.h,v 1.6 2004/07/20 04:04:22 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -11,7 +11,12 @@ * * ----------------------------------------------------------------------- */ +#ifndef MKZFTREE_H +#define MKZFTREE_H + +/* config.h should be included before any system headers!!!! */ #include "config.h" + #include <stddef.h> #include <stdlib.h> #include <string.h> @@ -95,3 +100,4 @@ /* copytime.h */ int copytime(const char *, const struct stat *); +#endif /* MKZFTREE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/uncompress.c new/zisofs-tools-1.0.8/uncompress.c --- old/zisofs-tools-1.0.6/uncompress.c 2001-07-27 21:49:08.000000000 +0200 +++ new/zisofs-tools-1.0.8/uncompress.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -/* $Id: uncompress.c,v 1.2 2001/07/27 19:49:08 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -11,16 +11,18 @@ * * ----------------------------------------------------------------------- */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdio.h> #include <stdlib.h> #include <zlib.h> -#include "mkzftree.h" + #include "iso9660.h" int block_uncompress_file(FILE *input, FILE *output, off_t size) { struct compressed_file_header hdr; - char *inbuf, *outbuf; + Bytef *inbuf, *outbuf; int block_shift; char *pointer_block, *pptr; unsigned long nblocks; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/util.c new/zisofs-tools-1.0.8/util.c --- old/zisofs-tools-1.0.6/util.c 2001-07-31 05:20:52.000000000 +0200 +++ new/zisofs-tools-1.0.8/util.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -/* $Id: util.c,v 1.2 2001/07/31 03:20:52 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -11,12 +11,13 @@ * * ----------------------------------------------------------------------- */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdio.h> #include <errno.h> #include <stdlib.h> #include <stdarg.h> #include <string.h> -#include "mkzftree.h" /* Convenience functions */ void *xmalloc(size_t size) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/version new/zisofs-tools-1.0.8/version --- old/zisofs-tools-1.0.6/version 2004-07-20 06:07:19.000000000 +0200 +++ new/zisofs-tools-1.0.8/version 2007-05-17 07:49:48.000000000 +0200 @@ -1 +1 @@ -1.0.6 +1.0.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/walk.c new/zisofs-tools-1.0.8/walk.c --- old/zisofs-tools-1.0.6/walk.c 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/walk.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -#ident "$Id: walk.c,v 1.6 2004/07/20 04:04:22 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * - * Copyright 2001-2002 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ * Functions to walk the file tree */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdlib.h> #include <stdio.h> #include <limits.h> @@ -26,7 +28,7 @@ #include <unistd.h> #include <sys/stat.h> #include <sys/types.h> -#include "mkzftree.h" + #include "iso9660.h" static int munge_file(const char *inpath, const char *outpath, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/workers.c new/zisofs-tools-1.0.8/workers.c --- old/zisofs-tools-1.0.6/workers.c 2001-07-31 05:20:52.000000000 +0200 +++ new/zisofs-tools-1.0.8/workers.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -#ident "$Id: workers.c,v 1.2 2001/07/31 03:20:52 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,13 +17,14 @@ * Parallel job maintenance */ +#include "mkzftree.h" /* Must be included first! */ + #include <stddef.h> #include <stdlib.h> #include <unistd.h> #include <signal.h> #include <stdio.h> #include <sys/wait.h> -#include "mkzftree.h" /* Global option */ extern int parallel; /* Number of parallel jobs */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/zisofs-tools.spec new/zisofs-tools-1.0.8/zisofs-tools.spec --- old/zisofs-tools-1.0.6/zisofs-tools.spec 2004-07-20 06:25:03.000000000 +0200 +++ new/zisofs-tools-1.0.8/zisofs-tools.spec 2007-05-17 07:50:08.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Utilities to create compressed CD-ROM filesystems. Name: zisofs-tools -Version: 1.0.6 +Version: 1.0.8 Release: 1 License: GPL Group: Applications/System ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yudit for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package yudit for openSUSE:Factory checked in at Wed Feb 24 02:35:39 CET 2010. -------- --- yudit/yudit.changes 2009-12-02 19:55:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/yudit/yudit.changes 2010-02-15 17:19:02.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Feb 15 17:00:26 CET 2010 - dimstar(a)opensuse.org + +- Update to version 2.9.2: + + Updated to Unicode 5.2.0 + + Landscape printing bug fixed + + DOS CRLF with uniconv bug fixed + + Hungarian Runes (PUA) rovasiras glyph adjustments + + Windows port now behaves itself + + Minor enhancements +- Drop bnc445708-delete-array.patch, merged upstream. +- Add yudit-2.9.2.patch0.txt from upstream 'patch folder'. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bnc445708-delete-array.patch yudit-2.9.0.tar.bz2 New: ---- yudit-2.9.2.patch0.txt yudit-2.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yudit.spec ++++++ --- /var/tmp/diff_new_pack.bOJXQD/_old 2010-02-24 02:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.bOJXQD/_new 2010-02-24 02:35:32.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yudit (Version 2.9.0) +# spec file for package yudit (Version 2.9.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -35,8 +35,8 @@ Group: Productivity/Editors/Other AutoReqProv: on PreReq: %suseconfig_fonts_prereq -Version: 2.9.0 -Release: 73 +Version: 2.9.2 +Release: 1 Url: http://www.yudit.org/ Icon: %{name}.gif Source0: http://yudit.org/download/yudit-%{version}.tar.bz2 @@ -46,8 +46,9 @@ Patch2: yudit-setlocale.patch Patch3: print-preview.patch Patch7: yudit-strip.patch -Patch8: bnc445708-delete-array.patch Patch9: uniprint-catch-bad_alloc-exceptions.patch +# PATCH-FIX-UPSTREAM yudit-2.9.2.patch0.txt dimstar(a)opensuse.org -- Fix segfault when hunspell is used on expanding line. +Patch10: yudit-2.9.2.patch0.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Unicode text editor @@ -55,12 +56,6 @@ yudit is a unicode package to edit and convert text of different languages. - - -Authors: --------- - Gaspar Sinai <gsinai(a)iname.com> - %prep %setup -q #%patch0 -p1 @@ -68,8 +63,8 @@ %patch2 -p1 -b .setlocale %patch3 -p1 -b .print-preview %patch7 -%patch8 -p1 %patch9 -p1 -b .catch-bad_alloc-exceptions +%patch10 -p1 for i in doc/HOWTO-baybayin.txt COPYING.TXT README.TXT doc/HOWTO-devanagari.txt doc/bidi/yudit.css doc/HOWTO-syntax.txt doc/notinstalled/cl.help do dos2unix $i ++++++ print-preview.patch ++++++ --- /var/tmp/diff_new_pack.bOJXQD/_old 2010-02-24 02:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.bOJXQD/_new 2010-02-24 02:35:32.000000000 +0100 @@ -1,7 +1,8 @@ -diff -ru yudit-2.7.6.orig/gui/SYudit.cpp yudit-2.7.6/gui/SYudit.cpp ---- yudit-2.7.6.orig/gui/SYudit.cpp 2003-08-15 14:35:17.000000000 +0200 -+++ yudit-2.7.6/gui/SYudit.cpp 2004-01-15 15:35:02.117362321 +0100 -@@ -2106,6 +2106,7 @@ +Index: yudit-2.9.2/gui/SYudit.cpp +=================================================================== +--- yudit-2.9.2.orig/gui/SYudit.cpp ++++ yudit-2.9.2/gui/SYudit.cpp +@@ -2414,6 +2414,7 @@ SYudit::addMytoolPrefix (SString* execut } #else SString pr = getPrefix(); @@ -9,4 +10,3 @@ pr.append ("/bin/mytool"); SFile f0 (pr); if (f0.size () <= 0) - ++++++ uniprint-catch-bad_alloc-exceptions.patch ++++++ --- /var/tmp/diff_new_pack.bOJXQD/_old 2010-02-24 02:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.bOJXQD/_new 2010-02-24 02:35:32.000000000 +0100 @@ -1,7 +1,7 @@ -Index: yudit-2.9.0/uniprint/Main.cpp +Index: yudit-2.9.2/uniprint/Main.cpp =================================================================== ---- yudit-2.9.0.orig/uniprint/Main.cpp -+++ yudit-2.9.0/uniprint/Main.cpp +--- yudit-2.9.2.orig/uniprint/Main.cpp ++++ yudit-2.9.2/uniprint/Main.cpp @@ -37,6 +37,8 @@ #include <string.h> #include <stdlib.h> @@ -10,8 +10,8 @@ + #define BUFFER_SIZE 512 - static char *version="uniprint verison %s GNU(c) Gaspar Sinai\n"; -@@ -314,11 +316,20 @@ main (int argc, char *argv[]) + static const char *version="uniprint verison %s GNU(c) Gaspar Sinai\n"; +@@ -318,11 +320,20 @@ main (int argc, char *argv[]) uniPrint.setLineEndMark(shownl); uniPrint.setWordWrap(wrap); ++++++ yudit-2.9.2.patch0.txt ++++++ This patch fixes segmentation fault when hunspell is used on an expaning line. Gaspar Sinai <gsinai(a)yudit.org> Tokyo 2010-02-15 *** yudit-2.9.2/stoolkit/syntax/SSyntax.cpp- 2007-12-09 16:43:25.000000000 +0900 --- yudit-2.9.2/stoolkit/syntax/SSyntax.cpp 2010-02-15 19:40:10.984291072 +0900 *************** *** 228,231 **** --- 228,232 ---- } if (i==max) return SD_ERROR; + if (syntaxLines[index.line]->size()<=i) return SD_ERROR; return (SS_Tag) (syntaxLines[index.line]->peek (i) & 0xff); } ++++++ yudit-2.9.0.tar.bz2 -> yudit-2.9.2.tar.bz2 ++++++ ++++ 20240 lines of diff (skipped) ++++++ yudit-properties.patch ++++++ --- /var/tmp/diff_new_pack.bOJXQD/_old 2010-02-24 02:35:33.000000000 +0100 +++ /var/tmp/diff_new_pack.bOJXQD/_new 2010-02-24 02:35:33.000000000 +0100 @@ -1,7 +1,8 @@ -diff -ru yudit-2.8.2.beta18.orig/yudit.properties.in yudit-2.8.2.beta18/yudit.properties.in ---- yudit-2.8.2.beta18.orig/yudit.properties.in 2007-11-28 02:31:32.000000000 +0100 -+++ yudit-2.8.2.beta18/yudit.properties.in 2007-12-05 17:08:07.000000000 +0100 -@@ -36,7 +36,7 @@ +Index: yudit-2.9.2/yudit.properties.in +=================================================================== +--- yudit-2.9.2.orig/yudit.properties.in ++++ yudit-2.9.2/yudit.properties.in +@@ -36,7 +36,7 @@ yudit.datapath=@YUDIT_DATA@/data # # This is where the .ttf (True Type font) files are # ++++++ yudit-setlocale.patch ++++++ --- /var/tmp/diff_new_pack.bOJXQD/_old 2010-02-24 02:35:33.000000000 +0100 +++ /var/tmp/diff_new_pack.bOJXQD/_new 2010-02-24 02:35:33.000000000 +0100 @@ -1,8 +1,8 @@ -Index: yudit-2.9.0/swindow/sx11/SXInputMethod.cpp +Index: yudit-2.9.2/swindow/sx11/SXInputMethod.cpp =================================================================== ---- yudit-2.9.0.orig/swindow/sx11/SXInputMethod.cpp 2007-11-09 14:27:08.000000000 +0100 -+++ yudit-2.9.0/swindow/sx11/SXInputMethod.cpp 2009-12-02 19:55:21.000000000 +0100 -@@ -795,9 +795,9 @@ SXInputMethod::createIC (const SString& +--- yudit-2.9.2.orig/swindow/sx11/SXInputMethod.cpp ++++ yudit-2.9.2/swindow/sx11/SXInputMethod.cpp +@@ -805,9 +805,9 @@ SXInputMethod::createIC (const SString& SString zlocale = slocale; if (zlocale.size() == 0) zlocale = "C"; zlocale.append ((char)0); @@ -14,7 +14,7 @@ fprintf (stderr, "Locale %s is not supported by C library.\n", zlocale.array()); } -@@ -919,10 +919,10 @@ SXInputMethod::createIC (const SString& +@@ -929,10 +929,10 @@ SXInputMethod::createIC (const SString& icEncoding = ""; localeOK = false; #ifdef HAVE_LOCALE @@ -28,7 +28,7 @@ fprintf (stderr, "Locale C is not supported by C library.\n"); } else if (!XSupportsLocale()) -@@ -932,7 +932,7 @@ SXInputMethod::createIC (const SString& +@@ -942,7 +942,7 @@ SXInputMethod::createIC (const SString& else { localeOK = true; ++++++ yudit-strip.patch ++++++ --- /var/tmp/diff_new_pack.bOJXQD/_old 2010-02-24 02:35:33.000000000 +0100 +++ /var/tmp/diff_new_pack.bOJXQD/_new 2010-02-24 02:35:33.000000000 +0100 @@ -1,6 +1,8 @@ ---- Makefile.conf.in +Index: Makefile.conf.in +=================================================================== +--- Makefile.conf.in.orig +++ Makefile.conf.in -@@ -23,8 +23,7 @@ +@@ -23,8 +23,7 @@ CPPFLAGS = -I$(TOPDIR) @CPPFLAGS@ -Wall INSTALL = @INSTALL@ YUDIT_DATA = @YUDIT_DATA@ INSTALL = $(TOPDIR)/bin/install-sh -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

commit ypserv for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package ypserv for openSUSE:Factory checked in at Wed Feb 24 02:35:31 CET 2010. -------- --- ypserv/ypserv.changes 2010-01-27 13:22:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/ypserv/ypserv.changes 2010-02-23 15:05:53.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 23 15:05:33 CET 2010 - kukuk(a)suse.de + +- Update to version 2.23 + - Create pid file for rpc.ypxfrd, too + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ypserv-2.22.diff ypserv-2.22.tar.bz2 New: ---- ypserv-2.23.diff ypserv-2.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypserv.spec ++++++ --- /var/tmp/diff_new_pack.H5rXpq/_old 2010-02-24 02:35:26.000000000 +0100 +++ /var/tmp/diff_new_pack.H5rXpq/_new 2010-02-24 02:35:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ypserv (Version 2.22) +# spec file for package ypserv (Version 2.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Requires: make portmap gawk AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.22 +Version: 2.23 Release: 1 Summary: YP - (NIS)-Server PreReq: %insserv_prereq %fillup_prereq ++++++ ypserv-2.22.diff -> ypserv-2.23.diff ++++++ ++++++ ypserv-2.22.tar.bz2 -> ypserv-2.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/ChangeLog new/ypserv-2.23/ChangeLog --- old/ypserv-2.22/ChangeLog 2010-01-27 13:03:40.000000000 +0100 +++ new/ypserv-2.23/ChangeLog 2010-02-23 14:46:39.000000000 +0100 @@ -1,3 +1,15 @@ +2010-02-23 Thorsten Kukuk <kukuk(a)suse.de> + + * release version 2.23 + + * lib/Makefile.am: Add pidfile.c, pidfile.h + * lib/pidfile.c: New. + * lib/pidfile.h: New. + * rpc.yppasswdd/yppasswdd.c: Use create_pidfile(). + * rpc.ypxfrd/ypxfrd.c: Likewise. + * ypserv/ypserv.c: Likewise. + Patch from Karel Klic <kklic(a)redhat.com>. + 2010-01-27 Thorsten Kukuk <kukuk(a)suse.de> * release version 2.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/NEWS new/ypserv-2.23/NEWS --- old/ypserv-2.22/NEWS 2010-01-27 13:09:16.000000000 +0100 +++ new/ypserv-2.23/NEWS 2010-02-23 14:47:02.000000000 +0100 @@ -1,10 +1,13 @@ ypserv NEWS -- history of user-visible changes. -Copyright (C) 1998-2009 Thorsten Kukuk +Copyright (C) 1998-2010 Thorsten Kukuk Please send bug reports, questions and suggestions to <kukuk(a)linux-nis.org>. +Version 2.23 +* rpc.ypxfrd creates now a pid file + Version 2.22 * Update ypserv.8 manual page * Fix possible memory corruption bug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/configure new/ypserv-2.23/configure --- old/ypserv-2.22/configure 2010-01-27 13:02:40.000000000 +0100 +++ new/ypserv-2.23/configure 2010-02-23 14:48:36.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for ypserv 2.22. +# Generated by GNU Autoconf 2.63 for ypserv 2.23. # # Report bugs to <kukuk(a)linux-nis.org>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='ypserv' PACKAGE_TARNAME='ypserv' -PACKAGE_VERSION='2.22' -PACKAGE_STRING='ypserv 2.22' +PACKAGE_VERSION='2.23' +PACKAGE_STRING='ypserv 2.23' PACKAGE_BUGREPORT='kukuk(a)linux-nis.org' ac_unique_file="ypserv/ypserv.c" @@ -1317,7 +1317,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 ypserv 2.22 to adapt to many kinds of systems. +\`configure' configures ypserv 2.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ypserv 2.22:";; + short | recursive ) echo "Configuration of ypserv 2.23:";; esac cat <<\_ACEOF @@ -1483,7 +1483,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ypserv configure 2.22 +ypserv configure 2.23 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1497,7 +1497,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ypserv $as_me 2.22, which was +It was created by ypserv $as_me 2.23, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2346,7 +2346,7 @@ # Define the identity of the package. PACKAGE='ypserv' - VERSION='2.22' + VERSION='2.23' cat >>confdefs.h <<_ACEOF @@ -10992,7 +10992,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ypserv $as_me 2.22, which was +This file was extended by ypserv $as_me 2.23, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11055,7 +11055,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -ypserv config.status 2.22 +ypserv config.status 2.23 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/configure.in new/ypserv-2.23/configure.in --- old/ypserv-2.22/configure.in 2010-01-27 13:02:18.000000000 +0100 +++ new/ypserv-2.23/configure.in 2010-02-23 14:47:08.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (C) 1999-2009 Thorsten Kukuk <kukuk(a)linux-nis.org> # dnl Process this file with autoconf to produce a configure script. -AC_INIT(ypserv, 2.22, kukuk(a)linux-nis.org) +AC_INIT(ypserv, 2.23, kukuk(a)linux-nis.org) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ypserv/ypserv.c]) AM_CONFIG_HEADER(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/lib/Makefile.am new/ypserv-2.23/lib/Makefile.am --- old/ypserv-2.22/lib/Makefile.am 2005-04-07 08:57:53.000000000 +0200 +++ new/ypserv-2.23/lib/Makefile.am 2010-02-23 14:44:55.000000000 +0100 @@ -9,7 +9,7 @@ noinst_LIBRARIES = libyp.a noinst_HEADERS = log_msg.h yp.h ypserv_conf.h ypxfrd.h access.h yp_db.h \ - compat.h + compat.h pidfile.h rpcsvc_HEADERS = ypxfrd.x @@ -18,6 +18,7 @@ AM_CFLAGS = @PIE_CFLAGS@ libyp_a_SOURCES = log_msg.c ypserv_conf.c ypxfrd_xdr.c \ - ypproc_match_2.c securenets.c access.c yp_db.c compat.c + ypproc_match_2.c securenets.c access.c yp_db.c \ + compat.c pidfile.c CLEANFILES = *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/lib/Makefile.in new/ypserv-2.23/lib/Makefile.in --- old/ypserv-2.22/lib/Makefile.in 2010-01-27 13:02:32.000000000 +0100 +++ new/ypserv-2.23/lib/Makefile.in 2010-02-23 14:48:33.000000000 +0100 @@ -58,7 +58,7 @@ am_libyp_a_OBJECTS = log_msg.$(OBJEXT) ypserv_conf.$(OBJEXT) \ ypxfrd_xdr.$(OBJEXT) ypproc_match_2.$(OBJEXT) \ securenets.$(OBJEXT) access.$(OBJEXT) yp_db.$(OBJEXT) \ - compat.$(OBJEXT) + compat.$(OBJEXT) pidfile.$(OBJEXT) libyp_a_OBJECTS = $(am_libyp_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -206,13 +206,14 @@ rpcsvcdir = ${prefix}/include/rpcsvc noinst_LIBRARIES = libyp.a noinst_HEADERS = log_msg.h yp.h ypserv_conf.h ypxfrd.h access.h yp_db.h \ - compat.h + compat.h pidfile.h rpcsvc_HEADERS = ypxfrd.x INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) AM_CFLAGS = @PIE_CFLAGS@ libyp_a_SOURCES = log_msg.c ypserv_conf.c ypxfrd_xdr.c \ - ypproc_match_2.c securenets.c access.c yp_db.c compat.c + ypproc_match_2.c securenets.c access.c yp_db.c \ + compat.c pidfile.c CLEANFILES = *~ all: all-am @@ -266,6 +267,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log_msg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/securenets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yp_db.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ypproc_match_2.Po@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/lib/pidfile.c new/ypserv-2.23/lib/pidfile.c --- old/ypserv-2.22/lib/pidfile.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ypserv-2.23/lib/pidfile.c 2010-02-23 14:44:55.000000000 +0100 @@ -0,0 +1,88 @@ +/* Copyright (c) 2009 Thorsten Kukuk + Author: Thorsten Kukuk <kukuk(a)suse.de> + + The YP Server is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The YP Server is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with the YP Server; see the file COPYING. If + not, write to the Free Software Foundation, Inc., 675 Mass Ave, + Cambridge, MA 02139, USA. */ + +#include "pidfile.h" +#include "log_msg.h" +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/file.h> + +void +create_pidfile (const char *filename, const char *daemonname) +{ + int fd, left, written; + pid_t pid; + char pbuf[50], *ptr; + struct flock lock; + + fd = open (filename, O_CREAT | O_RDWR, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if (fd < 0) + { + log_msg ("cannot create pidfile %s", filename); + if (debug_flag) + log_msg ("\n"); + } + + lock.l_type = F_WRLCK; + lock.l_start = 0; + lock.l_whence = SEEK_SET; + lock.l_len = 0; + + /* Is the pidfile locked by another daemon ? */ + if (fcntl (fd, F_GETLK, &lock) < 0) + { + log_msg ("fcntl error"); + if (debug_flag) + log_msg ("\n"); + } + if (lock.l_type == F_UNLCK) + pid = 0; /* false, region is not locked by another proc */ + else + pid = lock.l_pid; /* true, return pid of lock owner */ + + if (0 != pid) + { + log_msg ("%s already running (pid %d) - exiting", daemonname, pid); + if (debug_flag) + log_msg ("\n"); + exit (1); + } + + /* write lock */ + lock.l_type = F_WRLCK; + lock.l_start = 0; + lock.l_whence = SEEK_SET; + lock.l_len = 0; + if (0 != fcntl (fd, F_SETLK, &lock)) + log_msg ("cannot lock pidfile"); + sprintf (pbuf, "%ld\n", (long) getpid ()); + left = strlen (pbuf); + ptr = pbuf; + while (left > 0) + { + if ((written = write (fd, ptr, left)) <= 0) + return; /* error */ + left -= written; + ptr += written; + } + return; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/lib/pidfile.h new/ypserv-2.23/lib/pidfile.h --- old/ypserv-2.22/lib/pidfile.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ypserv-2.23/lib/pidfile.h 2010-02-23 14:44:55.000000000 +0100 @@ -0,0 +1,36 @@ +/* Copyright (c) 2009 Thorsten Kukuk + Author: Thorsten Kukuk <kukuk(a)suse.de> + + The YP Server is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The YP Server is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with the YP Server; see the file COPYING. If + not, write to the Free Software Foundation, Inc., 675 Mass Ave, + Cambridge, MA 02139, USA. */ + +#ifndef __PIDFILE_H +#define __PIDFILE_H + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef HAVE_PATHS_H +#include <paths.h> +#endif +#ifndef _PATH_VARRUN +#define _PATH_VARRUN "/etc/" +#endif + +/* Creates a pidfile on daemon startup. */ +extern void create_pidfile (const char *filename, const char *daemonname); + +#endif /* __PIDFILE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/rpc.yppasswdd/yppasswdd.c new/ypserv-2.23/rpc.yppasswdd/yppasswdd.c --- old/ypserv-2.22/rpc.yppasswdd/yppasswdd.c 2009-06-12 10:08:57.000000000 +0200 +++ new/ypserv-2.23/rpc.yppasswdd/yppasswdd.c 2010-02-23 14:48:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 1996-2006 Thorsten Kukuk, <kukuk(a)thkukuk.de> + Copyright (c) 1996-2006, 2010 Thorsten Kukuk, <kukuk(a)thkukuk.de> Copyright (c) 1994, 1995, 1996 Olaf Kirch, <okir(a)monad.swb.de> This file is part of the NYS YP Server. @@ -48,13 +48,8 @@ #include "log_msg.h" #include "compat.h" +#include "pidfile.h" -#ifdef HAVE_PATHS_H -#include <paths.h> -#endif -#ifndef _PATH_VARRUN -#define _PATH_VARRUN "/etc/" -#endif #define _YPPASSWDD_PIDFILE _PATH_VARRUN"yppasswdd.pid" int use_shadow = 0; @@ -112,70 +107,6 @@ } } -/* Create a pidfile on startup */ -static void -create_pidfile (void) -{ - int fd, left, written; - pid_t pid; - char pbuf[50], *ptr; - struct flock lock; - - fd = open (_YPPASSWDD_PIDFILE, O_CREAT | O_RDWR, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if (fd < 0) - { - log_msg ("cannot create pidfile %s", _YPPASSWDD_PIDFILE); - if (debug_flag) - log_msg ("\n"); - } - - lock.l_type = F_WRLCK; - lock.l_start = 0; - lock.l_whence = SEEK_SET; - lock.l_len = 0; - - /* Is the pidfile locked by another ypserv ? */ - if (fcntl (fd, F_GETLK, &lock) < 0) - { - log_msg ("fcntl error"); - if (debug_flag) - log_msg ("\n"); - } - if (lock.l_type == F_UNLCK) - pid = 0; /* false, region is not locked by another proc */ - else - pid = lock.l_pid; /* true, return pid of lock owner */ - - if (0 != pid) - { - log_msg ("rpc.yppasswdd already running (pid %d) - exiting", pid); - if (debug_flag) - log_msg ("\n"); - exit (1); - } - - /* write lock */ - lock.l_type = F_WRLCK; - lock.l_start = 0; - lock.l_whence = SEEK_SET; - lock.l_len = 0; - if (0 != fcntl (fd, F_SETLK, &lock)) - log_msg ("cannot lock pidfile"); - sprintf (pbuf, "%ld\n", (long) getpid ()); - left = strlen (pbuf); - ptr = pbuf; - while (left > 0) - { - if ((written = write (fd, ptr, left)) <= 0) - return; /* error */ - left -= written; - ptr += written; - } - return; -} - - static void usage (FILE * fp, int n) { @@ -455,7 +386,7 @@ } } - create_pidfile (); + create_pidfile (_YPPASSWDD_PIDFILE, "rpc.yppasswdd"); /* Register a signal handler to reap children after they terminated */ install_sighandler (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/rpc.ypxfrd/ypxfrd.c new/ypserv-2.23/rpc.ypxfrd/ypxfrd.c --- old/ypserv-2.22/rpc.ypxfrd/ypxfrd.c 2006-01-10 20:22:20.000000000 +0100 +++ new/ypserv-2.23/rpc.ypxfrd/ypxfrd.c 2010-02-23 14:48:07.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2006 Thorsten Kukuk +/* Copyright (c) 1996-1999, 2001-2003, 2005, 2006, 2010 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)suse.de> The YP Server is free software; you can redistribute it and/or @@ -58,6 +58,9 @@ #include "log_msg.h" #include "compat.h" +#include "pidfile.h" + +#define _YPXFRD_PIDFILE _PATH_VARRUN"ypxfrd.pid" extern void ypxfrd_freebsd_prog_1(struct svc_req *, SVCXPRT *); @@ -118,6 +121,7 @@ sig_quit (int sig UNUSED) { pmap_unset (YPXFRD_FREEBSD_PROG, YPXFRD_FREEBSD_VERS); + unlink (_YPXFRD_PIDFILE); exit (0); } @@ -134,7 +138,7 @@ } static void -Usage (int exitcode) +usage (int exitcode) { fputs ("usage: rpc.ypxfrd [--debug] [-d path] [-p port]\n", stderr); fputs (" rpc.ypxfrd --version\n", stderr); @@ -204,10 +208,10 @@ break; case 'u': case 'h': - Usage(0); + usage(0); break; case '?': - Usage(1); + usage(1); break; } } @@ -266,6 +270,8 @@ } } + create_pidfile (_YPXFRD_PIDFILE, "rpc.ypxfrd"); + /* Change current directory to database location */ if (chdir(path_ypdb) < 0) { @@ -442,6 +448,7 @@ svc_run(); log_msg("svc_run returned"); + unlink (_YPXFRD_PIDFILE); exit(1); /* NOTREACHED */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ypserv-2.22/ypserv/ypserv.c new/ypserv-2.23/ypserv/ypserv.c --- old/ypserv-2.22/ypserv/ypserv.c 2009-06-12 11:20:59.000000000 +0200 +++ new/ypserv-2.23/ypserv/ypserv.c 2010-02-23 14:48:22.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (c) 1996-2009 Thorsten Kukuk +/* Copyright (c) 1996-2010 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)thkukuk.de> The YP Server is free software; you can redistribute it and/or @@ -48,16 +48,11 @@ #include "log_msg.h" #include "ypserv_conf.h" #include "compat.h" +#include "pidfile.h" #if USE_SLP #include "reg_slp.h" #endif -#ifdef HAVE_PATHS_H -#include <paths.h> -#endif -#ifndef _PATH_VARRUN -#define _PATH_VARRUN "/etc/" -#endif #define _YPSERV_PIDFILE _PATH_VARRUN"ypserv.pid" #ifndef YPOLDVERS @@ -254,87 +249,6 @@ } #endif -/* Create a pidfile on startup */ -static void -create_pidfile (void) -{ - int fd, left, written, flags; - pid_t pid; - char pbuf[10], *ptr; - struct flock lock; - - fd = open (_YPSERV_PIDFILE, O_CREAT | O_RDWR, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if (fd < 0) - { - log_msg ("cannot create pidfile %s", _YPSERV_PIDFILE); - if (debug_flag) - log_msg ("\n"); - return; - } - - /* Make sure file gets correctly closed when process finished. */ - flags = fcntl (fd, F_GETFD, 0); - if (flags == -1) - { - /* Cannot get file flags. */ - close (fd); - return; - } - flags |= FD_CLOEXEC; /* Close on exit. */ - if (fcntl (fd, F_SETFD, flags) < 0) - { - /* Cannot set new flags. */ - close (fd); - return; - } - - lock.l_type = F_WRLCK; - lock.l_start = 0; - lock.l_whence = SEEK_SET; - lock.l_len = 0; - - /* Is the pidfile locked by another ypserv ? */ - if (fcntl (fd, F_GETLK, &lock) < 0) - { - log_msg ("fcntl error"); - if (debug_flag) - log_msg ("\n"); - } - if (lock.l_type == F_UNLCK) - pid = 0; /* false, not locked by another proc */ - else - pid = lock.l_pid; /* true, return pid of lock owner */ - - if (0 != pid) - { - log_msg ("ypserv already running (pid %d) - exiting", pid); - if (debug_flag) - log_msg ("\n"); - exit (1); - } - - /* write lock */ - lock.l_type = F_WRLCK; - lock.l_start = 0; - lock.l_whence = SEEK_SET; - lock.l_len = 0; - if (0 != fcntl (fd, F_SETLK, &lock)) - log_msg ("cannot lock pidfile"); - sprintf (pbuf, "%ld\n", (long) getpid ()); - left = strlen (pbuf); - ptr = pbuf; - while (left > 0) - { - if ((written = write (fd, ptr, left)) <= 0) - return; /* error */ - left -= written; - ptr += written; - } - - return; -} - extern FILE *debug_output; /* SIGUSR1: enable/disable debug output. */ static void @@ -522,7 +436,7 @@ exit (1); } - create_pidfile (); + create_pidfile (_YPSERV_PIDFILE, "ypserv"); load_securenets (); load_config (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-samba-server for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package yast2-samba-server for openSUSE:Factory checked in at Wed Feb 24 02:35:21 CET 2010. -------- --- yast2-samba-server/yast2-samba-server.changes 2009-09-16 11:43:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-samba-server/yast2-samba-server.changes 2010-02-19 17:26:52.000000000 +0100 @@ -0,0 +1,21 @@ +------------------------------------------------------------------ +Fri Feb 19 16:55:02 CET 2010 - locilka(a)suse.cz + +- Re-added possibility to allow guest access (BNC #579993). +- Fixed buggy behavior when security settings were manually + changed by user in advanced options (BNC #553349). +- Adjusted help according the current UI (BNC #580102). +- 2.18.3 + +------------------------------------------------------------------ +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + calling whatdependson for head-i586 Old: ---- yast2-samba-server-2.18.2.tar.bz2 New: ---- yast2-samba-server-2.18.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.QI0tAA/_old 2010-02-24 02:35:19.000000000 +0100 +++ /var/tmp/diff_new_pack.QI0tAA/_new 2010-02-24 02:35:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-samba-server (Version 2.18.2) +# spec file for package yast2-samba-server (Version 2.18.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,14 +19,18 @@ Name: yast2-samba-server -Version: 2.18.2 +Version: 2.18.3 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-server-2.18.2.tar.bz2 +Source0: yast2-samba-server-2.18.3.tar.bz2 + Prefix: /usr + Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN perl-XML-Writer samba-client update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-samba-client yast2-testsuite yast2-users + Requires: perl-Crypt-SmbHash Requires: yast2 Requires: yast2-ldap >= 2.17.3 @@ -36,9 +40,12 @@ # Samba::Wins~Name~Resolution Requires: yast2-samba-client >= 2.17.1 Requires: yast2-users + # bnc #386473, recommend yast2-samba-server when installaing these packages Supplements: samba + BuildArch: noarch + Summary: YaST2 - Samba Server Configuration %description @@ -46,14 +53,16 @@ configuration. %prep -%setup -n yast2-samba-server-2.18.2 +%setup -n yast2-samba-server-2.18.3 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -81,4 +90,5 @@ %{prefix}/share/applications/YaST2/samba-server.desktop /usr/share/YaST2/schema/autoyast/rnc/samba-server.rnc %doc %{prefix}/share/doc/packages/yast2-samba-server + %changelog ++++++ yast2-samba-server-2.18.2.tar.bz2 -> yast2-samba-server-2.18.3.tar.bz2 ++++++ ++++ 4268 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/VERSION new/yast2-samba-server-2.18.3/VERSION --- old/yast2-samba-server-2.18.2/VERSION 2009-09-16 11:42:47.000000000 +0200 +++ new/yast2-samba-server-2.18.3/VERSION 2010-02-19 17:22:02.000000000 +0100 @@ -1 +1 @@ -2.18.2 +2.18.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/configure.in new/yast2-samba-server-2.18.3/configure.in --- old/yast2-samba-server-2.18.2/configure.in 2009-06-25 12:12:26.000000000 +0200 +++ new/yast2-samba-server-2.18.3/configure.in 2010-02-19 17:25:02.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-samba-server dnl -dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-server, 2.18.1, http://bugs.opensuse.org/, yast2-samba-server) +AC_INIT(yast2-samba-server, 2.18.3, http://bugs.opensuse.org/, yast2-samba-server) 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.18.1" +VERSION="2.18.3" RPMNAME="yast2-samba-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/missing new/yast2-samba-server-2.18.3/missing --- old/yast2-samba-server-2.18.2/missing 2009-06-25 12:12:30.000000000 +0200 +++ new/yast2-samba-server-2.18.3/missing 2010-02-19 17:25:04.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/src/SambaServer.pm new/yast2-samba-server-2.18.3/src/SambaServer.pm --- old/yast2-samba-server-2.18.2/src/SambaServer.pm 2008-12-18 14:47:00.000000000 +0100 +++ new/yast2-samba-server-2.18.3/src/SambaServer.pm 2010-01-25 17:01:54.000000000 +0100 @@ -5,7 +5,7 @@ # Martin Lazar <mlazar(a)suse.cz> # Lukas Ocilka <locilka(a)suse.cz> # -# $Id: SambaServer.pm 50759 2008-09-05 14:17:08Z locilka $ +# $Id: SambaServer.pm 60516 2010-01-25 16:01:54Z locilka $ # # Representation of the configuration of samba-server. # Input and output routines. @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/src/add_machine.ycp new/yast2-samba-server-2.18.3/src/add_machine.ycp --- old/yast2-samba-server-2.18.2/src/add_machine.ycp 2009-06-24 15:39:02.000000000 +0200 +++ new/yast2-samba-server-2.18.3/src/add_machine.ycp 2009-11-24 15:14:17.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Configuration of samba-server * Authors: ???(a)suse.?? * - * $Id: add_machine.ycp 29788 2006-04-06 13:16:05Z locilka $ + * $Id: add_machine.ycp 58664 2009-09-16 09:42:53Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/src/dialogs.ycp new/yast2-samba-server-2.18.3/src/dialogs.ycp --- old/yast2-samba-server-2.18.2/src/dialogs.ycp 2009-06-01 13:16:03.000000000 +0200 +++ new/yast2-samba-server-2.18.3/src/dialogs.ycp 2010-02-19 17:22:10.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Stanislav Visnovsky <stanislav.visnovsky(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: dialogs.ycp 56462 2009-03-30 14:00:48Z locilka $ + * $Id: dialogs.ycp 60883 2010-02-19 16:22:09Z locilka $ */ { @@ -205,10 +205,11 @@ void BaseSettingsWidgetInit(string key) { UI::ChangeWidget(`id("workgroup_domainname"), `Value, SambaConfig::GlobalGetStr("workgroup", "")); - UI::ChangeWidget(`id("domain_controller"), `Value, getRole()); // initial for this dialog - initial_role = SambaRole::GetRole(); + // see also BNC #553349 + initial_role = getRole(); + UI::ChangeWidget(`id("domain_controller"), `Value, initial_role); y2milestone ("Initial role: %1", initial_role); } @@ -321,6 +322,8 @@ boolean allow_share = true; integer max_shares = 0; string shares_group = ""; +// Guest Access check-box, BNC #579993 +boolean guest_access = false; void InitUserShareWidgets () { max_shares = Samba::GetMaxShares (); @@ -332,11 +335,14 @@ allow_share = true; } + guest_access = allow_share && Samba::GetGuessAccess(); + shares_group = Samba::shares_group; UI::ChangeWidget (`id(`group), `Value, shares_group); UI::ChangeWidget (`id(`max_shares), `Value, max_shares); UI::ChangeWidget (`id(`share_ch), `Value, allow_share); + UI::ChangeWidget (`id(`guest_ch), `Value, guest_access); } void AdjustUserShareWidgets () { @@ -906,6 +912,8 @@ "allow_share" : allow_share, "group" : shares_group, "max_shares" : max_shares, + // BNC #579993, Allow guest access + "guest_access": guest_access, ]), `HSpacing(1) ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/src/helps.ycp new/yast2-samba-server-2.18.3/src/helps.ycp --- old/yast2-samba-server-2.18.2/src/helps.ycp 2008-12-18 14:47:00.000000000 +0100 +++ new/yast2-samba-server-2.18.3/src/helps.ycp 2010-02-19 17:22:10.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: helps.ycp 52462 2008-10-23 14:18:54Z locilka $ + * $Id: helps.ycp 60883 2010-02-19 16:22:09Z locilka $ */ { @@ -175,32 +175,38 @@ creating new users and groups. If the administration DN requires a password for write access, set the password using Set LDAP Administration Password. -")+ +") + /* Advanced SAMBA configuration dialog help 3/3 */ _("Note: Settings are saved before the LDAP administration password is set. "), - /* passdb backend configuration dialog help 1/7 */ + /* passdb backend configuration dialog help 1 */ "passdb_edit" : _("<big>User Authentication Information Back-Ends</big> Here, choose where the Samba server should look for the authentication information. Samba does not support multiple back-ends at once anymore, only one is allowed. ") + - /* passdb backend configuration dialog help 2/7 */ + + /* passdb backend configuration dialog help 2 */ +_("If you want to change the user authentication source, remove the current one first +by pressing Delete button and add a new one with Add button. +") + + + /* passdb backend configuration dialog help 3 */ _("smbpasswd file is the file using the same format as the previous versions of Samba. Its layout is similar to the passwd file. It is possible to have a multiple files in this format. ") + - /* passdb backend configuration dialog help 3/7 */ + /* passdb backend configuration dialog help 4 */ _("LDAP is a URL of an LDAP server to check for the information. ") + - /* passdb backend configuration dialog help 4/7 */ + /* passdb backend configuration dialog help 5 */ _("TDB database uses an internal Samba database binary format to store and look up the information. -") + +"), // we don't seem to support mysql anymore // /* passdb backend configuration dialog help 5/7 */ @@ -208,12 +214,13 @@ //to store and look up the information. //") + +// not in UI anymore /* passdb backend configuration dialog help 6/7 */ -_("Use Add to add a new configuration option, Edit to modify -an existing option, and Delete to delete an option. -Use Up and Down to change the order -of the back-ends. -"), +//_("Use Add to add a new configuration option, Edit to modify +//an existing option, and Delete to delete an option. +//Use Up and Down to change the order +//of the back-ends. +//"), // no such button there // /* passdb backend configuration dialog help 7/7 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.18.2/src/samba-server.desktop new/yast2-samba-server-2.18.3/src/samba-server.desktop --- old/yast2-samba-server-2.18.2/src/samba-server.desktop 2008-12-18 14:47:00.000000000 +0100 +++ new/yast2-samba-server-2.18.3/src/samba-server.desktop 2010-01-15 11:14:00.000000000 +0100 @@ -20,9 +20,8 @@ X-SuSE-YaST-AutoInstSchema=samba-server.rnc Icon=yast-samba-server -Exec=/sbin/yast2 samba-server +Exec=xdg-su -c "/sbin/yast2 samba-server" Name=Samba Server GenericName=Configure a Samba server -X-KDE-SubstituteUID=true StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-samba-client for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at Wed Feb 24 02:35:15 CET 2010. -------- --- yast2-samba-client/yast2-samba-client.changes 2009-12-10 14:00:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-samba-client/yast2-samba-client.changes 2010-02-23 11:41:27.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 23 11:03:22 CET 2010 - jsuchome(a)suse.cz + +- do not delete sections on Export (bnc#571073) +- 2.19.3 + +------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-samba-client-2.19.2.tar.bz2 New: ---- yast2-samba-client-2.19.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.tajP2Y/_old 2010-02-24 02:35:11.000000000 +0100 +++ /var/tmp/diff_new_pack.tajP2Y/_new 2010-02-24 02:35:11.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-samba-client (Version 2.19.2) +# spec file for package yast2-samba-client (Version 2.19.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,20 +19,27 @@ Name: yast2-samba-client -Version: 2.19.2 +Version: 2.19.3 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.19.2.tar.bz2 +Source0: yast2-samba-client-2.19.3.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite Requires: yast2-kerberos-client perl-XML-LibXML + # new Pam.ycp API Requires: yast2-pam >= 2.14.0 + # .etc.ssh.sshd_config Requires: yast2 >= 2.16.41 + BuildArch: noarch + Summary: YaST2 - Samba Client Configuration %description @@ -40,14 +47,16 @@ workgroup/domain and authentication against an SMB domain. %prep -%setup -n yast2-samba-client-2.19.2 +%setup -n yast2-samba-client-2.19.3 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-samba-client-2.19.2.tar.bz2 -> yast2-samba-client-2.19.3.tar.bz2 ++++++ ++++ 3302 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.19.2/VERSION new/yast2-samba-client-2.19.3/VERSION --- old/yast2-samba-client-2.19.2/VERSION 2009-12-10 13:54:57.000000000 +0100 +++ new/yast2-samba-client-2.19.3/VERSION 2010-02-23 11:40:34.000000000 +0100 @@ -1 +1 @@ -2.19.2 +2.19.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.19.2/missing new/yast2-samba-client-2.19.3/missing --- old/yast2-samba-client-2.19.2/missing 2009-12-11 16:20:13.000000000 +0100 +++ new/yast2-samba-client-2.19.3/missing 2010-02-11 09:40:10.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.19.2/src/SambaConfig.pm new/yast2-samba-client-2.19.3/src/SambaConfig.pm --- old/yast2-samba-client-2.19.2/src/SambaConfig.pm 2009-11-27 16:28:41.000000000 +0100 +++ new/yast2-samba-client-2.19.3/src/SambaConfig.pm 2010-02-23 11:03:04.000000000 +0100 @@ -465,7 +465,6 @@ foreach my $share (keys %Config) { next unless $Config{$share}; # skip removed shares next if $share =~ /^_/; # skip internal shares - next if Mode->config () && not $Config{$share}{_modified}; # skip untouched shares my %section; $section{name} = $share; $section{comment} = $Config{$share}{_comment} if $Config{$share}{_comment}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.19.2/src/samba-client.desktop new/yast2-samba-client-2.19.3/src/samba-client.desktop --- old/yast2-samba-client-2.19.2/src/samba-client.desktop 2009-09-03 14:39:13.000000000 +0200 +++ new/yast2-samba-client-2.19.3/src/samba-client.desktop 2010-01-15 09:17:30.000000000 +0100 @@ -21,9 +21,8 @@ X-SuSE-YaST-Keywords=authentication,samba,windows Icon=yast-samba-client -Exec=/sbin/yast2 samba-client +Exec=xdg-su -c "/sbin/yast2 samba-client" Name=Windows Domain Membership GenericName=Configure the Windows Domain Membership -X-KDE-SubstituteUID=true StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-product-creator for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Wed Feb 24 02:35:09 CET 2010. -------- --- yast2-product-creator/yast2-product-creator.changes 2010-02-17 10:23:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2010-02-22 16:02:16.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 22 15:46:01 CET 2010 - jsuchome(a)suse.cz + +- enable saving kiwi logs on demand (fate#306937) +- 2.19.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.19.3.tar.bz2 New: ---- yast2-product-creator-2.19.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.lSJFU1/_old 2010-02-24 02:35:06.000000000 +0100 +++ /var/tmp/diff_new_pack.lSJFU1/_new 2010-02-24 02:35:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.19.3) +# spec file for package yast2-product-creator (Version 2.19.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,29 +19,42 @@ Name: yast2-product-creator -Version: 2.19.3 +Version: 2.19.4 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.19.3.tar.bz2 +Source0: yast2-product-creator-2.19.4.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security yast2-slp yast2-testsuite + PreReq: %fillup_prereq + Requires: autoyast2-installation yast2-security + # ag_pattern handling gzipped files Requires: yast2-add-on-creator >= 2.17.1 + # SourceDialogs::IsPlainDir() Requires: yast2-packager >= 2.16.20 + # changes in ag_anyxml agent Requires: yast2 >= 2.17.8 + # Pkg::SourceForceRefreshNow() Requires: yast2-pkg-bindings >= 2.17.6 + # New API of StorageDevices.ycp Conflicts: yast2-storage < 2.16.1 + # prefer to install package with real templates Recommends: kiwi-config-openSUSE + BuildArch: noarch + Summary: YaST2 - Module for Creating New Products %description @@ -49,14 +62,16 @@ XEN images etc.), based on existing installation sources. %prep -%setup -n yast2-product-creator-2.19.3 +%setup -n yast2-product-creator-2.19.4 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -70,6 +85,7 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + install -d $RPM_BUILD_ROOT/var/lib/YaST2/product-creator %clean ++++++ yast2-product-creator-2.19.3.tar.bz2 -> yast2-product-creator-2.19.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.3/VERSION new/yast2-product-creator-2.19.4/VERSION --- old/yast2-product-creator-2.19.3/VERSION 2010-02-17 10:23:19.000000000 +0100 +++ new/yast2-product-creator-2.19.4/VERSION 2010-02-22 15:46:26.000000000 +0100 @@ -1 +1 @@ -2.19.3 +2.19.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.3/src/Kiwi.ycp new/yast2-product-creator-2.19.4/src/Kiwi.ycp --- old/yast2-product-creator-2.19.3/src/Kiwi.ycp 2009-09-04 15:23:41.000000000 +0200 +++ new/yast2-product-creator-2.19.4/src/Kiwi.ycp 2010-02-22 15:45:39.000000000 +0100 @@ -72,6 +72,9 @@ // map with image templates (to base new projects on) global map<string,map> Templates = $[]; + string stdout_file = "/tmp/image_creator.stdout"; + string stderr_file = "/tmp/image_creator.stderr"; + /** * crypt given user password with current encryption algorithm */ @@ -405,6 +408,32 @@ if (SCR::Read(.process.running, pid) == true) SCR::Execute (.process.kill, pid); } + /** + * ask user where to save kiwi log files + */ + boolean save_logs_popup () { + + UI::OpenDialog (`opt(`decorated), `HBox(`HSpacing(1.5), `VBox ( + `VSpacing (0.2), + `TextEntry (`id (`stdout_file), _("Path to file with standard output"), stdout_file), + `TextEntry (`id (`stderr_file), _("Path to file with error output"), stderr_file), + `PushButton (`id (`ok), Label::SaveButton ()), + `VSpacing (0.2) + ), `HSpacing(1.5))); + + UI::UserInput (); + + stdout_file = (string) UI::QueryWidget (`id (`stdout_file), `Value); + stderr_file = (string) UI::QueryWidget (`id (`stderr_file), `Value); + + UI::CloseDialog (); + + if (FileUtils::CheckAndCreatePath (path_to_dir (stdout_file))) + SCR::Write (.target.string, stdout_file, (string) UI::QueryWidget (`id (`log), `Value)); + if (FileUtils::CheckAndCreatePath (path_to_dir (stderr_file))) + SCR::Write (.target.string, stderr_file, (string) UI::QueryWidget (`id (`errlog), `Value)); + return true; + } /** * run kiwi to finally create the selected image @@ -452,14 +481,20 @@ `VSpacing(0.5), `LogView (`id (`errlog), "", 8, 0), `VSpacing(0.5), - `ReplacePoint (`id (`rp), - `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton ()) + `HBox ( + `ReplacePoint (`id (`rp), + `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton ()) + ), + // button label + `PushButton (`id(`save), _("Save logs")) ), `VSpacing(0.5) )) ), `HSpacing(1.5) )); + UI::ChangeWidget (`id (`save), `Enabled, false); + integer id = -1; void update_output () { @@ -507,7 +542,12 @@ `Label (`opt (`boldFont), _("Image creation failed.")), `PushButton (`id(`close), Label::CloseButton ()) )); - ret = (symbol) UI::UserInput (); + UI::ChangeWidget (`id (`save), `Enabled, true); + repeat + { + ret = (symbol) UI::UserInput (); + if (ret == `save) save_logs_popup (); + } until (ret == `close); break; } else if (!creating) @@ -533,7 +573,12 @@ `Label (`opt (`boldFont), _("Image creation succeeded.")), `PushButton (`id(`ok), Label::OKButton ()) )); - ret = (symbol) UI::UserInput (); + UI::ChangeWidget (`id (`save), `Enabled, true); + repeat + { + ret = (symbol) UI::UserInput (); + if (ret == `save) save_logs_popup (); + } until (ret == `ok); break; } } @@ -543,8 +588,21 @@ } if (ret == `cancel) { + UI::ReplaceWidget (`id (`rp), `HBox ( + // label (command result) + `Label (`opt (`boldFont), _("Image creation canceled.")), + `PushButton (`id(`close), Label::CloseButton ()) + )); SCR::Execute (.process.kill, id, 15); give_kiwi_time_to_finish (id); + UI::ChangeWidget (`id (`save), `Enabled, true); + repeat + { + ret = (symbol) UI::UserInput (); + if (ret == `save) + save_logs_popup (); + } until (ret == `close); + break; } sleep (100); } while (ret == nil); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-pam for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package yast2-pam for openSUSE:Factory checked in at Wed Feb 24 02:35:00 CET 2010. -------- --- yast2-pam/yast2-pam.changes 2009-12-10 14:01:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-pam/yast2-pam.changes 2010-02-23 10:58:35.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 23 10:56:16 CET 2010 - jsuchome(a)suse.cz + +- lxdm can also suport autologin (bnc#581477) +- 2.19.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-pam-2.19.0.tar.bz2 New: ---- yast2-pam-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pam.spec ++++++ --- /var/tmp/diff_new_pack.mVPrgx/_old 2010-02-24 02:34:51.000000000 +0100 +++ /var/tmp/diff_new_pack.mVPrgx/_new 2010-02-24 02:34:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-pam (Version 2.19.0) +# spec file for package yast2-pam (Version 2.19.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,35 +19,44 @@ Name: yast2-pam -Version: 2.19.0 +Version: 2.19.1 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pam-2.19.0.tar.bz2 +Source0: yast2-pam-2.19.1.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: doxygen perl-XML-Writer yast2 yast2-core-devel yast2-devtools yast2-testsuite Requires: yast2 + Requires: pam-config >= 0.8 + Provides: yast2-agent-pam Obsoletes: yast2-agent-pam Provides: yast2-agent-pam-devel Obsoletes: yast2-agent-pam-devel + BuildArch: noarch + Summary: YaST2 - PAM Agent %description This agent is used by YaST2 to modify the PAM configuration files %prep -%setup -n yast2-pam-2.19.0 +%setup -n yast2-pam-2.19.1 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-pam-2.19.0.tar.bz2 -> yast2-pam-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pam-2.19.0/VERSION new/yast2-pam-2.19.1/VERSION --- old/yast2-pam-2.19.0/VERSION 2009-12-10 14:01:27.000000000 +0100 +++ new/yast2-pam-2.19.1/VERSION 2010-02-23 10:58:03.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pam-2.19.0/src/Autologin.ycp new/yast2-pam-2.19.1/src/Autologin.ycp --- old/yast2-pam-2.19.0/src/Autologin.ycp 2009-12-10 14:01:41.000000000 +0100 +++ new/yast2-pam-2.19.1/src/Autologin.ycp 2010-02-23 10:56:12.000000000 +0100 @@ -65,6 +65,8 @@ Package::InstalledAny (["kdebase3-kdm", "kde4-kdm", "kdm"])) || (dm == "gdm" && Package::Installed ("gdm")) + || + (dm == "lxdm" && Package::Installed ("lxdm")) ) { available = true; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-ca-management for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package yast2-ca-management for openSUSE:Factory checked in at Wed Feb 24 02:34:55 CET 2010. -------- --- yast2-ca-management/yast2-ca-management.changes 2010-01-15 11:17:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ca-management/yast2-ca-management.changes 2010-02-23 11:42:05.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 23 11:37:01 CET 2010 - mc(a)suse.de + +- version 2.19.3 +- fix generation of subjectAltName (bnc#582129) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ca-management-2.19.2.tar.bz2 New: ---- yast2-ca-management-2.19.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ca-management.spec ++++++ --- /var/tmp/diff_new_pack.pLAcNb/_old 2010-02-24 02:34:43.000000000 +0100 +++ /var/tmp/diff_new_pack.pLAcNb/_new 2010-02-24 02:34:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ca-management (Version 2.19.2) +# spec file for package yast2-ca-management (Version 2.19.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,14 @@ Name: yast2-ca-management -Version: 2.19.2 +Version: 2.19.3 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ca-management-2.19.2.tar.bz2 +Source0: yast2-ca-management-2.19.3.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: docbook-xsl-stylesheets dosfstools doxygen libxslt limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools @@ -36,14 +39,16 @@ Managing CAs, Certificates and Requests in an understanding way. %prep -%setup -n yast2-ca-management-2.19.2 +%setup -n yast2-ca-management-2.19.3 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-ca-management-2.19.2.tar.bz2 -> yast2-ca-management-2.19.3.tar.bz2 ++++++ ++++ 2604 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.19.2/VERSION new/yast2-ca-management-2.19.3/VERSION --- old/yast2-ca-management-2.19.2/VERSION 2010-01-15 11:17:22.000000000 +0100 +++ new/yast2-ca-management-2.19.3/VERSION 2010-02-23 11:38:35.000000000 +0100 @@ -1 +1 @@ -2.19.2 +2.19.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.19.2/configure.in new/yast2-ca-management-2.19.3/configure.in --- old/yast2-ca-management-2.19.2/configure.in 2010-01-15 11:19:19.000000000 +0100 +++ new/yast2-ca-management-2.19.3/configure.in 2010-02-23 11:39:25.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ca-management, 2.19.2, http://bugs.opensuse.org/, yast2-ca-management) +AC_INIT(yast2-ca-management, 2.19.3, http://bugs.opensuse.org/, yast2-ca-management) 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.19.2" +VERSION="2.19.3" RPMNAME="yast2-ca-management" MAINTAINER="Michael Calmer <mc(a)suse.de>, J. Daniel Schmidt <jdsn(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.19.2/src/common_cert.ycp new/yast2-ca-management-2.19.3/src/common_cert.ycp --- old/yast2-ca-management-2.19.2/src/common_cert.ycp 2010-01-15 11:17:12.000000000 +0100 +++ new/yast2-ca-management-2.19.3/src/common_cert.ycp 2010-01-15 11:20:40.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Stefan Schubert <schubi(a)suse.de> * - * $Id: common_cert.ycp 60389 2010-01-15 09:46:15Z mcalmer $ + * $Id: common_cert.ycp 60393 2010-01-15 10:20:40Z mcalmer $ * * Showing current common server certificate */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.19.2/src/startup.ycp new/yast2-ca-management-2.19.3/src/startup.ycp --- old/yast2-ca-management-2.19.2/src/startup.ycp 2010-01-15 11:16:38.000000000 +0100 +++ new/yast2-ca-management-2.19.3/src/startup.ycp 2010-01-15 11:20:40.000000000 +0100 @@ -12,7 +12,7 @@ * Authors: * Stefan Schubert <schubi(a)suse.de> * - * $Id: startup.ycp 47500 2008-05-13 15:59:13Z mcalmer $ + * $Id: startup.ycp 60393 2010-01-15 10:20:40Z mcalmer $ * * CA Management - Root CAs * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.19.2/src/util.ycp new/yast2-ca-management-2.19.3/src/util.ycp --- old/yast2-ca-management-2.19.2/src/util.ycp 2010-01-14 12:53:47.000000000 +0100 +++ new/yast2-ca-management-2.19.3/src/util.ycp 2010-02-23 11:36:26.000000000 +0100 @@ -1564,7 +1564,7 @@ if(!found) { list<string> hostnames = splitstring( - ((map<string,any>)SCR::Execute(.target.bash_output, sformat("getent hosts %1 | awk '{print $2}' | sed 's/\.$//'| tr '\n' '|'", ip)))["stdout"]:"", "|"); + ((map<string,any>)SCR::Execute(.target.bash_output, sformat("getent hosts %1 | awk '{print $2}' | sed 's/\\.$//'| tr '\n' '|'", ip)))["stdout"]:"", "|"); foreach(string hname, hostnames, { if(hname != "" && findfirstof(hname, ".") != nil) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-bootloader for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at Wed Feb 24 02:34:38 CET 2010. -------- --- yast2-bootloader/yast2-bootloader.changes 2010-02-04 11:32:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2010-02-22 12:13:59.000000000 +0100 @@ -1,0 +2,46 @@ +Mon Feb 22 12:10:48 CET 2010 - juhliarik(a)suse.cz + +- added fix for detection of UEFI (bnc#581213) +- 2.19.6 + +------------------------------------------------------------------- +Thu Feb 11 16:16:12 CET 2010 - juhliarik(a)suse.cz + +- added fix for calling mkinitrd if vga is "normal" (bnc#292013) +- 2.19.5 + +------------------------------------------------------------------- +Thu Feb 11 13:36:28 CET 2010 - juhliarik(a)suse.cz + +- added fix for using persistent device names (bnc#533782) + +------------------------------------------------------------------- +Thu Feb 11 12:13:19 CET 2010 - juhliarik(a)suse.cz + +- added fix for using encrypted swap partition (bnc#577127) +- 2.19.4 + +------------------------------------------------------------------- +Thu Feb 11 10:55:21 CET 2010 - juhliarik(a)suse.cz + +- added fix for detection of QEMU (bnc#571850) +- 2.19.3 + +------------------------------------------------------------------- +Wed Feb 10 13:49:32 CET 2010 - juhliarik(a)suse.cz + +- added fix for adding crashkernel option to XEN kernel + (bnc#578545) + +------------------------------------------------------------------- +Tue Feb 9 16:30:04 CET 2010 - juhliarik(a)suse.cz + +- solved problem with wrtting to floppy (bnc#539774) + +------------------------------------------------------------------- +Tue Feb 9 16:03:31 CET 2010 - juhliarik(a)suse.cz + +- added fix for deleting Custom Boot Partition (bnc#544809) +- 2.19.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.XmhKso/_old 2010-02-24 02:34:33.000000000 +0100 +++ /var/tmp/diff_new_pack.XmhKso/_new 2010-02-24 02:34:33.000000000 +0100 @@ -20,10 +20,13 @@ Name: yast2-bootloader Version: 2.19.1 -Release: 1 +Release: 2 + BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-bootloader-2.19.1.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage >= 2.18.18 yast2-testsuite @@ -42,9 +45,11 @@ BuildRequires: yast2-pkg-bindings >= 2.17.25 BuildRequires: perl-Bootloader >= 0.5.0 BuildRequires: yast2-core >= 2.18.6 + %ifarch %ix86 x86_64 Requires: master-boot-code %endif + Provides: yast2-config-lilo yast2-config-bootloader Obsoletes: yast2-config-lilo yast2-config-bootloader Provides: yast2-agent-liloconf yast2-agent-prom @@ -55,6 +60,7 @@ Obsoletes: y2c_boot y2t_boot Provides: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel Obsoletes: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel + Summary: YaST2 - Bootloader Configuration %description @@ -67,8 +73,10 @@ %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -91,11 +99,15 @@ %files %defattr(-,root,root) + # menu items + %ifnarch s390 s390x %{prefix}/share/applications/YaST2/bootloader.desktop %endif + %doc %{prefix}/share/doc/packages/yast2-bootloader + %dir /usr/share/YaST2/include/bootloader /usr/share/YaST2/include/bootloader/* /usr/share/YaST2/modules/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit xzgv for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package xzgv for openSUSE:Factory checked in at Wed Feb 24 02:34:32 CET 2010. -------- --- xzgv/xzgv.changes 2009-12-28 19:36:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/xzgv/xzgv.changes 2010-02-18 14:09:13.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 18 13:08:10 UTC 2010 - crrodriguez(a)opensuse.org + +- fix build with as-needed + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xzgv-0.9.1-as-needed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xzgv.spec ++++++ --- /var/tmp/diff_new_pack.gKk8LV/_old 2010-02-24 02:34:26.000000000 +0100 +++ /var/tmp/diff_new_pack.gKk8LV/_new 2010-02-24 02:34:26.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: gtk2-devel update-desktop-files Url: http://sourceforge.net/projects/xzgv Version: 0.9.1 -Release: 1 +Release: 2 Group: Productivity/Graphics/Viewers License: GPLv2+ Summary: A Fast Picture Viewer for the X Window System @@ -30,6 +30,7 @@ Source1: %name.desktop PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch: xzgv-0.9.1-as-needed.patch %description Xzgv is a picture viewer for the X Window System with a thumbnail-based @@ -47,9 +48,9 @@ %prep %setup -q +%patch %build -export SUSE_ASNEEDED=0 sed -e "s/^CFLAGS=.*/CFLAGS=$RPM_OPT_FLAGS/;" < config.mk > config.mk.tmp mv config.mk.tmp config.mk make PREFIX=/usr ++++++ xzgv-0.9.1-as-needed.patch ++++++ Index: src/Makefile =================================================================== --- src/Makefile.orig 2007-12-23 17:47:25.000000000 -0300 +++ src/Makefile 2010-02-18 10:03:45.000000000 -0300 @@ -23,7 +23,7 @@ OBJS= main.o \ backend.o xzgv: $(OBJS) - $(CC) $(LDFLAGS) -o xzgv $(OBJS) + $(CC) $(CFLAGS) -o xzgv $(OBJS) $(LDFLAGS) installdirs: /bin/sh ../mkinstalldirs $(BINDIR) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit xterm for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at Wed Feb 24 02:34:21 CET 2010. -------- --- xterm/xterm.changes 2010-01-15 17:11:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/xterm/xterm.changes 2010-02-13 11:21:55.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Feb 13 11:15:30 CET 2010 - jslaby(a)suse.de + +- Patch #255 - 2010/1/21 + * rename install.sh to install-sh in case suffix-rules might interfere. + * extend range for convertToUTF8 function to full 31-bits, to use with + printing, etc. + * improve manpage by checking for actual locations of utmp/wtmp files + (Debian #562640). + * modify configure macro CF_XOPEN_SOURCE to remove -D's before adding the + same name rather than relying on -U's, to reduce redefinition warnings + for some platforms that have conflicting definitions in headers. + * correct logic used to switch to alternate screen using FIFO-lines + configuration (Debian #565772). + * update config.guess, config.sub + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xterm-254.tar.bz2 New: ---- xterm-255.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.aTpYLB/_old 2010-02-24 02:34:07.000000000 +0100 +++ /var/tmp/diff_new_pack.aTpYLB/_new 2010-02-24 02:34:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xterm (Version 254) +# spec file for package xterm (Version 255) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm AutoReqProv: on -Version: 254 +Version: 255 Release: 1 Summary: The basic X terminal program Source: ftp://invisible-island.net/xterm/%name-%version.tar.bz2 ++++++ xterm-254.tar.bz2 -> xterm-255.tar.bz2 ++++++ ++++ 9406 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/MANIFEST new/xterm-255/MANIFEST --- old/xterm-254/MANIFEST 2010-01-07 01:21:12.000000000 +0100 +++ new/xterm-255/MANIFEST 2010-01-22 02:34:31.000000000 +0100 @@ -1,4 +1,4 @@ -MANIFEST for xterm-254, version xterm-254 +MANIFEST for xterm-255, version xterm-255 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode @@ -48,7 +48,7 @@ fontutils.h interface of fontutils.c gen-pc-fkeys.pl script to generate extended function-key terminfo input.c VT100 key-symbol and function-key translation -install.sh configure script: fallback install script +install-sh install-script (needed by configure) keysym2ucs.c lookup-table for UTF-8 to keysyms keysym2ucs.h interface of keysym2ucs.c koi8rxterm KOI-8 wrapper from Debian (originally me) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/charproc.c new/xterm-255/charproc.c --- old/xterm-254/charproc.c 2010-01-05 00:12:06.000000000 +0100 +++ new/xterm-255/charproc.c 2010-01-20 02:59:19.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.1031 2010/01/04 23:12:06 tom Exp $ */ +/* $XTermId: charproc.c,v 1.1033 2010/01/20 01:59:19 tom Exp $ */ /* @@ -137,6 +137,9 @@ int code; } FlagList; +typedef void (*BitFunc) (unsigned * /* p */ , + unsigned /* mask */ ); + static IChar doinput(void); static int set_character_class(char * /*s */ ); static void FromAlternate(XtermWidget /* xw */ ); @@ -144,14 +147,16 @@ int /* rows */ , int /* cols */ , Bool /* text */ ); -static void SwitchBufs(XtermWidget xw); +static void SwitchBufs(XtermWidget /* xw */ , + int /* toBuf */ ); static void ToAlternate(XtermWidget /* xw */ ); static void ansi_modes(XtermWidget termw, - void (*func) (unsigned *p, unsigned mask)); + BitFunc /* func */ ); static void bitclr(unsigned *p, unsigned mask); static void bitcpy(unsigned *p, unsigned q, unsigned mask); static void bitset(unsigned *p, unsigned mask); -static void dpmodes(XtermWidget termw, void (*func) (unsigned *p, unsigned mask)); +static void dpmodes(XtermWidget /* xw */ , + BitFunc /* func */ ); static void restoremodes(XtermWidget /* xw */ ); static void savemodes(XtermWidget /* xw */ ); static void window_ops(XtermWidget /* xw */ ); @@ -3954,8 +3959,7 @@ * process ANSI modes set, reset */ static void -ansi_modes(XtermWidget xw, - void (*func) (unsigned *p, unsigned mask)) +ansi_modes(XtermWidget xw, BitFunc func) { int i; @@ -4009,8 +4013,7 @@ * process DEC private modes set, reset */ static void -dpmodes(XtermWidget xw, - void (*func) (unsigned *p, unsigned mask)) +dpmodes(XtermWidget xw, BitFunc func) { TScreen *screen = TScreenOf(xw); int i, j; @@ -5193,7 +5196,7 @@ (unsigned) MaxRows(screen), (unsigned) MaxCols(screen), &screen->editBuf_data[1]); - SwitchBufs(xw); + SwitchBufs(xw, 1); screen->whichBuf = 1; #if OPT_SAVE_LINES screen->visbuf = screen->editBuf_index[screen->whichBuf]; @@ -5212,7 +5215,7 @@ if (screen->scroll_amt) FlushScroll(xw); screen->whichBuf = 0; - SwitchBufs(xw); + SwitchBufs(xw, 0); #if OPT_SAVE_LINES screen->visbuf = screen->editBuf_index[screen->whichBuf]; #endif @@ -5221,7 +5224,7 @@ } static void -SwitchBufs(XtermWidget xw) +SwitchBufs(XtermWidget xw, int toBuf) { TScreen *screen = TScreenOf(xw); int rows, top; @@ -5230,11 +5233,12 @@ HideCursor(); rows = MaxRows(screen); - SwitchBufPtrs(screen); + SwitchBufPtrs(screen, toBuf); if ((top = INX2ROW(screen, 0)) < rows) { - if (screen->scroll_amt) + if (screen->scroll_amt) { FlushScroll(xw); + } XClearArea(screen->display, VWindow(screen), (int) OriginX(screen), @@ -5260,11 +5264,11 @@ * Swap buffer line pointers between alternate and regular screens. */ void -SwitchBufPtrs(TScreen * screen) +SwitchBufPtrs(TScreen * screen, int toBuf GCC_UNUSED) { if (CheckBufPtrs(screen)) { #if OPT_SAVE_LINES - screen->visbuf = screen->editBuf_index[screen->whichBuf]; + screen->visbuf = screen->editBuf_index[toBuf]; #else size_t len = ScrnPointers(screen, (unsigned) MaxRows(screen)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/install.sh new/xterm-255/install.sh --- old/xterm-254/install.sh 2003-11-29 22:30:21.000000000 +0100 +++ new/xterm-255/install.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,294 +0,0 @@ -#! /bin/sh -# -# install - install a program, script, or datafile -# -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 - shift - - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi - - pathcomp=$pathcomp/ -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/#inst.$$# - rmtmp=$dstdir/#rm.$$# - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. - - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - -fi && - -# The final little trick to "correctly" pass the exit status to the exit trap. - -{ - (exit 0); exit -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/main.c new/xterm-255/main.c --- old/xterm-254/main.c 2010-01-01 23:52:24.000000000 +0100 +++ new/xterm-255/main.c 2010-01-20 23:07:23.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: main.c,v 1.601 2010/01/01 22:52:24 tom Exp $ */ +/* $XTermId: main.c,v 1.602 2010/01/20 22:07:23 tom Exp $ */ /* * W A R N I N G @@ -4952,12 +4952,12 @@ return (int) arg; #elif defined(__CYGWIN__) fd_set set; - struct timeval timeout = + struct timeval select_timeout = {0, 0}; FD_ZERO(&set); FD_SET(fd, &set); - if (Select(fd + 1, &set, NULL, NULL, &timeout) > 0) + if (Select(fd + 1, &set, NULL, NULL, &select_timeout) > 0) return 1; else return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/minstall.sh new/xterm-255/minstall.sh --- old/xterm-254/minstall.sh 2009-03-16 00:06:08.000000000 +0100 +++ new/xterm-255/minstall.sh 2010-01-20 11:55:42.000000000 +0100 @@ -1,9 +1,9 @@ #!/bin/sh -# $XTermId: minstall.sh,v 1.15 2009/03/15 23:06:08 tom Exp $ +# $XTermId: minstall.sh,v 1.19 2010/01/20 10:55:42 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # -# Copyright 2001-2008,2009 by Thomas E. Dickey +# Copyright 2001-2009,2010 by Thomas E. Dickey # # All Rights Reserved # @@ -70,6 +70,40 @@ MY_MANSECT=$suffix +# utmp and wtmp have different pathnames on different systems, but there +# are only a few common choices. Note that they may not necessarily appear +# in the same directories. Prefer utmpx/wtmpx to utmp/wtmp, since that's +# the way the configure script is designed. +UTMP_NAME=utmp22 +UTMP_PATH=/etc +for name in /etc /var/adm /var/log +do + if test -f $name/utmpx ; then + UTMP_NAME=utmpx + UTMP_PATH=$name + break + elif test -f $name/utmp ; then + UTMP_PATH=$name + break + fi +done +UTMP_PATH=$UTMP_PATH/$UTMP_NAME + +WTMP_NAME=wtmp +WTMP_PATH=/etc +for name in /etc /var/adm /var/log +do + if test -f $name/wtmpx ; then + WTMP_NAME=wtmpx + WTMP_PATH=$name + break + elif test -f $name/wtmp ; then + WTMP_PATH=$name + break + fi +done +WTMP_PATH=$WTMP_PATH/$WTMP_NAME + # "X" is usually in the miscellaneous section, along with "undocumented". # Use that to guess an appropriate section. X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*$[^) ][^) ]*$.*/\1/'` @@ -79,6 +113,10 @@ -e s%__apploaddir__%$APPS_DIR% \ -e s%__mansuffix__%$MY_MANSECT%g \ -e s%__miscmansuffix__%$X_MANSECT%g \ + -e s%fIutmp'\\%fI'$UTMP_NAME'\\%g' \ + -e s%/etc/utmp%$UTMP_PATH%g \ + -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \ + -e s%/etc/wtmp%$WTMP_PATH%g \ $OLD_FILE >$NEW_FILE echo "$MINSTALL $OLD_FILE $END_FILE" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/misc.c new/xterm-255/misc.c --- old/xterm-254/misc.c 2010-01-04 12:50:35.000000000 +0100 +++ new/xterm-255/misc.c 2010-01-21 10:34:58.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.481 2010/01/04 11:50:35 tom Exp $ */ +/* $XTermId: misc.c,v 1.482 2010/01/21 09:34:58 tom Exp $ */ /* * @@ -3453,7 +3453,7 @@ if (CharOf(name[n]) > 127) { if (converted != 0) free(converted); - if ((converted = TypeMallocN(Char, 1 + (5 * limit))) != 0) { + if ((converted = TypeMallocN(Char, 1 + (6 * limit))) != 0) { Char *temp = converted; while (*name != 0) { temp = convertToUTF8(temp, CharOf(*name)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/ptydata.c new/xterm-255/ptydata.c --- old/xterm-254/ptydata.c 2009-11-28 15:13:48.000000000 +0100 +++ new/xterm-255/ptydata.c 2010-01-21 03:08:28.000000000 +0100 @@ -1,8 +1,8 @@ -/* $XTermId: ptydata.c,v 1.91 2009/11/28 14:13:48 tom Exp $ */ +/* $XTermId: ptydata.c,v 1.94 2010/01/21 02:08:28 tom Exp $ */ /************************************************************ -Copyright 1999-2008,2009 by Thomas E. Dickey +Copyright 1999-2009,2010 by Thomas E. Dickey All Rights Reserved @@ -331,7 +331,7 @@ } /* - * Initialize a buffer for the caller, using its data in 'source'. + * Initialize a buffer for the caller, using its data in 'next'. */ #if OPT_WIDE_CHARS PtyData * @@ -400,21 +400,44 @@ Char * convertToUTF8(Char * lp, unsigned c) { - if (c < 0x80) { /* 0******* */ - *lp++ = (Char) (c); - } else if (c < 0x800) { /* 110***** 10****** */ - *lp++ = (Char) (0xc0 | (c >> 6)); - *lp++ = (Char) (0x80 | (c & 0x3f)); - } else { /* 1110**** 10****** 10****** */ - *lp++ = (Char) (0xe0 | (c >> 12)); - *lp++ = (Char) (0x80 | ((c >> 6) & 0x3f)); - *lp++ = (Char) (0x80 | (c & 0x3f)); - } - /* - * UTF-8 is defined for words of up to 31 bits, but we need only 16 - * bits here, since that's all that X11R6 supports. - */ +#define CH(n) (Char)((c) >> ((n) * 8)) + if (c < 0x80) { + /* 0******* */ + *lp++ = (Char) CH(0); + } else if (c < 0x800) { + /* 110***** 10****** */ + *lp++ = (Char) (0xc0 | (CH(0) >> 6) | ((CH(1) & 0x07) << 2)); + *lp++ = (Char) (0x80 | (CH(0) & 0x3f)); + } else if (c < 0x00010000) { + /* 1110**** 10****** 10****** */ + *lp++ = (Char) (0xe0 | ((int) (CH(1) & 0xf0) >> 4)); + *lp++ = (Char) (0x80 | (CH(0) >> 6) | ((CH(1) & 0x0f) << 2)); + *lp++ = (Char) (0x80 | (CH(0) & 0x3f)); + } else if (c < 0x00200000) { + *lp++ = (Char) (0xf0 | ((int) (CH(2) & 0x1f) >> 2)); + *lp++ = (Char) (0x80 | + ((int) (CH(1) & 0xf0) >> 4) | + ((int) (CH(2) & 0x03) << 4)); + *lp++ = (Char) (0x80 | (CH(0) >> 6) | ((CH(1) & 0x0f) << 2)); + *lp++ = (Char) (0x80 | (CH(0) & 0x3f)); + } else if (c < 0x04000000) { + *lp++ = (Char) (0xf8 | (CH(3) & 0x03)); + *lp++ = (Char) (0x80 | (CH(2) >> 2)); + *lp++ = (Char) (0x80 | + ((int) (CH(1) & 0xf0) >> 4) | + ((int) (CH(2) & 0x03) << 4)); + *lp++ = (Char) (0x80 | (CH(0) >> 6) | ((CH(1) & 0x0f) << 2)); + *lp++ = (Char) (0x80 | (CH(0) & 0x3f)); + } else { + *lp++ = (Char) (0xfc | ((int) (CH(3) & 0x40) >> 6)); + *lp++ = (Char) (0x80 | (CH(3) & 0x3f)); + *lp++ = (Char) (0x80 | (CH(2) >> 2)); + *lp++ = (Char) (0x80 | (CH(1) >> 4) | ((CH(2) & 0x03) << 4)); + *lp++ = (Char) (0x80 | (CH(0) >> 6) | ((CH(1) & 0x0f) << 2)); + *lp++ = (Char) (0x80 | (CH(0) & 0x3f)); + } return lp; +#undef CH } /* @@ -454,3 +477,34 @@ } } #endif + +#if 0 +void +test_ptydata(void) +{ + PtyData *data; + unsigned code; + + initPtyData(&data); + TRACE(("test_ptydata\n")); + for (code = 0; code <= 0x7fffffff; ++code) { + int use_size; + + memset(data, 0, sizeof(*data)); + data->next = data->buffer; + data->last = convertToUTF8(data->buffer, code); + + use_size = (data->last - data->next); + + if (decodeUtf8(data)) { + if (code != data->utf_data) { + TRACE(("code %#x ->%#x\n", code, data->utf_data)); + } else if (use_size != data->utf_size) { + TRACE(("size %#x %d->%d\n", code, use_size, data->utf_size)); + } + } else { + TRACE(("fail %#x\n", code)); + } + } +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/screen.c new/xterm-255/screen.c --- old/xterm-254/screen.c 2009-12-10 00:31:18.000000000 +0100 +++ new/xterm-255/screen.c 2010-01-20 02:38:46.000000000 +0100 @@ -1,7 +1,7 @@ -/* $XTermId: screen.c,v 1.409 2009/12/09 23:31:18 tom Exp $ */ +/* $XTermId: screen.c,v 1.410 2010/01/20 01:38:46 tom Exp $ */ /* - * Copyright 1999-2008,2009 by Thomas E. Dickey + * Copyright 1999-2009,2010 by Thomas E. Dickey * * All Rights Reserved * @@ -597,6 +597,8 @@ TRACE(("ChangeToWide\n")); if (xtermLoadWideFonts(xw, True)) { + int whichBuf = screen->whichBuf; + if (savelines < 0) savelines = 0; @@ -606,7 +608,7 @@ * data in the alternate buffer. */ if (screen->whichBuf) - SwitchBufPtrs(screen); + SwitchBufPtrs(screen, 0); #if OPT_SAVE_LINES #if !OPT_FIFO_LINES @@ -644,8 +646,8 @@ /* * Switch the pointers back before we start painting on the screen. */ - if (screen->whichBuf) - SwitchBufPtrs(screen); + if (whichBuf) + SwitchBufPtrs(screen, whichBuf); update_font_utf8_mode(); SetVTFont(xw, screen->menu_font_number, True, NULL); @@ -1732,6 +1734,7 @@ /* update buffers if the screen has changed size */ if (MaxRows(screen) != rows || MaxCols(screen) != cols) { + int whichBuf = 0; int delta_rows = rows - MaxRows(screen); #if OPT_TRACE int delta_cols = cols - MaxCols(screen); @@ -1958,9 +1961,13 @@ } #else /* !OPT_SAVE_LINES */ if (screen->whichBuf - && GravityIsSouthWest(xw)) + && GravityIsSouthWest(xw)) { /* swap buffer pointers back to make this work */ - SwitchBufPtrs(screen); + whichBuf = screen->whichBuf; + SwitchBufPtrs(screen, 0); + } else { + whichBuf = 0; + } if (screen->editBuf_index[1]) (void) Reallocate(xw, &screen->editBuf_index[1], @@ -1997,8 +2004,8 @@ screen->cursorp.row += move_down_by; ScrollSelection(screen, move_down_by, True); - if (screen->whichBuf) - SwitchBufPtrs(screen); /* put the pointers back */ + if (whichBuf) + SwitchBufPtrs(screen, whichBuf); /* put the pointers back */ } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/version.h new/xterm-255/version.h --- old/xterm-254/version.h 2009-12-12 18:16:02.000000000 +0100 +++ new/xterm-255/version.h 2010-01-20 02:39:08.000000000 +0100 @@ -1,9 +1,9 @@ /* - * $XTermId: version.h,v 1.311 2009/12/12 17:16:02 tom Exp $ + * $XTermId: version.h,v 1.313 2010/01/20 01:39:08 tom Exp $ * ---------------------------------------------------------------------------- * this file is part of xterm * - * Copyright 1998-2008,2009 by Thomas E. Dickey + * Copyright 1998-2009,2010 by Thomas E. Dickey * * All Rights Reserved * @@ -39,7 +39,7 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 254 +#define XTERM_PATCH 255 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/xterm.h new/xterm-255/xterm.h --- old/xterm-254/xterm.h 2010-01-05 00:02:40.000000000 +0100 +++ new/xterm-255/xterm.h 2010-01-20 02:36:37.000000000 +0100 @@ -1,8 +1,8 @@ -/* $XTermId: xterm.h,v 1.607 2010/01/04 23:02:40 tom Exp $ */ +/* $XTermId: xterm.h,v 1.608 2010/01/20 01:36:37 tom Exp $ */ /************************************************************ -Copyright 1999-2008,2009 by Thomas E. Dickey +Copyright 1999-2009,2010 by Thomas E. Dickey All Rights Reserved @@ -801,7 +801,7 @@ extern void HideCursor (void); extern void RestartBlinking(TScreen * /* screen */); extern void ShowCursor (void); -extern void SwitchBufPtrs (TScreen * /* screen */); +extern void SwitchBufPtrs (TScreen * /* screen */, int /* toBuf */); extern void ToggleAlternate (XtermWidget /* xw */); extern void VTReset (XtermWidget /* xw */, int /* full */, int /* saved */); extern void VTRun (XtermWidget /* xw */); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/xterm.log.html new/xterm-255/xterm.log.html --- old/xterm-254/xterm.log.html 2010-01-06 11:57:35.000000000 +0100 +++ new/xterm-255/xterm.log.html 2010-01-22 02:00:37.000000000 +0100 @@ -31,7 +31,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.900 2010/01/06 10:57:35 tom Exp $ + $XTermId: xterm.log.html,v 1.906 2010/01/22 01:00:37 tom Exp $ --> <HTML> <HEAD> @@ -56,6 +56,7 @@ is the latest version of this file. <UL> +<LI><A HREF="#xterm_255">Patch #255 - 2010/1/21</A> <LI><A HREF="#xterm_254">Patch #254 - 2010/1/6</A> <LI><A HREF="#xterm_253">Patch #253 - 2009/12/10</A> <LI><A HREF="#xterm_252">Patch #252 - 2009/12/7</A> @@ -313,6 +314,28 @@ <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A> </UL> +<H1><A NAME="xterm_255">Patch #255 - 2010/1/21</A></H1> +<ul> + <li>rename <code>install.sh</code> to <code>install-sh</code> in case + suffix-rules might interfere. + + <li>extend range for <code>convertToUTF8</code> function to full + 31-bits, to use with printing, etc. + + <li>improve manpage by checking for actual locations of + utmp/wtmp files (Debian #562640). + + <li>modify configure macro CF_XOPEN_SOURCE to remove -D's before + adding the same name rather than relying on -U's, to reduce + redefinition warnings for some platforms that have conflicting + definitions in headers. + + <li>correct logic used to switch to alternate screen using FIFO-lines + configuration (Debian #565772). + + <li>update config.guess, config.sub +</ul> + <H1><A NAME="xterm_254">Patch #254 - 2010/1/6</A></H1> <ul> <li>add a configure-check to eliminate <code>install-ti</code> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-254/xterm.man new/xterm-255/xterm.man --- old/xterm-254/xterm.man 2010-01-04 23:58:41.000000000 +0100 +++ new/xterm-255/xterm.man 2010-01-20 11:55:58.000000000 +0100 @@ -1,5 +1,5 @@ '\" t -.\" $XTermId: xterm.man,v 1.450 2010/01/04 22:58:41 tom Exp $ +.\" $XTermId: xterm.man,v 1.451 2010/01/20 10:55:58 tom Exp $ .\" .\" Copyright 1996-2009,2010 by Thomas E. Dickey .\" @@ -1283,8 +1283,8 @@ .TP 8 .B "ptyHandshake (\fPclass\fB PtyHandshake) If \*(``true\*('', \fIxterm\fP will perform handshaking during initialization -to ensure that the parent and child processes update the \fButmp\fP -and \fBstty\fP state. +to ensure that the parent and child processes update the \fIutmp\fP +and \fIstty\fP state. See also \fBwaitForMap\fP which waits for the pseudo-terminal's notion of the screen size, and \fBptySttySize\fP which resets the screen size after other terminal @@ -5275,7 +5275,7 @@ .TP 5 XTERM_SHELL is set to the pathname of the program which is invoked. -Usually that is a shell program, e.g., \fB/bin/sh\fP. +Usually that is a shell program, e.g., \fI/bin/sh\fP. Since it is not necessarily a shell program however, it is distinct from \*(``SHELL\*(''. .TP 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

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Wed Feb 24 02:34:13 CET 2010. -------- --- xorg-x11-server/xorg-x11-server.changes 2010-02-12 18:21:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2010-02-20 08:54:33.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Feb 20 08:35:14 CET 2010 - sndirsch(a)suse.de + +- update to 1.7.5 + * Only four fixes since the RC, with the fix for 25640 being + rather noteworthy - if your X server crashed on replugging + keyboards (or using a KVM), you're encouraged to upgrade. + - dix: restore lastDeviceEventTime update in dixSaveScreens + - Don't double-swap the RandR PropertyNotify event + - Xi: reset the sli pointers after copying device classes. + (bfo #25640) + - RENDER: Fix gradient and solid fill pictures with Xinerama, + and misc cleanup +- obsoletes + 0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch xorg-server-1.7.4.tar.bz2 New: ---- xorg-server-1.7.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.VOzBMC/_old 2010-02-24 02:33:49.000000000 +0100 +++ /var/tmp/diff_new_pack.VOzBMC/_new 2010-02-24 02:33:49.000000000 +0100 @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.7.4 +%define dirsuffix 1.7.5 %define fglrx_driver_hack 0 ### FIXME %define vnc 1 @@ -33,7 +33,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 66 +Release: 67 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -130,7 +130,6 @@ Patch202: 0001-Check-harder-for-primary-PCI-device.patch Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch Patch204: missing_font_paths.diff -Patch205: 0001-Don-t-double-swap-the-RandR-PropertyNotify-event.patch %description This package contains the X.Org Server. @@ -263,7 +262,6 @@ %patch202 -p1 %patch203 -p1 %patch204 -p0 -%patch205 -p1 %build pushd xorg-docs-* ++++++ xorg-server-1.7.4.tar.bz2 -> xorg-server-1.7.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/ChangeLog new/xorg-server-1.7.5/ChangeLog --- old/xorg-server-1.7.4/ChangeLog 2010-01-08 01:14:06.000000000 +0100 +++ new/xorg-server-1.7.5/ChangeLog 2010-02-16 04:40:14.000000000 +0100 @@ -1,3 +1,354 @@ +commit f0ec2e0d7d0533b3b3fcccd9d78b76e4c9002d1e +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Feb 16 11:34:38 2010 +1000 + + xserver 1.7.5 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 15e9a3fc0c4776f3ff02a59375e61d9090e35a22 +Author: Julien Cristau <jcristau(a)debian.org> +Date: Fri Feb 12 23:34:57 2010 +0100 + + dix: restore lastDeviceEventTime update in dixSaveScreens + + This was removed in 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 (Do not + reset lastDeviceEventTime when we do dixSaveScreens), but caused a + regression for XResetScreenSaver. Add the lastDeviceEventTime update + back, but restrict it to that case. + + X.Org bug#25855 <http://bugs.freedesktop.org/25855> + + Reported-by: Lubos Lunak <l.lunak(a)suse.cz> + Tested-by: Lubos Lunak <l.lunak(a)suse.cz> + Signed-off-by: Julien Cristau <jcristau(a)debian.org> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit 001ce71dc11287dc94cc2fbc5d35677c046e6c04) + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 38a83dce236da44856c075b5589d38ef0a662d4b +Author: Peter Harris <pharris(a)opentext.com> +Date: Fri Feb 12 15:36:30 2010 -0500 + + Don't double-swap the RandR PropertyNotify event + + The event is already swapped in randr.c/SRROutputPropertyNotifyEvent, so + it should not be swapped here. + + X.Org Bugzilla #26511: http://bugs.freedesktop.org/show_bug.cgi?id=26511 + + Tested-by: Leonardo Chiquitto <leonardo(a)ngdn.org> + Acked-by: Adam Jackson <ajax at redhat.com> + Reviewed-by: Julien Cristau <jcristau at debian.org> + Signed-off-by: Peter Harris <pharris(a)opentext.com> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit 97b03037f4d99fcebc7603011f41c3aff9871ce2) + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 829980a4ff36b46745cf958824338b6341302c7b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Jan 13 15:03:45 2010 +1000 + + Xi: reset the sli pointers after copying device classes. (#25640) + + If the indicator flags have the XkbSLI_IsDefault bit set, the indicator map + and names aren't their own bit of memory but rather point into the + device->key->xkbInfo->desc structure. XkbCopySrvLedInfo knows about this and + leaves the pointers alone. + + When copying the classes from the slave to the master, these pointers are + copied and still point to the dev->key class of the slave device. If the + slave device is removed, the memory becomes invalid and a call to modify + this data (e.g. XkbSetIndicators) may cause a deadlock. + + The copying of dev->key relies on dev->kbdfeed to be already set up. Hence + the pointers need to be reset once _both_ kbdfeed and key have been copied + into the master device. + + X.Org Bug 25640 <http://bugs.freedesktop.org/show_bug.cgi?id=25640> + Fedora Bug 540584 <https://bugzilla.redhat.com/show_bug.cgi?id=540584> + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit 48f7298657f91843db36566b8d66d6c4c18dbd4c) + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 34cedd1e3d80cc84277662a94de797738bdb5fce +Author: Robert Morell <rmorell(a)nvidia.com> +Date: Fri Jan 29 19:07:03 2010 -0800 + + RENDER: Fix gradient and solid fill pictures with Xinerama, and misc cleanup + + If these aren't wrapped, then procs that are wrapped (such as + RenderChangePicture) will fail in Xinerama when they see the resource + type of a picture created through one of these interfaces is PictureType + and not XRT_PICTURE like those allocated via RenderCreatePicture. + + Signed-off-by: Robert Morell <rmorell(a)nvidia.com> + Reviewed-by: Aaron Plattner <aplattner(a)nvidia.com> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit 4d575b0559817258f7a0ce6c4d2d0f9e7e5bba63) + +commit 85b04bb0ebaf7a6f1b1a34f7b1704a3e6cbdab8a +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Feb 5 18:08:37 2010 +1000 + + xserver 1.7.4.902 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 219a0d8fb54f179c7ac8d5953585849ab65a778b +Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> +Date: Sun Jan 17 17:59:03 2010 +0100 + + Allow driver to call DeleteInputDeviceRequest during UnInit + + When the input driver (like xf86-input-wacom) removes it's devices + during a call to UnInit, the CloseDownDevices() cannot handle it. The + "next" variable can become a pointer to freed memory. + + The patch introduces order-independent device freeing mechanism by + remembering the already freed device ids. The devices can reorder any + time during freeing. No device will be double-freed - if the removing + failed for any reason; some implementations of DeleteInputDeviceRequest + don't free the devices already. + + Signed-off-by: Oldřich Jedlička <oldium.pro(a)seznam.cz> + Reviewed-by: Simon Thum <simon.thum(a)gmx.de> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 08b22c7faf97217ea4d497eec6624fc3dd916d9b) + +commit a6a4c20121301905399c4e1c23980993bcbf2152 +Author: Horst Wente <horst.wente(a)acm.org> +Date: Wed Dec 30 19:35:20 2009 +0100 + + xkb: make ctrl+alt+keypad + / ctrl+alt+keypad - work again (#25743) + + Video mode switching via keypad keys did not work + + Signed-off-by: Horst Wente <horst.wente(a)acm.org> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit b91cec26de367f75388e620772747b08eee34294) + +commit a5b558d065e24880ff14b3781f27d1a9ea6094ab +Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> +Date: Tue Jan 12 19:15:06 2010 +0100 + + Fix typo in updateSlaveDeviceCoords + + The index [0] for the second valuator looks bogus; fix it. + + Signed-off-by: Oldřich Jedlička <oldium.pro(a)seznam.cz> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 993e78d6c433f65bd8a87890a6bb6da480b2cdc4) + +commit 5d34e78c81bfba3d14146ddfd8e714cdfd9a1692 +Author: Robert Morell <rmorell(a)nvidia.com> +Date: Thu Jan 21 12:38:47 2010 -0800 + + Render: Fix request size verification + + RenderSetPictureClipRectangles and the Xinerama version of + RenderChangePicture were using the wrong structure types for request + size verification. + + Signed-off-by: Robert Morell <rmorell(a)nvidia.com> + Reviewed-by: Aaron Plattner <aplattner(a)nvidia.com> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit 8d6b1838330625b758ebc55bb0df1b425c5cefaf) + +commit 6f533994921725653306753f474c343fbb3b88a4 +Author: Simon Thum <simon.thum(a)gmx.de> +Date: Sat Jan 23 13:36:22 2010 +0100 + + xfree86: remove man page reference inexistent acceleration profile + + not implemented in the X.org server 1.7 + + Signed-off-by: Simon Thum <simon.thum(a)gmx.de> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 1c126ba53161933fa1a756e696e98f1395dfa61a +Author: Jeremy Huddleston <jeremyhu(a)apple.com> +Date: Sat Jan 30 14:49:02 2010 -0800 + + XQuartz: Attatch a stub display when CoreGraphics reports no displays. + + This is half of the required changes to address the "stuck mouse pointer" + bug that occurs when X11 launches while the displays are asleep. The + remainder of the fix is part of libXplugin which needs to be updated to + send XP_EVENT_DISPLAY_CHANGED when the display wakes up. If you don't + have a recent enough libXplugin (expected in 2.5.0_beta2 or later), you + can cause this event to be sent by changing your display resolution (or + you could just start X11.app with your screens awake). + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)apple.com> + (cherry picked from commit 52456c602c3cdd7d5eac677889a18fad37dfb7ae) + +commit 734a6b9c2150ce38cf120e179cdac9d3c625434e +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Jan 26 22:25:04 2010 -0800 + + Avoid segfaults in XF86VidMode GammaRamp functions if randr_crtc is NULL + + Fixes crash when xscreensaver tries to use GammaRamp calls to fade out + http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6915712 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + Reviewed-by: Keith Packard <keithp(a)keithp.com> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit b47231b2fd4e403403945d6da6119398b16f385d +Author: Aaron Zang <Aaron.Zang(a)Sun.COM> +Date: Mon Dec 14 17:55:46 2009 -0800 + + Solaris: Avoid switching to inactive VT's + + Fix for OpenSolaris bug 6876992: "[vconsole] Ctrl+Alt+F12 switchs to blank + console screen with hotkeys property turned-off" + http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6876992 + + Xorg needs to do sanity test for the VT it is commanded to switch to. + If the VT is not opened by any process, discard the switching request. + + The changes also contain the fix for some flaws discovered when + getting the new gdm to run. + + Signed-off-by: Aaron Zang <Aaron.Zang(a)Sun.COM> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 66b6e2fd49fdc650703e56aa176a902e4921251c +Author: Pierre-Loup A. Griffais <pgriffais(a)nvidia.com> +Date: Wed Jan 27 14:03:03 2010 -0800 + + Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5. + + *xoff and *yoff were uninitialized for source-only pictures.x + + Signed-off-by: Pierre-Loup A. Griffais <pgriffais(a)nvidia.com> + Reviewed-by: Aaron Plattner <aplattner(a)nvidia.com> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1) + +commit a191318f8dde2a4ff47c051244e8c88e8f92883a +Author: Christian Zander <chzander(a)nvidia.com> +Date: Mon Jan 11 12:29:07 2010 -0800 + + x86emu: Respect the LEA 67h address size prefix. + + Signed-off-by: Christian Zander <chzander(a)nvidia.com> + Signed-off-by: Aaron Plattner <aplattner(a)nvidia.com> + Tested-by: Tiago Vignatti <tiago.vignatti(a)nokia.com> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit f57bc0ede8e018c7e264b917927c42a018cd1d5a) + +commit d3e54304578cbeb948a13654614b75bea4c55449 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Sat Jan 23 12:55:38 2010 +1300 + + xserver 1.7.4.901 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 43412c6b8bc7af7df0c07590002c2f96d57ba861 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Jan 13 11:20:29 2010 -0800 + + XQuartz: Update copyright in bundle for 2010 + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + (cherry picked from commit 6bde306f7f6b9bbabeaa8bb910ea549be906cd8b) + +commit 268c00d24b1938aaa75ad23892fba6ef241fbe9d +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Mon Jan 11 18:02:55 2010 -0800 + + XQuartz: Setup the modifier map in the quartz thread + + This avoids possible doing it twice which could result in incorrect + keycodes for alt due to our loss of information about its side. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + (cherry picked from commit 6008cc116493cb2825ad0bda0b407b7aefabb3f4) + +commit b852834bb1974a2c149869b6e19aff000a2b4187 +Author: Simon Thum <simon.thum(a)gmx.de> +Date: Wed Jan 6 18:13:27 2010 +0100 + + os: state effect of -a and -t options more precisely + + Signed-off-by: Simon Thum <simon.thum(a)gmx.de> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 14e4e4a294e648e0bdcb70c34748e1b81c5bb64f) + +commit d76f09406d07fd04a03d9cb3965419b1e95bdd03 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 7 15:23:34 2010 -0500 + + macros: use PKG_CONFIG variable rather than executable name + + User can defined alternate location for pkg-config. + Once option in place, all instances of pkg-config must be converted. + + Acked-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit 6a2a57832709798d99d19ff4c587e22f3b3c150d) + +commit 08c2df881d61fccfd488b5ca4482686a7f3b47c0 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Jan 8 19:04:25 2010 -0500 + + configure: use backticks rather than $() for commands + + This patch to xserver configure.ac is to increase code portability to + non POSIX system by using backticks rather than $() for command + substitution for BUILD_DATE and BUILD_TIME. + + Reviewed-by: Rémi Cardona <remi(a)gentoo.org> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit 6313d2da6c6910827d68cf31fe00b46a34c5bfc7) + +commit b7e903526c28eb4d5368d916708ff30486e94319 +Author: Simon Thum <simon.thum(a)gmx.de> +Date: Tue Jan 19 17:34:49 2010 +1300 + + xfree86: document pointer acceleration in xorg.conf.man + + Signed-off-by: Simon Thum <simon.thum(a)gmx.de> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 0722c287a4c8a6cdedca9756192547bfcf77ade5) + + Conflicts: + + hw/xfree86/doc/man/xorg.conf.man.pre + +commit c5e5a7adf0ed378b6f3b28f04af5ad8d967b31bc +Author: Simon Thum <simon.thum(a)gmx.de> +Date: Tue Jan 19 17:33:09 2010 +1300 + + doc: actually document SendDragEvents + + Signed-off-by: Simon Thum <simon.thum(a)gmx.de> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 14039b5a7982fbf8130501bb00766176a4e9bccb) + + Conflicts: + + hw/xfree86/doc/man/xorg.conf.man.pre + commit 88582f3d41315abf548a52622e52b7652d2c5281 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Fri Jan 8 09:38:58 2010 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/Xi/exevents.c new/xorg-server-1.7.5/Xi/exevents.c --- old/xorg-server-1.7.4/Xi/exevents.c 2010-01-07 03:10:55.000000000 +0100 +++ new/xorg-server-1.7.5/Xi/exevents.c 2010-02-16 04:08:00.000000000 +0100 @@ -444,6 +444,26 @@ to->key = NULL; } + /* If a SrvLedInfoPtr's flags are XkbSLI_IsDefault, the names and maps + * pointer point into the xkbInfo->desc struct. XkbCopySrvLedInfo + * didn't update the pointers so we need to do it manually here. + */ + if (to->kbdfeed) + { + KbdFeedbackPtr k; + + for (k = to->kbdfeed; k; k = k->next) + { + if (!k->xkb_sli) + continue; + if (k->xkb_sli->flags & XkbSLI_IsDefault) + { + k->xkb_sli->names = to->key->xkbInfo->desc->names->indicators; + k->xkb_sli->maps = to->key->xkbInfo->desc->indicators->maps; + } + } + } + /* We can't just copy over the focus class. When an app sets the focus, * it'll do so on the master device. Copying the SDs focus means losing * the focus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/aclocal.m4 new/xorg-server-1.7.5/aclocal.m4 --- old/xorg-server-1.7.4/aclocal.m4 2010-01-08 00:47:58.000000000 +0100 +++ new/xorg-server-1.7.5/aclocal.m4 2010-02-16 04:08:25.000000000 +0100 @@ -1207,29 +1207,23 @@ dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a -dnl copy of this software and associated documentation files (the -dnl "Software"), to deal in the Software without restriction, including -dnl without limitation the rights to use, copy, modify, merge, publish, -dnl distribute, and/or sell copies of the Software, and to permit persons -dnl to whom the Software is furnished to do so, provided that the above -dnl copyright notice(s) and this permission notice appear in all copies of -dnl the Software and that both the above copyright notice(s) and this -dnl permission notice appear in supporting documentation. +dnl copy of this software and associated documentation files (the "Software"), +dnl to deal in the Software without restriction, including without limitation +dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, +dnl and/or sell copies of the Software, and to permit persons to whom the +dnl Software is furnished to do so, subject to the following conditions: dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl The above copyright notice and this permission notice (including the next +dnl paragraph) shall be included in all copies or substantial portions of the +dnl Software. dnl -dnl Except as contained in this notice, the name of a copyright holder -dnl shall not be used in advertising or otherwise to promote the sale, use -dnl or other dealings in this Software without prior written authorization -dnl of the copyright holder. +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +dnl DEALINGS IN THE SOFTWARE. # XORG_MACROS_VERSION(required-version) # ------------------------------------- @@ -1247,7 +1241,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.3.0]) +m4_define([vers_have], [1.5.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1514,6 +1508,159 @@ AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK +# XORG_WITH_XMLTO +# ---------------- +# Minimum version: 1.5.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-xmlto option, it allows maximum flexibilty in making decisions +# as whether or not to use the xmlto package. +# +# Interface to module: +# HAVE_XMLTO: used in makefiles to conditionally generate documentation +# XMLTO: returns the path of the xmlto program found +# returns the path set by the user in the environment +# --with-xmlto: 'yes' user instructs the module to use xmlto +# 'no' user instructs the module not to use xmlto +# +# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_XMLTO],[ +AC_ARG_VAR([XMLTO], [Path to xmlto command]) +AC_ARG_WITH(xmlto, + AS_HELP_STRING([--with-xmlto], + [Use xmlto to regenerate documentation (default: yes, if installed)]), + [use_xmlto=$withval], [use_xmlto=auto]) + +if test "x$use_xmlto" = x"auto"; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_WARN([xmlto not found - documentation targets will be skipped]) + have_xmlto=no + else + have_xmlto=yes + fi +elif test "x$use_xmlto" = x"yes" ; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH]) + fi + have_xmlto=yes +elif test "x$use_xmlto" = x"no" ; then + if test "x$XMLTO" != "x"; then + AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified]) + fi + have_xmlto=no +else + AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) +]) # XORG_CHECK_XMLTO + +# XORG_WITH_ASCIIDOC +# ---------------- +# Minimum version: 1.5.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# as whether or not to use the asciidoc package. +# +# Interface to module: +# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation +# ASCIIDOC: returns the path of the asciidoc program found +# returns the path set by the user in the environment +# --with-asciidoc: 'yes' user instructs the module to use asciidoc +# 'no' user instructs the module not to use asciidoc +# +# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_ASCIIDOC],[ +AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +AC_ARG_WITH(asciidoc, + AS_HELP_STRING([--with-asciidoc], + [Use asciidoc to regenerate documentation (default: yes, if installed)]), + [use_asciidoc=$withval], [use_asciidoc=auto]) + +if test "x$use_asciidoc" = x"auto"; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_WARN([asciidoc not found - documentation targets will be skipped]) + have_asciidoc=no + else + have_asciidoc=yes + fi +elif test "x$use_asciidoc" = x"yes" ; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH]) + fi + have_asciidoc=yes +elif test "x$use_asciidoc" = x"no" ; then + if test "x$ASCIIDOC" != "x"; then + AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified]) + fi + have_asciidoc=no +else + AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) +]) # XORG_CHECK_ASCIIDOC + +# XORG_WITH_DOXYGEN +# ---------------- +# Minimum version: 1.5.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-doxygen option, it allows maximum flexibilty in making decisions +# as whether or not to use the doxygen package. +# +# Interface to module: +# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation +# DOXYGEN: returns the path of the doxygen program found +# returns the path set by the user in the environment +# --with-doxygen: 'yes' user instructs the module to use doxygen +# 'no' user instructs the module not to use doxygen +# +# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_DOXYGEN],[ +AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +AC_ARG_WITH(doxygen, + AS_HELP_STRING([--with-doxygen], + [Use doxygen to regenerate documentation (default: yes, if installed)]), + [use_doxygen=$withval], [use_doxygen=auto]) + +if test "x$use_doxygen" = x"auto"; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_WARN([doxygen not found - documentation targets will be skipped]) + have_doxygen=no + else + have_doxygen=yes + fi +elif test "x$use_doxygen" = x"yes" ; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH]) + fi + have_doxygen=yes +elif test "x$use_doxygen" = x"no" ; then + if test "x$DOXYGEN" != "x"; then + AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified]) + fi + have_doxygen=no +else + AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) +]) # XORG_CHECK_DOXYGEN + # XORG_CHECK_MALLOC_ZERO # ---------------------- # Minimum version: 1.0.0 @@ -1543,7 +1690,8 @@ exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); }], [MALLOC_ZERO_RETURNS_NULL=yes], - [MALLOC_ZERO_RETURNS_NULL=no]) + [MALLOC_ZERO_RETURNS_NULL=no], + [MALLOC_ZERO_RETURNS_NULL=yes]) fi AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) @@ -1710,15 +1858,15 @@ # Minimum version: 1.4.0 # # Defines the variable INSTALL_CMD as the command to copy -# INSTALL from $prefix/share/doc/util-macros. +# INSTALL from $prefix/share/util-macros. # AC_DEFUN([XORG_INSTALL], [ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -macros_docdir=$($PKG_CONFIG --print-errors --variable=docdir xorg-macros) -INSTALL_CMD="(cp -f "$macros_docdir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ +macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"docdir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" AC_SUBST([INSTALL_CMD]) ]) # XORG_INSTALL dnl Copyright 2005 Red Hat, Inc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/configure new/xorg-server-1.7.5/configure --- old/xorg-server-1.7.4/configure 2010-01-08 00:48:03.000000000 +0100 +++ new/xorg-server-1.7.5/configure 2010-02-16 04:08:38.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xorg-server 1.7.4. +# Generated by GNU Autoconf 2.63 for xorg-server 1.7.5. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.7.4' -PACKAGE_STRING='xorg-server 1.7.4' +PACKAGE_VERSION='1.7.5' +PACKAGE_STRING='xorg-server 1.7.5' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -2004,7 +2004,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 xorg-server 1.7.4 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.7.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2074,7 +2074,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.7.4:";; + short | recursive ) echo "Configuration of xorg-server 1.7.5:";; esac cat <<\_ACEOF @@ -2409,7 +2409,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.7.4 +xorg-server configure 1.7.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2423,7 +2423,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.7.4, which was +It was created by xorg-server $as_me 1.7.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2791,7 +2791,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2010-01-08" +RELEASE_DATE="2010-02-16" am__api_version='1.11' @@ -3274,7 +3274,7 @@ # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.7.4' + VERSION='1.7.5' cat >>confdefs.h <<_ACEOF @@ -30553,9 +30553,9 @@ test "$exec_prefix_NONE" && exec_prefix=NONE -BUILD_DATE="$(date +'%Y%m%d')" +BUILD_DATE="`date +'%Y%m%d'`" -BUILD_TIME="$(date +'1%H%M%S')" +BUILD_TIME="`date +'1%H%M%S'`" DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS" @@ -31869,7 +31869,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.7.4, which was +This file was extended by xorg-server $as_me 1.7.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31932,7 +31932,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xorg-server config.status 1.7.4 +xorg-server config.status 1.7.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/configure.ac new/xorg-server-1.7.5/configure.ac --- old/xorg-server-1.7.4/configure.ac 2010-01-08 00:38:40.000000000 +0100 +++ new/xorg-server-1.7.5/configure.ac 2010-02-16 04:08:01.000000000 +0100 @@ -26,8 +26,8 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.7.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2010-01-08" +AC_INIT([xorg-server], 1.7.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2010-02-16" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE @@ -2020,9 +2020,9 @@ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) -BUILD_DATE="$(date +'%Y%m%d')" +BUILD_DATE="`date +'%Y%m%d'`" AC_SUBST([BUILD_DATE]) -BUILD_TIME="$(date +'1%H%M%S')" +BUILD_TIME="`date +'1%H%M%S'`" AC_SUBST([BUILD_TIME]) DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/dix/devices.c new/xorg-server-1.7.5/dix/devices.c --- old/xorg-server-1.7.4/dix/devices.c 2010-01-08 00:03:24.000000000 +0100 +++ new/xorg-server-1.7.5/dix/devices.c 2010-02-16 01:24:22.000000000 +0100 @@ -878,13 +878,43 @@ } /** + * Shut down all devices of one list and free all resources. + */ +static +void +CloseDeviceList(DeviceIntPtr *listHead) +{ + /* Used to mark devices that we tried to free */ + Bool freedIds[MAXDEVICES]; + DeviceIntPtr dev; + int i; + + if (listHead == NULL) + return; + + for (i = 0; i < MAXDEVICES; i++) + freedIds[i] = FALSE; + + dev = *listHead; + while (dev != NULL) + { + freedIds[dev->id] = TRUE; + DeleteInputDeviceRequest(dev); + + dev = *listHead; + while (dev != NULL && freedIds[dev->id]) + dev = dev->next; + } +} + +/** * Shut down all devices, free all resources, etc. * Only useful if you're shutting down the server! */ void CloseDownDevices(void) { - DeviceIntPtr dev, next; + DeviceIntPtr dev; /* Float all SDs before closing them. Note that at this point resources * (e.g. cursors) have been freed already, so we can't just call @@ -897,16 +927,8 @@ dev->u.master = NULL; } - for (dev = inputInfo.devices; dev; dev = next) - { - next = dev->next; - DeleteInputDeviceRequest(dev); - } - for (dev = inputInfo.off_devices; dev; dev = next) - { - next = dev->next; - DeleteInputDeviceRequest(dev); - } + CloseDeviceList(&inputInfo.devices); + CloseDeviceList(&inputInfo.off_devices); CloseDevice(inputInfo.pointer); CloseDevice(inputInfo.keyboard); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/dix/getevents.c new/xorg-server-1.7.5/dix/getevents.c --- old/xorg-server-1.7.4/dix/getevents.c 2010-01-07 03:10:55.000000000 +0100 +++ new/xorg-server-1.7.5/dix/getevents.c 2010-02-16 01:24:22.000000000 +0100 @@ -296,7 +296,7 @@ &pDev->last.remainder[0], NULL, pDev->valuator->axes + 0, scr->width); if(pDev->valuator->numAxes > 1) pDev->last.valuators[1] = rescaleValuatorAxis(pDev->last.valuators[1], pDev->last.remainder[1], - &pDev->last.remainder[0], NULL, pDev->valuator->axes + 1, scr->height); + &pDev->last.remainder[1], NULL, pDev->valuator->axes + 1, scr->height); /* calculate the other axis as well based on info from the old * slave-device. If the old slave had less axes than this one, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/dix/window.c new/xorg-server-1.7.5/dix/window.c --- old/xorg-server-1.7.4/dix/window.c 2009-10-28 07:56:19.000000000 +0100 +++ new/xorg-server-1.7.5/dix/window.c 2010-02-16 04:08:00.000000000 +0100 @@ -3233,8 +3233,13 @@ } } screenIsSaved = what; - if (mode == ScreenSaverReset) - SetScreenSaverTimer(); + if (mode == ScreenSaverReset) { + if (on == SCREEN_SAVER_FORCER) { + UpdateCurrentTimeIf(); + lastDeviceEventTime = currentTime; + } + SetScreenSaverTimer(); + } return Success; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/fb/fbpict.c new/xorg-server-1.7.5/fb/fbpict.c --- old/xorg-server-1.7.4/fb/fbpict.c 2010-01-07 23:44:56.000000000 +0100 +++ new/xorg-server-1.7.5/fb/fbpict.c 2010-02-16 01:24:22.000000000 +0100 @@ -453,6 +453,7 @@ else if (sp->type == SourcePictTypeConical) image = create_conical_gradient_image (gradient); } + *xoff = *yoff = 0; } if (image) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xfree86/common/xf86Events.c new/xorg-server-1.7.5/hw/xfree86/common/xf86Events.c --- old/xorg-server-1.7.4/hw/xfree86/common/xf86Events.c 2009-11-30 06:42:31.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xfree86/common/xf86Events.c 2010-02-16 01:24:23.000000000 +0100 @@ -202,8 +202,16 @@ vtno--; #endif #if defined(sun) - if (vtno == xf86Info.vtno) + if (vtno == xf86Info.vtno) { break; + } else { + struct vt_stat state; + if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &state) < 0) + break; + + if ((state.v_state & (1 << vtno)) == 0) + break; + } xf86Info.vtRequestsPending = TRUE; xf86Info.vtPendingNum = vtno; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xfree86/common/xf86cmap.c new/xorg-server-1.7.5/hw/xfree86/common/xf86cmap.c --- old/xorg-server-1.7.4/hw/xfree86/common/xf86cmap.c 2009-11-23 01:33:40.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xfree86/common/xf86cmap.c 2010-02-08 05:28:48.000000000 +0100 @@ -1004,12 +1004,14 @@ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc; - if (crtc->gammaSize != size) - return BadValue; + if (crtc) { + if (crtc->gammaSize != size) + return BadValue; - RRCrtcGammaSet(crtc, red, green, blue); + RRCrtcGammaSet(crtc, red, green, blue); - return Success; + return Success; + } } if(CMapScreenKey == NULL) @@ -1077,7 +1079,8 @@ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc; - return crtc->gammaSize; + if (crtc) + return crtc->gammaSize; } if(CMapScreenKey == NULL) return 0; @@ -1106,17 +1109,19 @@ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc; - if (crtc->gammaSize < size) - return BadValue; + if (crtc) { + if (crtc->gammaSize < size) + return BadValue; + + if (!RRCrtcGammaGet(crtc)) + return BadImplementation; + + memcpy(red, crtc->gammaRed, size * sizeof(*red)); + memcpy(green, crtc->gammaGreen, size * sizeof(*green)); + memcpy(blue, crtc->gammaBlue, size * sizeof(*blue)); - if (!RRCrtcGammaGet(crtc)) - return BadImplementation; - - memcpy(red, crtc->gammaRed, size * sizeof(*red)); - memcpy(green, crtc->gammaGreen, size * sizeof(*green)); - memcpy(blue, crtc->gammaBlue, size * sizeof(*blue)); - - return Success; + return Success; + } } if(CMapScreenKey == NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre new/xorg-server-1.7.5/hw/xfree86/doc/man/xorg.conf.man.pre --- old/xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre 2010-01-07 23:44:57.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xfree86/doc/man/xorg.conf.man.pre 2010-02-16 01:24:23.000000000 +0100 @@ -881,7 +881,50 @@ may be reattached or set floating at runtime. .TP 7 .BI "Option \*qSendDragEvents\*q \*q" boolean \*q -??? +Send core events while dragging. Enabled by default. +.PP +For pointing devices, the following options control how the pointer +is accelerated or decelerated with respect to physical device motion. Most of +these can be adjusted at runtime, see the xinput(1) man page for details. Only +the most important acceleration options are discussed here. +.TP 7 +.BI "Option \*qAccelerationProfile\*q \*q" integer \*q +Select the profile. In layman's terms, the profile constitutes the "feeling" of +the acceleration. More formally, it defines how the transfer function (actual +acceleration as a function of current device velocity and acceleration controls) +is constructed. This is mainly a matter of personal preference. +.PP +.RS 6 +.nf +.B " 0 classic (mostly compatible)" +.B "-1 none (only constant deceleration is applied)" +.B " 1 device-dependent" +.B " 2 polynomial (polynomial function)" +.B " 3 smooth linear (soft knee, then linear)" +.B " 4 simple (normal when slow, otherwise accelerated)" +.B " 5 power (power function)" +.B " 6 linear (more speed, more acceleration)" +.fi +.RE +.TP 7 +.BI "Option \*qConstantDeceleration\*q \*q" real \*q +Makes the pointer go +.B deceleration +times slower than normal. Most useful for high-resolution devices. +.TP 7 +.BI "Option \*qAdaptiveDeceleration\*q \*q" real \*q +Allows to actually decelerate the pointer when going slow. At most, it will be +.B adaptive deceleration +times slower. Enables precise pointer placement without sacrificing speed. +.TP 7 +.BI "Option \*qAccelerationScheme\*q \*q" string \*q +Selects the scheme, which is the underlying algorithm. +.PP +.RS 7 +.nf +.B "predictable default algorithm (behaving more predictable)" +.B "lightweight old acceleration code (as specified in the X protocol spec)" +.B "none no acceleration or deceleration" .SH "DEVICE SECTION" The config file may have multiple .B Device diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xfree86/os-support/solaris/sun_VTsw.c new/xorg-server-1.7.5/hw/xfree86/os-support/solaris/sun_VTsw.c --- old/xorg-server-1.7.4/hw/xfree86/os-support/solaris/sun_VTsw.c 2010-01-04 04:17:33.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xfree86/os-support/solaris/sun_VTsw.c 2010-02-16 01:24:23.000000000 +0100 @@ -38,17 +38,27 @@ * Handle the VT-switching interface for Solaris/OpenSolaris */ +static int xf86VTPruneDoor = 0; + void -xf86VTRequest(int sig) +xf86VTRelease(int sig) { - if (xf86Info.vtPendingNum != -1) + if (xf86Info.vtPendingNum == -1) { - ioctl(xf86Info.consoleFd, VT_RELDISP, 1); - xf86Info.vtPendingNum = -1; - + xf86VTPruneDoor = 1; + xf86Info.vtRequestsPending = TRUE; return; } + ioctl(xf86Info.consoleFd, VT_RELDISP, 1); + xf86Info.vtPendingNum = -1; + + return; +} + +void +xf86VTAcquire(int sig) +{ xf86Info.vtRequestsPending = TRUE; return; } @@ -68,6 +78,12 @@ xf86Info.vtRequestsPending = FALSE; + if (xf86VTPruneDoor) { + xf86VTPruneDoor = 0; + ioctl(xf86Info.consoleFd, VT_RELDISP, 1); + return (TRUE); + } + vt_door_arg.vt_ev = VT_EV_HOTKEYS; vt_door_arg.vt_num = xf86Info.vtPendingNum; door_arg.data_ptr = (char *)&vt_door_arg; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xfree86/os-support/solaris/sun_init.c new/xorg-server-1.7.5/hw/xfree86/os-support/solaris/sun_init.c --- old/xorg-server-1.7.4/hw/xfree86/os-support/solaris/sun_init.c 2009-10-28 07:56:22.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xfree86/os-support/solaris/sun_init.c 2010-02-05 09:08:09.000000000 +0100 @@ -39,6 +39,8 @@ static int VTnum = -1; static int xf86StartVT = -1; static int vtEnabled = 0; +extern void xf86VTAcquire(int); +extern void xf86VTRelease(int); #endif /* Device to open as xf86Info.consoleFd */ @@ -137,7 +139,8 @@ else { if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) || - (xf86Info.vtno == -1)) { + (xf86Info.vtno == -1)) + { FatalError("xf86OpenConsole: Cannot find a free VT\n"); } } @@ -146,7 +149,8 @@ snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno); } - if (fd != -1) { + if (fd != -1) + { close(fd); } @@ -178,11 +182,12 @@ if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) FatalError("xf86OpenConsole: VT_GETMODE failed\n"); - OsSignal(SIGUSR1, xf86VTRequest); + OsSignal(SIGUSR1, xf86VTAcquire); + OsSignal(SIGUSR2, xf86VTRelease); VT.mode = VT_PROCESS; - VT.relsig = SIGUSR1; VT.acqsig = SIGUSR1; + VT.relsig = SIGUSR2; if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0) FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n"); @@ -204,7 +209,8 @@ else /* serverGeneration != 1 */ { #ifdef HAS_USL_VTS - if (vtEnabled) { + if (vtEnabled) + { /* * Now re-get the VT */ @@ -285,7 +291,8 @@ #endif #ifdef HAS_USL_VTS - if (vtEnabled == 1) { + if (vtEnabled) + { if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1) { VT.mode = VT_AUTO; /* Set default vt handling */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xfree86/x86emu/ops.c new/xorg-server-1.7.5/hw/xfree86/x86emu/ops.c --- old/xorg-server-1.7.4/hw/xfree86/x86emu/ops.c 2009-07-10 06:05:33.000000000 +0200 +++ new/xorg-server-1.7.5/hw/xfree86/x86emu/ops.c 2010-02-05 09:08:09.000000000 +0100 @@ -6567,42 +6567,62 @@ static void x86emuOp_lea_word_R_M(u8 X86EMU_UNUSED(op1)) { int mod, rl, rh; - u16 *srcreg; uint destoffset; -/* - * TODO: Need to handle address size prefix! - * - * lea eax,[eax+ebx*2] ?? - */ - START_OF_INSTR(); DECODE_PRINTF("LEA\t"); FETCH_DECODE_MODRM(mod, rh, rl); switch (mod) { case 0: - srcreg = DECODE_RM_WORD_REGISTER(rh); - DECODE_PRINTF(","); - destoffset = decode_rm00_address(rl); - DECODE_PRINTF("\n"); - TRACE_AND_STEP(); - *srcreg = (u16)destoffset; + if (M.x86.mode & SYSMODE_PREFIX_ADDR) { + u32 *srcreg = DECODE_RM_LONG_REGISTER(rh); + DECODE_PRINTF(","); + destoffset = decode_rm00_address(rl); + DECODE_PRINTF("\n"); + TRACE_AND_STEP(); + *srcreg = (u32)destoffset; + } else { + u16 *srcreg = DECODE_RM_WORD_REGISTER(rh); + DECODE_PRINTF(","); + destoffset = decode_rm00_address(rl); + DECODE_PRINTF("\n"); + TRACE_AND_STEP(); + *srcreg = (u16)destoffset; + } break; case 1: - srcreg = DECODE_RM_WORD_REGISTER(rh); - DECODE_PRINTF(","); - destoffset = decode_rm01_address(rl); - DECODE_PRINTF("\n"); - TRACE_AND_STEP(); - *srcreg = (u16)destoffset; + if (M.x86.mode & SYSMODE_PREFIX_ADDR) { + u32 *srcreg = DECODE_RM_LONG_REGISTER(rh); + DECODE_PRINTF(","); + destoffset = decode_rm01_address(rl); + DECODE_PRINTF("\n"); + TRACE_AND_STEP(); + *srcreg = (u32)destoffset; + } else { + u16 *srcreg = DECODE_RM_WORD_REGISTER(rh); + DECODE_PRINTF(","); + destoffset = decode_rm01_address(rl); + DECODE_PRINTF("\n"); + TRACE_AND_STEP(); + *srcreg = (u16)destoffset; + } break; case 2: - srcreg = DECODE_RM_WORD_REGISTER(rh); - DECODE_PRINTF(","); - destoffset = decode_rm10_address(rl); - DECODE_PRINTF("\n"); - TRACE_AND_STEP(); - *srcreg = (u16)destoffset; + if (M.x86.mode & SYSMODE_PREFIX_ADDR) { + u32 *srcreg = DECODE_RM_LONG_REGISTER(rh); + DECODE_PRINTF(","); + destoffset = decode_rm10_address(rl); + DECODE_PRINTF("\n"); + TRACE_AND_STEP(); + *srcreg = (u32)destoffset; + } else { + u16 *srcreg = DECODE_RM_WORD_REGISTER(rh); + DECODE_PRINTF(","); + destoffset = decode_rm10_address(rl); + DECODE_PRINTF("\n"); + TRACE_AND_STEP(); + *srcreg = (u16)destoffset; + } break; case 3: /* register to register */ /* undefined. Do nothing. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xquartz/bundle/Info.plist.cpp new/xorg-server-1.7.5/hw/xquartz/bundle/Info.plist.cpp --- old/xorg-server-1.7.4/hw/xquartz/bundle/Info.plist.cpp 2009-10-28 07:56:22.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xquartz/bundle/Info.plist.cpp 2010-02-05 01:39:09.000000000 +0100 @@ -35,9 +35,9 @@ <string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string> #endif <key>NSHumanReadableCopyright</key> - <string>© 2003-2009 Apple Inc. + <string>© 2003-2010 Apple Inc. © 2003 XFree86 Project, Inc. -© 2003-2009 X.org Foundation, Inc. +© 2003-2010 X.org Foundation, Inc. </string> <key>NSMainNibFile</key> <string>main</string> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xquartz/quartzKeyboard.c new/xorg-server-1.7.5/hw/xquartz/quartzKeyboard.c --- old/xorg-server-1.7.4/hw/xquartz/quartzKeyboard.c 2009-11-30 06:42:31.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xquartz/quartzKeyboard.c 2010-02-05 01:39:09.000000000 +0100 @@ -260,6 +260,7 @@ break; case XK_Mode_switch: + ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n"); info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i; #ifdef NX_MODIFIERKEY_RALTERNATE info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i; @@ -388,7 +389,6 @@ pthread_mutex_lock(&keyInfo_mutex); { /* Initialize our keySyms */ - DarwinBuildModifierMaps(&keyInfo); keySyms.map = keyInfo.keyMap; keySyms.mapWidth = GLYPHS_PER_KEY; keySyms.minKeyCode = MIN_KEYCODE; @@ -808,5 +808,7 @@ } } + DarwinBuildModifierMaps(info); + return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/hw/xquartz/xpr/xprScreen.c new/xorg-server-1.7.5/hw/xquartz/xpr/xprScreen.c --- old/xorg-server-1.7.4/hw/xquartz/xpr/xprScreen.c 2009-10-28 07:56:23.000000000 +0100 +++ new/xorg-server-1.7.5/hw/xquartz/xpr/xprScreen.c 2010-02-08 01:10:12.000000000 +0100 @@ -184,7 +184,20 @@ // Find all the CoreGraphics displays CGGetActiveDisplayList(0, NULL, &displayCount); + DEBUG_LOG("displayCount: %d\n", (int)displayCount); + + if(!displayCount) { + ErrorF("CoreGraphics has reported no connected displays. Creating a stub 800x600 display.\n"); + *x = *y = 0; + *width = 800; + *height = 600; + PseudoramiXAddScreen(*x, *y, *width, *height); + return; + } + displayList = xalloc(displayCount * sizeof(CGDirectDisplayID)); + if(!displayList) + FatalError("Unable to allocate memory for list of displays.\n"); CGGetActiveDisplayList(displayCount, displayList, &displayCount); /* Get the union of all screens */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/os/utils.c new/xorg-server-1.7.5/os/utils.c --- old/xorg-server-1.7.4/os/utils.c 2010-01-07 23:44:57.000000000 +0100 +++ new/xorg-server-1.7.5/os/utils.c 2010-02-16 01:24:23.000000000 +0100 @@ -472,7 +472,7 @@ void UseMsg(void) { ErrorF("use: X [:<display>] [option]\n"); - ErrorF("-a # mouse acceleration (pixels)\n"); + ErrorF("-a # default pointer acceleration (factor)\n"); ErrorF("-ac disable access control restrictions\n"); ErrorF("-audit int set audit trail level\n"); ErrorF("-auth file select authorization file\n"); @@ -524,7 +524,7 @@ #endif ErrorF("-retro start with classic stipple and cursor\n"); ErrorF("-s # screen-saver timeout (minutes)\n"); - ErrorF("-t # mouse threshold (pixels)\n"); + ErrorF("-t # default pointer threshold (pixels/t)\n"); ErrorF("-terminate terminate at server reset\n"); ErrorF("-to # connection time out\n"); ErrorF("-tst disable testing extensions\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/randr/rrproperty.c new/xorg-server-1.7.5/randr/rrproperty.c --- old/xorg-server-1.7.4/randr/rrproperty.c 2009-10-28 07:56:25.000000000 +0100 +++ new/xorg-server-1.7.5/randr/rrproperty.c 2010-02-16 04:08:00.000000000 +0100 @@ -47,11 +47,6 @@ event->sequenceNumber = client->sequence; event->window = pRREvent->window->drawable.id; - if (client->swapped) { - int n; - swaps(&event->sequenceNumber, n); - swapl(&event->window, n); - } WriteEventsToClient(pRREvent->client, 1, (xEvent *)event); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/render/render.c new/xorg-server-1.7.5/render/render.c --- old/xorg-server-1.7.4/render/render.c 2010-01-07 23:44:57.000000000 +0100 +++ new/xorg-server-1.7.5/render/render.c 2010-02-16 04:08:01.000000000 +0100 @@ -656,7 +656,7 @@ if (!pPicture->pDrawable) return BadDrawable; - nr = (client->req_len << 2) - sizeof(xRenderChangePictureReq); + nr = (client->req_len << 2) - sizeof(xRenderSetPictureClipRectanglesReq); if (nr & 4) return BadLength; nr >>= 3; @@ -2728,7 +2728,7 @@ int result = Success, j; REQUEST(xRenderChangePictureReq); - REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq); + REQUEST_AT_LEAST_SIZE(xRenderChangePictureReq); VERIFY_XIN_PICTURE(pict, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); @@ -3235,6 +3235,138 @@ return result; } +static int +PanoramiXRenderCreateSolidFill (ClientPtr client) +{ + REQUEST(xRenderCreateSolidFillReq); + PanoramiXRes *newPict; + int result = Success, j; + + REQUEST_AT_LEAST_SIZE(xRenderCreateSolidFillReq); + + if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)))) + return BadAlloc; + + newPict->type = XRT_PICTURE; + newPict->info[0].id = stuff->pid; + newPict->u.pict.root = FALSE; + + for(j = 1; j < PanoramiXNumScreens; j++) + newPict->info[j].id = FakeClientID(client->index); + + FOR_NSCREENS_BACKWARD(j) { + stuff->pid = newPict->info[j].id; + result = (*PanoramiXSaveRenderVector[X_RenderCreateSolidFill]) (client); + if(result != Success) break; + } + + if (result == Success) + AddResource(newPict->info[0].id, XRT_PICTURE, newPict); + else + xfree(newPict); + + return result; +} + +static int +PanoramiXRenderCreateLinearGradient (ClientPtr client) +{ + REQUEST(xRenderCreateLinearGradientReq); + PanoramiXRes *newPict; + int result = Success, j; + + REQUEST_AT_LEAST_SIZE(xRenderCreateLinearGradientReq); + + if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)))) + return BadAlloc; + + newPict->type = XRT_PICTURE; + newPict->info[0].id = stuff->pid; + newPict->u.pict.root = FALSE; + + for(j = 1; j < PanoramiXNumScreens; j++) + newPict->info[j].id = FakeClientID(client->index); + + FOR_NSCREENS_BACKWARD(j) { + stuff->pid = newPict->info[j].id; + result = (*PanoramiXSaveRenderVector[X_RenderCreateLinearGradient]) (client); + if(result != Success) break; + } + + if (result == Success) + AddResource(newPict->info[0].id, XRT_PICTURE, newPict); + else + xfree(newPict); + + return result; +} + +static int +PanoramiXRenderCreateRadialGradient (ClientPtr client) +{ + REQUEST(xRenderCreateRadialGradientReq); + PanoramiXRes *newPict; + int result = Success, j; + + REQUEST_AT_LEAST_SIZE(xRenderCreateRadialGradientReq); + + if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)))) + return BadAlloc; + + newPict->type = XRT_PICTURE; + newPict->info[0].id = stuff->pid; + newPict->u.pict.root = FALSE; + + for(j = 1; j < PanoramiXNumScreens; j++) + newPict->info[j].id = FakeClientID(client->index); + + FOR_NSCREENS_BACKWARD(j) { + stuff->pid = newPict->info[j].id; + result = (*PanoramiXSaveRenderVector[X_RenderCreateRadialGradient]) (client); + if(result != Success) break; + } + + if (result == Success) + AddResource(newPict->info[0].id, XRT_PICTURE, newPict); + else + xfree(newPict); + + return result; +} + +static int +PanoramiXRenderCreateConicalGradient (ClientPtr client) +{ + REQUEST(xRenderCreateConicalGradientReq); + PanoramiXRes *newPict; + int result = Success, j; + + REQUEST_AT_LEAST_SIZE(xRenderCreateConicalGradientReq); + + if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)))) + return BadAlloc; + + newPict->type = XRT_PICTURE; + newPict->info[0].id = stuff->pid; + newPict->u.pict.root = FALSE; + + for(j = 1; j < PanoramiXNumScreens; j++) + newPict->info[j].id = FakeClientID(client->index); + + FOR_NSCREENS_BACKWARD(j) { + stuff->pid = newPict->info[j].id; + result = (*PanoramiXSaveRenderVector[X_RenderCreateConicalGradient]) (client); + if(result != Success) break; + } + + if (result == Success) + AddResource(newPict->info[0].id, XRT_PICTURE, newPict); + else + xfree(newPict); + + return result; +} + void PanoramiXRenderInit (void) { @@ -3263,6 +3395,11 @@ ProcRenderVector[X_RenderTriStrip] = PanoramiXRenderTriStrip; ProcRenderVector[X_RenderTriFan] = PanoramiXRenderTriFan; ProcRenderVector[X_RenderAddTraps] = PanoramiXRenderAddTraps; + + ProcRenderVector[X_RenderCreateSolidFill] = PanoramiXRenderCreateSolidFill; + ProcRenderVector[X_RenderCreateLinearGradient] = PanoramiXRenderCreateLinearGradient; + ProcRenderVector[X_RenderCreateRadialGradient] = PanoramiXRenderCreateRadialGradient; + ProcRenderVector[X_RenderCreateConicalGradient] = PanoramiXRenderCreateConicalGradient; } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/xkb/xkmread.c new/xorg-server-1.7.5/xkb/xkmread.c --- old/xorg-server-1.7.4/xkb/xkmread.c 2010-01-07 03:10:55.000000000 +0100 +++ new/xorg-server-1.7.5/xkb/xkmread.c 2010-02-16 01:24:23.000000000 +0100 @@ -531,7 +531,13 @@ act->devval.v2_ndx = wire.actionData[5]; act->devval.v2_what = wire.actionData[6]; break; + case XkbSA_XFree86Private: + /* copy the kind of action */ + strncpy((char*)act->any.data, (char*)wire.actionData, + XkbAnyActionDataSize); + break ; + case XkbSA_Terminate: /* no args, kinda (note: untrue for xfree86). */ break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.7.4/xorg-server.m4 new/xorg-server-1.7.5/xorg-server.m4 --- old/xorg-server-1.7.4/xorg-server.m4 2008-04-16 08:14:19.000000000 +0200 +++ new/xorg-server-1.7.5/xorg-server.m4 2010-01-23 01:12:42.000000000 +0100 @@ -29,8 +29,9 @@ # is defined, then add $1 to $REQUIRED_MODULES. AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" + CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "xorg-server.h" #if !defined $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

commit xfsdump for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package xfsdump for openSUSE:Factory checked in at Wed Feb 24 02:33:53 CET 2010. -------- --- xfsdump/xfsdump.changes 2009-06-23 12:16:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfsdump/xfsdump.changes 2010-02-22 23:29:27.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 22 23:28:43 CET 2010 - seife(a)opensuse.org + +- fix buffer overflow (detected by gcc-4.5) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xfsdump-3.0.1-fix-bufferoverflow.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsdump.spec ++++++ --- /var/tmp/diff_new_pack.UikURP/_old 2010-02-24 02:33:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UikURP/_new 2010-02-24 02:33:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfsdump (Version 3.0.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -21,14 +21,15 @@ Name: xfsdump BuildRequires: e2fsprogs-devel libattr-devel ncurses-devel xfsprogs-devel Version: 3.0.1 -Release: 1 +Release: 2 AutoReqProv: on Group: System/Filesystems -License: GPL v2 or later +License: GPLv2+ Url: http://oss.sgi.com/projects/xfs/ Summary: Administrative Utilities for the XFS File System Source0: xfsdump-%version.tar.bz2 Patch0: xfsdump-docdir.diff +Patch1: xfsdump-3.0.1-fix-bufferoverflow.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build export CFLAGS=$RPM_OPT_FLAGS ++++++ xfsdump-3.0.1-fix-bufferoverflow.diff ++++++ Index: xfsdump-3.0.1/common/path.c =================================================================== --- xfsdump-3.0.1.orig/common/path.c +++ xfsdump-3.0.1/common/path.c @@ -283,11 +283,15 @@ pa_gen( pa_t *pap ) sz = 0; for ( i = 0 ; i < pap->pa_cnt ; i++ ) { sz += strlen( pap->pa_array[ i ] ) + 1; } - sz++; + sz++; /* '\0' */ + /* if pa_cnt == 0, then we need '/' + '\0' */ + if ( pap->pa_cnt <= 0 ) { + sz++; + } retp = ( char * )malloc( sz ); if ( pap->pa_cnt <= 0 ) { ASSERT( pap->pa_cnt == 0 ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit xemacs-packages for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package xemacs-packages for openSUSE:Factory checked in at Wed Feb 24 02:33:35 CET 2010. -------- --- xemacs-packages/xemacs-packages.changes 2009-12-09 16:29:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/xemacs-packages/xemacs-packages.changes 2010-02-22 16:40:36.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 22 16:39:28 CET 2010 - werner(a)suse.de + +- Update the sub package vc to 1.48 to fix a bug (bnc#568556) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- update-vc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs-packages.spec ++++++ --- /var/tmp/diff_new_pack.zZ8GCA/_old 2010-02-24 02:33:04.000000000 +0100 +++ /var/tmp/diff_new_pack.zZ8GCA/_new 2010-02-24 02:33:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xemacs-packages (Version 20090217) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -31,7 +31,7 @@ Obsoletes: apel-xemacs <= 10.7 AutoReqProv: on Version: 20090217 -Release: 3 +Release: 4 # Howto get the cvs tree of the XEmacs packages: # ============================================== # cvs -d :pserver:cvs@cvs.xemacs.org:/pack/xemacscvs login @@ -66,6 +66,7 @@ Patch18: dinbrief.patch Patch19: disable-skk.patch Patch20: disable-lookup.patch +Patch21: update-vc.patch Patch23: format-info.patch Patch24: texi-coding.patch Patch25: disable-apel.patch @@ -154,6 +155,7 @@ %patch17 -p0 -b .awk %patch18 -p0 -b .dinbrief %patch20 -p0 -b .disable-skk +%patch21 -p0 -b .updsate-vc %patch19 -p0 -b .disable-lookup %patch23 -p0 -b .format-info %patch24 -p0 -b .texi-coding ++++++ update-vc.patch ++++++ --- packages/xemacs-packages/vc/ChangeLog +++ packages/xemacs-packages/vc/ChangeLog 2009-12-28 21:08:43.000000000 +0100 @@ -1,3 +1,36 @@ +2009-12-28 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.48 released. + +2009-12-28 Stephen J. Turnbull <stephen(a)xemacs.org> + + * vc.el (vc-update-changelog-rcs2log): Forgot FKtPp's change! + See <4B377297.904801(a)yahoo.com.cn> on xemacs-patches. + +2009-12-26 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.47 released. + +2009-12-26 Stephen J. Turnbull <stephen(a)xemacs.org> + + Thanks to "It's me FKtPp ;\)" on XEmacs Patches + <87iqbv6ufi.fsf(a)yahoo.com.cn>. Substantially changed from + original patch, responsibility for errors is committer's. + + * vc.el (vc-update-changelog-rcs2log): + Adjust let bindings for XEmacs. Use functions instead of + variables, fix type mismatches in calls to format. + +2009-03-02 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.46 released. + +2009-03-02 Ville Skytt� <scop(a)xemacs.org> + + * vc-hooks.el (vc-menu): + * vc-hooks.el (vc-menu-filter): + Simplify menu construction/filtering, drop obsolete code. + 2007-10-30 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.45 released. --- packages/xemacs-packages/vc/Makefile +++ packages/xemacs-packages/vc/Makefile 2010-02-22 14:48:35.284126691 +0000 @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.45 +VERSION = 1.48 AUTHOR_VERSION = MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org> PACKAGE = vc --- packages/xemacs-packages/vc/vc-hooks.el +++ packages/xemacs-packages/vc/vc-hooks.el 2009-03-02 17:33:11.000000000 +0100 @@ -6,7 +6,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel(a)gnu.org> -;; $Id: vc-hooks.el,v 1.15 2007/10/28 17:46:57 scop Exp $ +;; $Id: vc-hooks.el,v 1.16 2009-03-02 16:33:11 scop Exp $ ;; This file is part of GNU Emacs. @@ -935,7 +935,7 @@ Used in `find-file-not-found-functions'. (defconst vc-menu '("Version Control" :filter vc-menu-filter - ["" vc-next-action buffer-file-name nil] + ["Next Action on" vc-next-action buffer-file-name nil] ["Update to Latest Version" vc-update vc-mode] ["Revert to Base Version" vc-revert-buffer vc-mode] ["Undo Last Check-In" vc-cancel-version vc-mode] @@ -956,48 +956,15 @@ Used in `find-file-not-found-functions'. (defun vc-menu-filter (menu-items) (let* ((result menu-items) ; modify in-place - (case-fold-search t) - (type (vc-backend buffer-file-name)) ;; VC works with full path! - (file (if buffer-file-name - buffer-file-name - (expand-file-name (buffer-name)))) - op owner item status) - (setq op (cond ((null type) - "Register File") - ((eq type 'CVS) - (setq status - (vc-file-getprop buffer-file-name 'cvs-status)) - (if status - (cdr (assoc status - '(("Locally Modified" . "Commit") - ("Needs Merge" . "Merge with repository") - ("Up-to-date" . "Do nothing to") - ("Needs Checkout" . "Update")))) - ;; #### - we're not gonna call cvs status just to - ;; post a lousy menu...that's insane! - "Next action on" - )) - ;; these are all for RCS and SCCS - ((not (setq owner (vc-locking-user file))) - ;; VC locking user is faster now. vc-file-owner - ;; is superceded by incompatible FSF version (JV). - "Check out File") - ((not (string-equal owner (user-login-name))) - "Steal File Lock") - (t "Check in File"))) + (file (or buffer-file-name (expand-file-name (buffer-name)))) + item) ;; We do not want the full name in the menu (setq file (file-name-nondirectory file)) (while (setq item (pop menu-items)) (and (vectorp item) - (cond ((eq 'vc-next-action (aref item 1)) - (aset item 0 op) - (aset item 3 file)) - ((eq 'vc-file-status (aref item 1)) - (aset item 2 (eq 'CVS type)) - (aset item 3 file)) - ((> (length item) 3) - (aset item 3 file))))) + (> (length item) 3) + (aset item 3 file))) result)) (and (featurep 'menubar) --- packages/xemacs-packages/vc/vc.el +++ packages/xemacs-packages/vc/vc.el 2009-12-28 20:51:30.000000000 +0100 @@ -3056,20 +3056,16 @@ log entries should be gathered." "Default implementation of update-changelog. Uses `rcs2log' which only works for RCS and CVS." ;; FIXME: We (c|sh)ould add support for cvs2cl - (let ((odefault default-directory) + ;; XEmacs change: about half the let bindings were broken, either in + ;; principle or because they used variables XEmacs doesn't have + (let* ((odefault default-directory) (changelog (find-change-log)) ;; Presumably not portable to non-Unixy systems, along with rcs2log: (tempfile (make-temp-file - ;; XEmacs change: no `small-temporary-file-directory' (expand-file-name "vc" temporary-file-directory))) - (login-name (or user-login-name - (format "uid%d" (number-to-string (user-uid))))) - (full-name (or add-log-full-name - (user-full-name) - (user-login-name) - (format "uid%d" (number-to-string (user-uid))))) - (mailing-address (or add-log-mailing-address - user-mail-address))) + (login-name (or (user-login-name) (format "uid%d" (user-uid)))) + (full-name (or add-log-full-name (user-full-name) login-name)) + (mailing-address (or add-log-mailing-address user-mail-address))) (find-file-other-window changelog) (barf-if-buffer-read-only) (vc-buffer-sync) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit wxGTK for openSUSE:Factory
by root＠Hilbert.suse.de 24 Feb '10

24 Feb '10

Hello community, here is the log from the commit of package wxGTK for openSUSE:Factory checked in at Wed Feb 24 02:33:25 CET 2010. -------- --- wxGTK/wxGTK.changes 2010-01-28 17:18:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/wxGTK/wxGTK.changes 2010-02-22 15:58:58.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 22 14:58:36 UTC 2010 - crrodriguez(a)opensuse.org + +- build with PIC + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxGTK.spec ++++++ --- /var/tmp/diff_new_pack.YdWhsq/_old 2010-02-24 02:33:14.000000000 +0100 +++ /var/tmp/diff_new_pack.YdWhsq/_new 2010-02-24 02:33:14.000000000 +0100 @@ -27,7 +27,7 @@ Group: System/Libraries AutoReqProv: on Version: 2.8.10.1 -Release: 5 +Release: 6 %define wx_version %(echo %{version} | sed 's/\.[0-9][0-9]*\.[0-9][0-9]*$//') Summary: C++ Framework for Cross-Platform Development %if 0 @@ -174,8 +174,9 @@ %build %{suse_update_config -f} autoconf -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC" +export CXXFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC" +export LD=gold common_configure_opts="--prefix=%{_prefix} \ --datadir=%{_datadir} \ --libdir=%{_libdir} \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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