December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit tn5250
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package tn5250 checked in at Tue Dec 12 23:05:53 CET 2006. -------- --- tn5250/tn5250.changes 2006-01-25 21:42:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/tn5250/tn5250.changes 2006-12-12 14:20:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 14:19:36 CET 2006 - jplack(a)suse.de + +- moved xt5250 from /usr/X11R6/bin to /usr/bin (#227443) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tn5250.spec ++++++ --- /var/tmp/diff_new_pack.ezYYfR/_old 2006-12-12 23:05:36.000000000 +0100 +++ /var/tmp/diff_new_pack.ezYYfR/_new 2006-12-12 23:05:36.000000000 +0100 @@ -1,11 +1,11 @@ # # spec file for package tn5250 (Version 0.16.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,11 +13,11 @@ Name: tn5250 BuildRequires: gcc-c++ URL: http://tn5250.sourceforge.net/ -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Networking/Other Autoreqprov: on Version: 0.16.5 -Release: 304 +Release: 334 Summary: 5250 Emulator Source: http://belnet.dl.sourceforge.net/sourceforge/tn5250/tn5250-%{version}.tar.b… Source1: README.SuSE @@ -53,10 +53,9 @@ %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin +mkdir -p $RPM_BUILD_ROOT/usr/bin make DESTDIR=$RPM_BUILD_ROOT install -mv $RPM_BUILD_ROOT/usr/bin/xt5250 $RPM_BUILD_ROOT/usr/X11R6/bin %files %defattr(-,root,root) @@ -69,13 +68,14 @@ /usr/include/tn5250.h /usr/include/tn5250 /usr/bin/* -/usr/X11R6/bin/xt5250 %{_mandir}/man1/* %{_mandir}/man5/* /usr/share/tn5250 /usr/share/aclocal/tn5250.m4 %changelog -n tn5250 +* Tue Dec 12 2006 - jplack(a)suse.de +- moved xt5250 from /usr/X11R6/bin to /usr/bin (#227443) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Nov 08 2005 - dmueller(a)suse.de @@ -91,17 +91,17 @@ - removed bogus self-provides * Wed Aug 07 2002 - poeml(a)suse.de - update to 0.16.5 -- [...] Added ssl_method config option so you can specify an ssl + - [...] Added ssl_method config option so you can specify an ssl method of ssl2, ssl3 or auto. (Problems connecting were reported in some circumstances if ssl3 is not specified) * Tue Jul 30 2002 - poeml(a)suse.de - update to latest stable release 0.16.4. New features include: -- SSL client-side certificates now supported -- Changed license to LGPL -- Added the scs2pdf print filter (to transform SCS printer + - SSL client-side certificates now supported + - Changed license to LGPL + - Added the scs2pdf print filter (to transform SCS printer streams to PDF files) -- Added support for re-mapping the screen colors. -- Many, many bug fixes. + - Added support for re-mapping the screen colors. + - Many, many bug fixes. * Tue Jul 02 2002 - meissner(a)suse.de - run autoreconf * Tue May 28 2002 - sf(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 squid-beta
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package squid-beta checked in at Tue Dec 12 23:05:30 CET 2006. -------- --- squid-beta/squid-beta.changes 2006-07-08 21:21:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/squid-beta/squid-beta.changes 2006-12-12 13:35:40.000000000 +0100 @@ -1,0 +2,263 @@ +Tue Dec 12 12:28:41 CET 2006 - kssingvo(a)suse.de + +- upgrade to version 3.0PRE5 with many fixes/changes: + * Update Changelog in preparation for the PRE release. + * PRE4-CVS -> PRE5 preparation + * Bug #1799: Harmless 1 byte buffer overflow on long hostnames in /etc/ + hosts + * Add client source port logformat tag >p + * Bug #1817: Assertion failure assert(buflen >= copy_sz) in htcp.c + htcpBuildAuth() + * Fix make check after changes for Bugs #1719 and #1695 + * Add support for wccpv2 mask assignment + * - Many ICAP fixes from Alex Rousskov accumulated on the + * Windows port: Correctly identify Windows Vista and Windows Server + Longhorn + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Alex reports getting coredumps (with high debugging) at process + * Need to #include helper.h in dns.cc for --disable-internal-dns + * bugfix: In clientProcessRequest(), the call to connNoteUseOfBuffer() was + * minor nit: format intro comments and GPL text to fit within 80 columns + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Removing port 563 from the default SSL_ports and Safe_ports ACLs + * Bug #1794: Allow 00:00-24:00 time specifications even if redundant + * Bug #1775: cachemgr storedir segfault with cache_dir null + * Forward port of patches for Bug #1719 and Bug #1695 from 2.6. + * Fix more stupid off-by-one errors parsing the request line. + * Include missing profiling defines. + * Remove another instance of temporary string abuse. + * Reduce a couple of obvious string copies by using String references and + filling them. + * Only enforce HTTP version if we parsed a full request line. + * Don't try parsing a blank request! + * Add in a missing \n for the Squid access log format routine. + * Fix/Add request-line parser debugging; fix bug with pipelined connection + parsing + * Fix an off-by-one bug in the UFS code. Thanks go to valgrind! + * Bug #1782: Memory leak in ncsa_auth on password changes + * Slightly change the request line demarcation logic a little in an + attempt to find + * Add in some more refresh-related debugging + * Updated .cvsignore file + * Bug #1784: access_log syslog results in blanks syslog lines between + every access log entry. + * Add profiling points for the string library. + * Add in profiling points for header parsing and cleaning. + * Add more profiling points + * Create "inlined" Macro versions of the offset functions with the new + request parser + * Add profiling for the new request line parser + * Replace the client-side request line parser + * Various changes to break out the request parsing state and remove extra + malloc/copies + * Back out other unrelated change + * Link Squid SNMP library as a .a library directly to avoid conflicts with + * Do some small changes to the HTTP parser and client side code to + (eventually) save on strlen() and similar calls + * tcp-banger2 support for status validation and custom HTTP headers + * Add in more profiling points to identify CPU usage + * Add in a missing check for whether the new dlink-based pending comm + callbacks are ready + * Bug #1769: near-hit and filedescriptor usage missing in SNMP MIB + * Bug #1774: ncsa_auth support for cramfs timestamps + * ICAP cleanup of some cbdataReference misunderstanding. + * Clean up cbdataReference() use to comply with the API and make GCC happy + * Modify StoreEntry::write() probe to not overlap but still give accurate + call numbers + * Add in more profiling points + * Add profiling points for Membuf::grow, ::append and ::consume + * Additional hi-res probes + * Bypass the expensive check to the allocator getStats() when obtaining + inuse data + * Fix a forgotten change during recent comm layer rework + * First part of a comm layer rework + * Un-astyle a flags definition + * Bug #1768: Redundant DNS PTR lookups + * Bug #1760: FTP related memory leak + * Bug #1758: HEAD on ftp:// URLs always returned 200 OK. + * Bug #1770: wccp2_weight directive + * aio_win32.cc and aiops_win32.cc must be compiled only on MinGW + * Portability fix: use memset() instead of deprecated bzero() + * Fix a typo in recent commit + * Fix astyle munging of flags. + * Dist test headers for make check + * Convert a debug() to debugs() to make GCC happy about formatting + * Need to dist PeerDigest.h + * Fix make check on MinGW + * Add missing files from bugfix for COSS config-failures. + * Avoid a string copy/reference operation in a reasonably critical path in + the Header code + * Fix bug 1218 by adding tests for the io engine of coss and ufs swapdirs + after parsing completes, and providing a heurist + * On MinGW store tests need win32.cc + * Windows port: split Windows service code into WinSvc.cc, allowing + correct execution of make check + * Windows port: remove obsolete break from command line functionality + * Fix a bug which resulted in objects being released after forwarding was + complete. + * add in some more debugging to refresh.cc + * testURL needs GNUregex library on MinGW + * Fix make dist error + * Fix build error on MinGW when using --enable-icmp configure option + * Bug #1759: cachemgr.cgi attempts to write to file system root directory + under MSWIN builds + * reverse last patch - i missed that the fd_set includes the + * Bug #1579, 1475 - fix unlinkd to reduce the number of fd_set references + * Rework the transaction completion/aborting in the ftp code to fix bug + 1592 + * Updated Windows related copyrigth notice + * Bug #1754: BodyReader was reading too much data from the socket buffer. + * Windows port: Added Windows threads support to DiskThreads Disk module + * Windows port: Added Windows Overlapped I/O support to AIO Disk module + * Add iiNet to the squid-3 sponsors list. Thanks iiNet! + * Syntax glue to get the MemPool API back in shape. + * Fix typo in stub_comm.cc + * Windows port: merged Windows native IPC support + * Forgotten to adjust the pointer type ... :-( + * Remove a no more needed #ifdef _SQUID_MSWIN_ from structs.h + * Windows port: merged Windows native IPC support + * Windows port: merged Windows native IPC support + * Fix wrong debug section in ipc.cc + * Update MemPoolTest for MemPool changes. + * skip memory cleanups on shutdown even if built in leak check mode. + Broken. + * Correctly free HttpHeaderFieldInfo array + * silence gcc about some cbdata const violations + * (Tres Seaver)Fix bug 975. Ths may cause memory leaks, though running + 1000 requests through showed no sign of it. + * Cleanup of some MemAllocatorProxy abuse. This is a MemPool internal + class, + * Bugfix 1750 - support tunnelling of RTSP and other protocols that abuse + HTTP by sending just the headers and then waitin + * Valgrind support. Mainly rearranging of cbdata to make malloc debugging + * Fix library link order in tests to more closely match what is used for + the main + * Fix build error of testEventLoop using gcc 4.1 + * Updated .cvsignore files + * Portability fix: check if ip_user_check can be build + * Windows port: Use a more explicative message during configure + * Windows port: Specific OpenSSL trick for FD<=>socket equivalence + * Windows port: Tricks for fd<=> socket equivalence need the usage of a + C++ namespace + * Windows port: Updated icmp.cc for MinGW support + * Windows port: Added MinGW support to helper.cc + * Windows port: Allow unlinkd to work on MinGW + * Windows port: Allow build on MinGW (typecasting and linking) + * Windows port: merge remaining MinGW configure "glue" + * Windows port: add lib/win32lib.c. This add the emulation of some + functions. + * Windows port: Display also the Windows handle in the FD stats. + * Windows port: add squid_mswin.h. This add FD<=>socket equivalence and + other tricks. + * Windows port: Redirect during early service startup stderr to a file. + * Windows port: increase number of FDs to the maximum supported from CRT + at + * Fix warning on Windows about conflicting declaration of ev_entry + * Add a missing function to make kqueue compile again. + * Break checkTimeouts() out of each of the comm_select() routines, fixing + kqueue's in the process + * Fix bug 1642: FTP assertion/blank page on authentication error + * Bug #1716: Squid 2.6-STABLE2 does not compile with newer versions of + OpenSSL + * Bug #1598: start_announce cannot be disabled + * Fix bug 772, by reading aborted data from connections when there is a + pending POST on the connection. This is still lack + * (Tres Seaver) Fix bug 1749 - make check errors from gcc 3.5.5. + * Bugzilla bug 1068: Check object pointer isn't NULL before calling + methods/delete + * Add an extra assert to HttpHeader::addEntry as extra insurance for bug + 1567. + * Resurrect the old API of eventDelete(func, NULL) deleting all events + with that callback + * Fix bug #1568 - the assertion on the String having a buffer does not fit + with + * Address bug 951 by changing the assert to a debug statement. This may + cause + * Bug #1744: squid-2.6.STABLE3 - fakeauth_auth.core + * Windows port: Disable printf formatting check on native Windows. + * Windows port: Allow safe multithreaded usage of debug() + * Windows port: fix another missing USE_SELECT_WIN32 in squid.h + * Windows port: missing syscalls.selects in stats when USE_SELECT_WIN32 is + defined. + * Fix another harmless fake_auth compiler warning on gcc 4.1.1 x86 + * Fix some harmless fake_auth 64-bit compiler warnings + * Bug #1706: Squid time acl accepts invalid time range. + * Bug #1708: Ports in ACL accepts characters and out of range + * Bug #1635: Merge in HTCP updates from 2.6. + * Bug #212: variable %i always 0.0.0.0 + * Bug #1602: Need to implement TCP fallback on truncated (large) DNS + responses + * Fix Squid crash when using %a in ERR_INVALID_REQ and ERR_INVALID_URL + error messages. + * Split out cbdata fully, it now is an optional include and no Init call + is needed. + * Handle very large DNS responses gracefully. + * Fixed a build error on Solaris 9 x86 (int format error) + * Added check for 8 bit signed and unsigned integers + * Fix typo in Steven's name + * Fix an harmless compiler warning on Irix. + * Portability fix: use _PATH_DEVNULL instead of "/dev/null" + * Bugfix the event loop idle detection - it was broken, and correct the + store fs + * Bug #1736: Missing Italian translation of ERR_TOO_BIG error page + * Bug #582: fake_auth ntlmGetString: bad ascii: ffffffb9 followed by + FATAL: authenticateNTLMHandleReply: called with no re + * Bug #1733: Small translation error to Portuguese ERR_CANNOT_FORWARD + * Bug #1040: The bodge on OS/2 for _res is wrong + * Add AsyncEngine and TimeEngine support to the EventLoop, allowing it to + * Create an explicit EventLoop class which can be used to run an event + loop + * BUGFIX: eventRun of an event with non-cbdata callback argument used a + random callback value. + * Bug #1714: cache_dir coss line not shown correctly under cachemgr.cgi + config + * Remove unneeded duplication of RegexData logic from ACLHTTPHeaderData + implementation. + * Bug #1718: warning: the address of 'strerror_buf' will always evaluate + as 'true' + * Bug #1716: Fails to compile with OpenSSL 0.9.7j + * wccp2_rebuild_wait directive to delay registering with WCCP until the + * extend getpwnam helper to also support shadow password systems + * Forward port of latest 2.6 WCCPv2 changes: + * ARP acl support for OpenBSD, code common with the FreeBSD + implementation. + * Bug #1702: Squid silently accepts defining acl's with too long name, + even + * Bug #1694: Assertion failure in mgr:config if using access_log_format % + /td> + * Bug #1691: multicast peering issues + * Corrected bad debug sections + * Bug #1381: assertion failed: cbdata.cc:367: "c->locks < 65535" + * Bug #991: squid should fallback from resolv.conf to localhost + * Stop making Squid-2.5 snapshots. The squid-2.5 tree is closed. + * Windows arp ACL fixes by Gennadiy Tsarenkov: + * make check needs wccp2.cc + * Added WCCPv2 contributors and changelog entry + * Bug #1674: Fails to build on S/390, MIPS, Sparc: no previous prototype + for 'byteSwap' + * Fixed wrong debug section + * Added to the redirectors interface the support for SSL client + certificate + * Bug #1653: Username info not logged into Cachemgr active_requests + statistics + * Fixed wrong debug section + * Fix wrong strsep() C++ prototype + * Ran indent (again) + * Ran indent + * strsep() is not available on any platform, this add an own + implementation. + * Bug #1646: Memory corruption when using client-side SSL certificates + * strsep() is not available on any platform, this add an own + implementation. + * Forward port of WCCPv2 support and latest WCCPv1 changes from 2.6. + * Bug #1620: http_reply_access denied replies casuses assertion failure + * ICAP bug: request satisfaction mode was not working. The presence of + * cosmetic bugfix: need a space between request method and URL in + debugging + * Automatically rotate the changesets when making a release + * Merged current mkrelease script from squid-2. The Squid-3 version + failed.. + +------------------------------------------------------------------- Old: ---- squid-3.0.PRE4-RELEASENOTES.html squid-3.0.PRE4.tar.bz2 New: ---- squid-3.0.PRE5-RELEASENOTES.html squid-3.0.PRE5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid-beta.spec ++++++ --- /var/tmp/diff_new_pack.aq1kRx/_old 2006-12-12 23:04:03.000000000 +0100 +++ /var/tmp/diff_new_pack.aq1kRx/_new 2006-12-12 23:04:03.000000000 +0100 @@ -13,9 +13,9 @@ BuildRequires: expat gcc-c++ krb5 libxml2-devel openldap2 openldap2-devel opensp-devel pam-devel sharutils Summary: Squid V3.0 WWW Proxy Server (new version) Version: 3.0 -Release: 261 -License: GPL -%define ver PRE4 +Release: 283 +License: GNU General Public License (GPL) +%define ver PRE5 URL: http://www.squid-cache.org Group: Productivity/Networking/Web/Proxy Requires: logrotate @@ -32,7 +32,7 @@ #%define squid_ldapauth_version 1.3 #Source1: squid_ldapauth-%{squid_ldapauth_version}.tar.bz2 Source2: rc.squid -Source3: squid-3.0.PRE4-RELEASENOTES.html +Source3: squid-3.0.PRE5-RELEASENOTES.html Source5: pam.squid Source6: unsquid.pl Source7: squid.logrotate @@ -420,6 +420,266 @@ #%doc squid_ldapauth.conf %changelog -n squid-beta +* Tue Dec 12 2006 - kssingvo(a)suse.de +- upgrade to version 3.0PRE5 with many fixes/changes: + * Update Changelog in preparation for the PRE release. + * PRE4-CVS -> PRE5 preparation + * Bug #1799: Harmless 1 byte buffer overflow on long hostnames in /etc/ + hosts + * Add client source port logformat tag >p + * Bug #1817: Assertion failure assert(buflen >= copy_sz) in htcp.c + htcpBuildAuth() + * Fix make check after changes for Bugs #1719 and #1695 + * Add support for wccpv2 mask assignment + * - Many ICAP fixes from Alex Rousskov accumulated on the + * Windows port: Correctly identify Windows Vista and Windows Server + Longhorn + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Alex reports getting coredumps (with high debugging) at process + * Need to #include helper.h in dns.cc for --disable-internal-dns + * bugfix: In clientProcessRequest(), the call to connNoteUseOfBuffer() was + * minor nit: format intro comments and GPL text to fit within 80 columns + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Bug #1778: Build error on Irix using SGI MipsPRO compiler + * Removing port 563 from the default SSL_ports and Safe_ports ACLs + * Bug #1794: Allow 00:00-24:00 time specifications even if redundant + * Bug #1775: cachemgr storedir segfault with cache_dir null + * Forward port of patches for Bug #1719 and Bug #1695 from 2.6. + * Fix more stupid off-by-one errors parsing the request line. + * Include missing profiling defines. + * Remove another instance of temporary string abuse. + * Reduce a couple of obvious string copies by using String references and + filling them. + * Only enforce HTTP version if we parsed a full request line. + * Don't try parsing a blank request! + * Add in a missing \n for the Squid access log format routine. + * Fix/Add request-line parser debugging; fix bug with pipelined connection + parsing + * Fix an off-by-one bug in the UFS code. Thanks go to valgrind! + * Bug #1782: Memory leak in ncsa_auth on password changes + * Slightly change the request line demarcation logic a little in an + attempt to find + * Add in some more refresh-related debugging + * Updated .cvsignore file + * Bug #1784: access_log syslog results in blanks syslog lines between + every access log entry. + * Add profiling points for the string library. + * Add in profiling points for header parsing and cleaning. + * Add more profiling points + * Create "inlined" Macro versions of the offset functions with the new + request parser + * Add profiling for the new request line parser + * Replace the client-side request line parser + * Various changes to break out the request parsing state and remove extra + malloc/copies + * Back out other unrelated change + * Link Squid SNMP library as a .a library directly to avoid conflicts with + * Do some small changes to the HTTP parser and client side code to + (eventually) save on strlen() and similar calls + * tcp-banger2 support for status validation and custom HTTP headers + * Add in more profiling points to identify CPU usage + * Add in a missing check for whether the new dlink-based pending comm + callbacks are ready + * Bug #1769: near-hit and filedescriptor usage missing in SNMP MIB + * Bug #1774: ncsa_auth support for cramfs timestamps + * ICAP cleanup of some cbdataReference misunderstanding. + * Clean up cbdataReference() use to comply with the API and make GCC happy + * Modify StoreEntry::write() probe to not overlap but still give accurate + call numbers + * Add in more profiling points + * Add profiling points for Membuf::grow, ::append and ::consume + * Additional hi-res probes + * Bypass the expensive check to the allocator getStats() when obtaining + inuse data + * Fix a forgotten change during recent comm layer rework + * First part of a comm layer rework + * Un-astyle a flags definition + * Bug #1768: Redundant DNS PTR lookups + * Bug #1760: FTP related memory leak + * Bug #1758: HEAD on ftp:// URLs always returned 200 OK. + * Bug #1770: wccp2_weight directive + * aio_win32.cc and aiops_win32.cc must be compiled only on MinGW + * Portability fix: use memset() instead of deprecated bzero() + * Fix a typo in recent commit + * Fix astyle munging of flags. + * Dist test headers for make check + * Convert a debug() to debugs() to make GCC happy about formatting + * Need to dist PeerDigest.h + * Fix make check on MinGW + * Add missing files from bugfix for COSS config-failures. + * Avoid a string copy/reference operation in a reasonably critical path in + the Header code + * Fix bug 1218 by adding tests for the io engine of coss and ufs swapdirs + after parsing completes, and providing a heurist + * On MinGW store tests need win32.cc + * Windows port: split Windows service code into WinSvc.cc, allowing + correct execution of make check + * Windows port: remove obsolete break from command line functionality + * Fix a bug which resulted in objects being released after forwarding was + complete. + * add in some more debugging to refresh.cc + * testURL needs GNUregex library on MinGW + * Fix make dist error + * Fix build error on MinGW when using --enable-icmp configure option + * Bug #1759: cachemgr.cgi attempts to write to file system root directory + under MSWIN builds + * reverse last patch - i missed that the fd_set includes the + * Bug #1579, 1475 - fix unlinkd to reduce the number of fd_set references + * Rework the transaction completion/aborting in the ftp code to fix bug + 1592 + * Updated Windows related copyrigth notice + * Bug #1754: BodyReader was reading too much data from the socket buffer. + * Windows port: Added Windows threads support to DiskThreads Disk module + * Windows port: Added Windows Overlapped I/O support to AIO Disk module + * Add iiNet to the squid-3 sponsors list. Thanks iiNet! + * Syntax glue to get the MemPool API back in shape. + * Fix typo in stub_comm.cc + * Windows port: merged Windows native IPC support + * Forgotten to adjust the pointer type ... :-( + * Remove a no more needed #ifdef _SQUID_MSWIN_ from structs.h + * Windows port: merged Windows native IPC support + * Windows port: merged Windows native IPC support + * Fix wrong debug section in ipc.cc + * Update MemPoolTest for MemPool changes. + * skip memory cleanups on shutdown even if built in leak check mode. + Broken. + * Correctly free HttpHeaderFieldInfo array + * silence gcc about some cbdata const violations + * (Tres Seaver)Fix bug 975. Ths may cause memory leaks, though running + 1000 requests through showed no sign of it. + * Cleanup of some MemAllocatorProxy abuse. This is a MemPool internal + class, + * Bugfix 1750 - support tunnelling of RTSP and other protocols that abuse + HTTP by sending just the headers and then waitin + * Valgrind support. Mainly rearranging of cbdata to make malloc debugging + * Fix library link order in tests to more closely match what is used for + the main + * Fix build error of testEventLoop using gcc 4.1 + * Updated .cvsignore files + * Portability fix: check if ip_user_check can be build + * Windows port: Use a more explicative message during configure + * Windows port: Specific OpenSSL trick for FD<=>socket equivalence + * Windows port: Tricks for fd<=> socket equivalence need the usage of a + C++ namespace + * Windows port: Updated icmp.cc for MinGW support + * Windows port: Added MinGW support to helper.cc + * Windows port: Allow unlinkd to work on MinGW + * Windows port: Allow build on MinGW (typecasting and linking) + * Windows port: merge remaining MinGW configure "glue" + * Windows port: add lib/win32lib.c. This add the emulation of some + functions. + * Windows port: Display also the Windows handle in the FD stats. + * Windows port: add squid_mswin.h. This add FD<=>socket equivalence and + other tricks. + * Windows port: Redirect during early service startup stderr to a file. + * Windows port: increase number of FDs to the maximum supported from CRT + at + * Fix warning on Windows about conflicting declaration of ev_entry + * Add a missing function to make kqueue compile again. + * Break checkTimeouts() out of each of the comm_select() routines, fixing + kqueue's in the process + * Fix bug 1642: FTP assertion/blank page on authentication error + * Bug #1716: Squid 2.6-STABLE2 does not compile with newer versions of + OpenSSL + * Bug #1598: start_announce cannot be disabled + * Fix bug 772, by reading aborted data from connections when there is a + pending POST on the connection. This is still lack + * (Tres Seaver) Fix bug 1749 - make check errors from gcc 3.5.5. + * Bugzilla bug 1068: Check object pointer isn't NULL before calling + methods/delete + * Add an extra assert to HttpHeader::addEntry as extra insurance for bug + 1567. + * Resurrect the old API of eventDelete(func, NULL) deleting all events + with that callback + * Fix bug #1568 - the assertion on the String having a buffer does not fit + with + * Address bug 951 by changing the assert to a debug statement. This may + cause + * Bug #1744: squid-2.6.STABLE3 - fakeauth_auth.core + * Windows port: Disable printf formatting check on native Windows. + * Windows port: Allow safe multithreaded usage of debug() + * Windows port: fix another missing USE_SELECT_WIN32 in squid.h + * Windows port: missing syscalls.selects in stats when USE_SELECT_WIN32 is + defined. + * Fix another harmless fake_auth compiler warning on gcc 4.1.1 x86 + * Fix some harmless fake_auth 64-bit compiler warnings + * Bug #1706: Squid time acl accepts invalid time range. + * Bug #1708: Ports in ACL accepts characters and out of range + * Bug #1635: Merge in HTCP updates from 2.6. + * Bug #212: variable %%i always 0.0.0.0 + * Bug #1602: Need to implement TCP fallback on truncated (large) DNS + responses + * Fix Squid crash when using %%a in ERR_INVALID_REQ and ERR_INVALID_URL + error messages. + * Split out cbdata fully, it now is an optional include and no Init call + is needed. + * Handle very large DNS responses gracefully. + * Fixed a build error on Solaris 9 x86 (int format error) + * Added check for 8 bit signed and unsigned integers + * Fix typo in Steven's name + * Fix an harmless compiler warning on Irix. + * Portability fix: use _PATH_DEVNULL instead of "/dev/null" + * Bugfix the event loop idle detection - it was broken, and correct the + store fs + * Bug #1736: Missing Italian translation of ERR_TOO_BIG error page + * Bug #582: fake_auth ntlmGetString: bad ascii: ffffffb9 followed by + FATAL: authenticateNTLMHandleReply: called with no re + * Bug #1733: Small translation error to Portuguese ERR_CANNOT_FORWARD + * Bug #1040: The bodge on OS/2 for _res is wrong + * Add AsyncEngine and TimeEngine support to the EventLoop, allowing it to + * Create an explicit EventLoop class which can be used to run an event + loop + * BUGFIX: eventRun of an event with non-cbdata callback argument used a + random callback value. + * Bug #1714: cache_dir coss line not shown correctly under cachemgr.cgi + config + * Remove unneeded duplication of RegexData logic from ACLHTTPHeaderData + implementation. + * Bug #1718: warning: the address of 'strerror_buf' will always evaluate + as 'true' + * Bug #1716: Fails to compile with OpenSSL 0.9.7j + * wccp2_rebuild_wait directive to delay registering with WCCP until the + * extend getpwnam helper to also support shadow password systems + * Forward port of latest 2.6 WCCPv2 changes: + * ARP acl support for OpenBSD, code common with the FreeBSD + implementation. + * Bug #1702: Squid silently accepts defining acl's with too long name, + even + * Bug #1694: Assertion failure in mgr:config if using access_log_format % + /td> + * Bug #1691: multicast peering issues + * Corrected bad debug sections + * Bug #1381: assertion failed: cbdata.cc:367: "c->locks < 65535" + * Bug #991: squid should fallback from resolv.conf to localhost + * Stop making Squid-2.5 snapshots. The squid-2.5 tree is closed. + * Windows arp ACL fixes by Gennadiy Tsarenkov: + * make check needs wccp2.cc + * Added WCCPv2 contributors and changelog entry + * Bug #1674: Fails to build on S/390, MIPS, Sparc: no previous prototype + for 'byteSwap' + * Fixed wrong debug section + * Added to the redirectors interface the support for SSL client + certificate + * Bug #1653: Username info not logged into Cachemgr active_requests + statistics + * Fixed wrong debug section + * Fix wrong strsep() C++ prototype + * Ran indent (again) + * Ran indent + * strsep() is not available on any platform, this add an own + implementation. + * Bug #1646: Memory corruption when using client-side SSL certificates + * strsep() is not available on any platform, this add an own + implementation. + * Forward port of WCCPv2 support and latest WCCPv1 changes from 2.6. + * Bug #1620: http_reply_access denied replies casuses assertion failure + * ICAP bug: request satisfaction mode was not working. The presence of + * cosmetic bugfix: need a space between request method and URL in + debugging + * Automatically rotate the changesets when making a release + * Merged current mkrelease script from squid-2. The Squid-3 version + failed.. * Sat Jul 08 2006 - lrupp(a)suse.de - no more man8 files to remove * Wed Jun 21 2006 - kssingvo(a)suse.de ++++++ squid-3.0.PRE4.tar.bz2 -> squid-3.0.PRE5.tar.bz2 ++++++ ++++ 42987 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 squid
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package squid checked in at Tue Dec 12 23:02:08 CET 2006. -------- --- squid/squid.changes 2006-11-06 23:01:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/squid/squid.changes 2006-12-12 13:40:01.000000000 +0100 @@ -1,0 +2,56 @@ +Tue Dec 12 13:37:06 CET 2006 - kssingvo(a)suse.de + +- upgrade to 2.6.STABLE5: + * Whitespace cleanup + * Preparing for 2.6.STABLE6 + * Resurrect httpd_accel_no_pmtu_disc after the transparent interception + cleanup + * Spell check in release notes + * Windows port: Updated release notes + * Windows port: Fixed build error on MinGW using SSL support + * Windows port: Updated release notes + * Windows port: Fix build errors when using latest MinGW environment + * Bug #1641: assertion failed: stmem.c:149: "size > 0" while processing + certain Vary objects + * Bug #1840: Disable digest and netdb queries to multicast peers + * Bug #1839: Cosmetic debug message cleanup in peerHandleHtcpReply. + * Bug #1801: NTLM authentication ends up in a loop if the server responds + with a retriable error + * Bug #439: Multicast ICP peering is unstable and considers most peers dead + * Fix the WCCPv2 mask assignment code to not crash as the value assignments + are built. + * Bug #1584: Unable to register with multiple WCCP2 routers + * Convert the connStateData->chr single link list to a normal dlink_list for + clarity. + * Accept large dates >2^31. Seen for example in the Google logo. + * Remove old leftover variable after the client_side buffer cleanup + * Reduce memory allocator pressure by not continually allocating client-side + read buffers + * Remove malloc/free of temporary buffer in time parsing routines. + * Document that proxy_auth also accepts -i for case-insensitive operation + * Convert snmpDebugOid to use a temporary String object instead of strcat + * Bug #1832: Error building squid-2.6.STABLE5 using --enable-truncate + * Add support for the weight= parameter to round-robin peers + * Fix defaultsite= processing after the accelerator mode cleanup + * Clarify the external_acl_type helper format specification and some defaults + * Bug #1773: Segmentation violation bug in the cleanup of transparent mode + * Cleanup to silence a harmess GCC inline warning + * Bug #1805: assertion failed: StatHist.c:195: "D[i] >= 0" + * Remove extra newline in redirect message sent by deny_info http://... + aclname + * Bug #1117: assertion failed: aufs/store_dir_aufs.c:642: + "rb->flags.need_to_validate" + * Bug #1818: Assertion failure assert(e->swap_dirn >= 0) in fs/coss/ + store_dir_coss.c storeCoss_DeleteStoreEntry + * Windows port: updated release notes + * Only use crypt() if it's available + * automake no longer recommends mkinstalldirs. Remove it from the + distribution. + * Bug #1799: Harmless 1 byte buffer overflow on long host names in /etc/hosts + * Cleanup of transparent & accelerator mode request parsing to untangle the + firewall dependencies a bit + * Add client source port logformat tag >p + * Bug #1817: Assertion failure assert(buflen >= copy_sz) in htcp.c + htcpBuildAuth() + +------------------------------------------------------------------- Old: ---- squid-2.6.STABLE5-RELEASENOTES.html squid-2.6.STABLE5.tar.bz2 New: ---- squid-2.6.STABLE6-RELEASENOTES.html squid-2.6.STABLE6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.RmfaOe/_old 2006-12-12 23:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.RmfaOe/_new 2006-12-12 23:01:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package squid (Version 2.6.STABLE5) +# spec file for package squid (Version 2.6.STABLE6) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ BuildRequires: valgrind %endif Summary: Squid WWW proxy server -Version: 2.6.STABLE5 +Version: 2.6.STABLE6 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) URL: http://www.squid-cache.org Group: Productivity/Networking/Web/Proxy Requires: logrotate @@ -399,8 +399,61 @@ %doc README.ip_user %changelog -n squid +* Tue Dec 12 2006 - kssingvo(a)suse.de +- upgrade to 2.6.STABLE5: + * Whitespace cleanup + * Preparing for 2.6.STABLE6 + * Resurrect httpd_accel_no_pmtu_disc after the transparent interception + cleanup + * Spell check in release notes + * Windows port: Updated release notes + * Windows port: Fixed build error on MinGW using SSL support + * Windows port: Updated release notes + * Windows port: Fix build errors when using latest MinGW environment + * Bug #1641: assertion failed: stmem.c:149: "size > 0" while processing + certain Vary objects + * Bug #1840: Disable digest and netdb queries to multicast peers + * Bug #1839: Cosmetic debug message cleanup in peerHandleHtcpReply. + * Bug #1801: NTLM authentication ends up in a loop if the server responds + with a retriable error + * Bug #439: Multicast ICP peering is unstable and considers most peers dead + * Fix the WCCPv2 mask assignment code to not crash as the value assignments + are built. + * Bug #1584: Unable to register with multiple WCCP2 routers + * Convert the connStateData->chr single link list to a normal dlink_list for + clarity. + * Accept large dates >2^31. Seen for example in the Google logo. + * Remove old leftover variable after the client_side buffer cleanup + * Reduce memory allocator pressure by not continually allocating client-side + read buffers + * Remove malloc/free of temporary buffer in time parsing routines. + * Document that proxy_auth also accepts -i for case-insensitive operation + * Convert snmpDebugOid to use a temporary String object instead of strcat + * Bug #1832: Error building squid-2.6.STABLE5 using --enable-truncate + * Add support for the weight= parameter to round-robin peers + * Fix defaultsite= processing after the accelerator mode cleanup + * Clarify the external_acl_type helper format specification and some defaults + * Bug #1773: Segmentation violation bug in the cleanup of transparent mode + * Cleanup to silence a harmess GCC inline warning + * Bug #1805: assertion failed: StatHist.c:195: "D[i] >= 0" + * Remove extra newline in redirect message sent by deny_info http://... + aclname + * Bug #1117: assertion failed: aufs/store_dir_aufs.c:642: + "rb->flags.need_to_validate" + * Bug #1818: Assertion failure assert(e->swap_dirn >= 0) in fs/coss/ + store_dir_coss.c storeCoss_DeleteStoreEntry + * Windows port: updated release notes + * Only use crypt() if it's available + * automake no longer recommends mkinstalldirs. Remove it from the + distribution. + * Bug #1799: Harmless 1 byte buffer overflow on long host names in /etc/hosts + * Cleanup of transparent & accelerator mode request parsing to untangle the + firewall dependencies a bit + * Add client source port logformat tag >p + * Bug #1817: Assertion failure assert(buflen >= copy_sz) in htcp.c + htcpBuildAuth() * Mon Nov 06 2006 - kssingvo(a)suse.de -- upgrade to version 2.6.STABEL5, which is only a bug fix version, with +- upgrade to version 2.6.STABLE5, which is only a bug fix version, with these most important bug fixes: * Some memory leaks corrected, some of which could result in denial of service conditions after some time. ++++++ squid-2.6.STABLE5.tar.bz2 -> squid-2.6.STABLE6.tar.bz2 ++++++ ++++ 3294 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 zmd
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package zmd checked in at Tue Dec 12 23:01:04 CET 2006. -------- --- zmd/zmd.changes 2006-11-30 16:48:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/zmd/zmd.changes 2006-12-12 10:02:29.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 10:01:34 CET 2006 - bvenugopal(a)suse.de + +- Updated Automake Missing files in source tar ball to compile zmd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.1kWNSa/_old 2006-12-12 23:00:48.000000000 +0100 +++ /var/tmp/diff_new_pack.1kWNSa/_new 2006-12-12 23:00:48.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono libzypp-zmd-backend log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.100.0 -Release: 45 +Release: 47 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -192,6 +192,8 @@ %{_libdir}/pkgconfig/rpm-sharp.pc %changelog -n zmd +* Tue Dec 12 2006 - bvenugopal(a)suse.de +- Updated Automake Missing files in source tar ball to compile zmd * Thu Nov 30 2006 - jpr(a)suse.de - Remove zmd.db deletion, it works fine with the older sqlite version and can cause a hang when self updating. ++++++ zmd-7.1.100.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/compile new/zmd-7.1.100.0/compile --- old/zmd-7.1.100.0/compile 2006-12-12 23:00:50.000000000 +0100 +++ new/zmd-7.1.100.0/compile 2006-12-12 09:56:26.000000000 +0100 @@ -1 +1,142 @@ -symbolic link to /usr/share/automake-1.9/compile +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey(a)cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to <bug-automake(a)gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/depcomp new/zmd-7.1.100.0/depcomp --- old/zmd-7.1.100.0/depcomp 2006-12-12 23:00:50.000000000 +0100 +++ new/zmd-7.1.100.0/depcomp 2006-12-12 09:54:24.000000000 +0100 @@ -1 +1,530 @@ -symbolic link to /usr/share/automake-1.9/depcomp +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2005-07-09.11 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva <oliva(a)dcc.unicamp.br>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to <bug-automake(a)gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/$.*$\..*$/\1/'` + tmpdepfile="$stripped.u" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: $.*$$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mecanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no + for arg in "$@"; do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/install-sh new/zmd-7.1.100.0/install-sh --- old/zmd-7.1.100.0/install-sh 2006-12-12 23:00:50.000000000 +0100 +++ new/zmd-7.1.100.0/install-sh 2006-12-12 09:46:42.000000000 +0100 @@ -1 +1,323 @@ -symbolic link to /usr/share/automake-1.9/install-sh +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-05-14.22 + +# 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}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$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 $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # 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 test -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 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/missing new/zmd-7.1.100.0/missing --- old/zmd-7.1.100.0/missing 2006-12-12 23:00:50.000000000 +0100 +++ new/zmd-7.1.100.0/missing 2006-12-12 09:46:20.000000000 +0100 @@ -1 +1,360 @@ -symbolic link to /usr/share/automake-1.9/missing +#! /bin/sh +# Common stub for a few missing GNU programs while installing. + +scriptversion=2005-06-08.21 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# 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 +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake(a)gnu.org>." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +esac + +# 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). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + 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 + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + 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 + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + 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 + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + + 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 + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-ncurses
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Tue Dec 12 23:00:41 CET 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-12-06 17:30:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2006-12-12 14:33:59.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Dec 12 13:09:06 CET 2006 - gs(a)suse.de + +- Package Installation: add functionality 'Verify System' to Etc./ + Dependencies menu (Fate #301178) +- Online Update: patch searching ability added to Filter menu + (Fate #153197) +- 2.15.2 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.15.1.tar.bz2 New: ---- yast2-ncurses-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.WVAYOZ/_old 2006-12-12 23:00:32.000000000 +0100 +++ /var/tmp/diff_new_pack.WVAYOZ/_new 2006-12-12 23:00:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.15.1) +# spec file for package yast2-ncurses (Version 2.15.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.15.1 +Version: 2.15.2 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.15.1.tar.bz2 +Source0: yast2-ncurses-2.15.2.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -44,7 +44,7 @@ %prep -%setup -n yast2-ncurses-2.15.1 +%setup -n yast2-ncurses-2.15.2 %build %{prefix}/bin/y2tool y2autoconf @@ -77,6 +77,12 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Tue Dec 12 2006 - gs(a)suse.de +- Package Installation: add functionality 'Verify System' to Etc./ + Dependencies menu (Fate #301178) +- Online Update: patch searching ability added to Filter menu + (Fate #153197) +- 2.15.2 * Tue Dec 05 2006 - kmachalkova(a)suse.cz - Added RunInTerminal UI builtin for running external programs in the same terminal ++++++ yast2-ncurses-2.15.1.tar.bz2 -> yast2-ncurses-2.15.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/VERSION new/yast2-ncurses-2.15.2/VERSION --- old/yast2-ncurses-2.15.1/VERSION 2006-12-05 10:33:06.000000000 +0100 +++ new/yast2-ncurses-2.15.2/VERSION 2006-12-12 14:34:39.000000000 +0100 @@ -1 +1 @@ -2.15.1 +2.15.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/configure.in new/yast2-ncurses-2.15.2/configure.in --- old/yast2-ncurses-2.15.1/configure.in 2006-12-06 17:15:04.000000000 +0100 +++ new/yast2-ncurses-2.15.2/configure.in 2006-12-12 11:06:53.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-ncurses, 2.15.1, http://bugs.opensuse.org/, yast2-ncurses) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/NCPopupDeps.cc new/yast2-ncurses-2.15.2/src/NCPopupDeps.cc --- old/yast2-ncurses-2.15.1/src/NCPopupDeps.cc 2006-10-31 16:07:07.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/NCPopupDeps.cc 2006-12-12 11:19:52.000000000 +0100 @@ -189,7 +189,7 @@ // showDependencies // // -bool NCPopupDeps::showDependencies( ) +bool NCPopupDeps::showDependencies( NCPkgSolverAction action ) { if ( !problemw ) return true; @@ -202,13 +202,13 @@ // evaluate the result and fill the list with packages // which have unresolved deps - bool success = solve (problemw); + bool success = solve (problemw, action ); if (!success) { // show first dependency showSolutions( problemw->getCurrentItem() ); - NCursesEvent input = showDependencyPopup(); // show the dependencies + NCursesEvent input = showDependencyPopup( action ); // show the dependencies if ( input == NCursesEvent::cancel && input.detail != NCursesEvent::USERDEF ) @@ -222,7 +222,7 @@ } -bool NCPopupDeps::solve( NCSelectionBox * problemw) +bool NCPopupDeps::solve( NCSelectionBox * problemw, NCPkgSolverAction action ) { if ( !problemw ) return false; @@ -236,8 +236,20 @@ info.popup(); zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver(); - bool success = resolver->resolvePool(); + bool success = false; + switch ( action ) + { + case S_Solve: + success = resolver->resolvePool(); + break; + case S_Verify: + success = resolver->verifySystem(); + break; + default: + NCERR << "Unknown action for resolve" << endl; + } + info.popdown(); if (success) @@ -317,13 +329,13 @@ // // DESCRIPTION : // -NCursesEvent NCPopupDeps::showDependencyPopup( ) +NCursesEvent NCPopupDeps::showDependencyPopup( NCPkgSolverAction action ) { postevent = NCursesEvent(); do { popupDialog(); - } while ( postAgain() ); + } while ( postAgain( action ) ); popdownDialog(); @@ -368,7 +380,7 @@ // // DESCRIPTION : // -bool NCPopupDeps::postAgain() +bool NCPopupDeps::postAgain( NCPkgSolverAction action ) { if ( ! postevent.widget ) return false; @@ -404,7 +416,7 @@ resolver->applySolutions (solutions); // and solve again - bool success = solve (problemw); + bool success = solve (problemw, action ); if ( !success ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/NCPopupDeps.h new/yast2-ncurses-2.15.2/src/NCPopupDeps.h --- old/yast2-ncurses-2.15.1/src/NCPopupDeps.h 2006-10-31 16:07:11.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/NCPopupDeps.h 2006-12-12 11:19:52.000000000 +0100 @@ -53,6 +53,13 @@ NCPopupDeps & operator=( const NCPopupDeps & ); NCPopupDeps ( const NCPopupDeps & ); +public: + enum NCPkgSolverAction { + S_Solve, + S_Verify, + S_Unknown + }; + private: typedef std::vector<std::pair< @@ -79,7 +86,7 @@ NCSelectionBox * problemw; // resolver problems - virtual bool postAgain(); + virtual bool postAgain( NCPkgSolverAction action ); virtual NCursesEvent wHandleInput( wint_t ch ); @@ -90,11 +97,11 @@ virtual long nicesize(YUIDimension dim); - NCursesEvent showDependencyPopup( ); + NCursesEvent showDependencyPopup( NCPkgSolverAction action ); - bool showDependencies( ); + bool showDependencies( NCPkgSolverAction action ); - bool solve( NCSelectionBox * problemw ); + bool solve( NCSelectionBox * problemw, NCPkgSolverAction action ); bool showSolutions( int index ); // for the currently selected problem, choose this solution diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/NCPopupSearch.cc new/yast2-ncurses-2.15.2/src/NCPopupSearch.cc --- old/yast2-ncurses-2.15.1/src/NCPopupSearch.cc 2006-08-18 13:12:37.000000000 +0200 +++ new/yast2-ncurses-2.15.2/src/NCPopupSearch.cc 2006-12-12 14:18:20.000000000 +0100 @@ -29,6 +29,12 @@ #include "PkgNames.h" #include "PackageSelector.h" +#include "NCi18n.h" + +/* + Textdomain "packages" +*/ + /////////////////////////////////////////////////////////////////// // // @@ -49,7 +55,10 @@ , cancelButton( 0 ) , packager( pkger ) { - createLayout( YCPString(PkgNames::PackageSearch()) ); + if ( !packager->isYouMode() ) + createLayout( YCPString(PkgNames::PackageSearch()) ); + else + createLayout( YCPString( _("Search for Patch Name") ) ); } /////////////////////////////////////////////////////////////////// @@ -105,42 +114,45 @@ vSplit2->addChild( new NCSpacing( vSplit, opt, 0.6, false, true ) ); vSplit->addChild( frame0 ); - // add the checkBox ignore case - NCSplit * hSplit2 = new NCSplit( vSplit, opt, YD_HORIZ ); - vSplit->addChild( hSplit2 ); - ignoreCase = new NCCheckBox( hSplit2, opt, YCPString(PkgNames::IgnoreCase()), true ); - hSplit2->addChild( new NCSpacing( hSplit2, opt, 0.1, true, false ) ); - hSplit2->addChild( ignoreCase ); - - vSplit->addChild( new NCSpacing( vSplit, opt, 0.6, false, true ) ); // VSpacing - - // add a frame containing the other check boxes - opt.isHStretchable.setValue( true ); - opt.isVStretchable.setValue( true ); - NCFrame * frame = new NCFrame( vSplit, opt, YCPString(PkgNames::SearchIn()) ); - NCSplit * vSplit3 = new NCSplit( frame, opt, YD_VERT ); - - opt.isVStretchable.setValue( false ); - checkName = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckName()), true ); - checkSummary = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckSummary()), true ); - checkDescr = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckDescr()), false ); - checkProvides = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckProvides()), false ); - checkRequires = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckRequires()), false ); - - vSplit3->addChild( checkName ); - vSplit3->addChild( checkSummary ); - vSplit3->addChild( checkDescr ); - vSplit3->addChild( checkProvides ); - vSplit3->addChild( checkRequires ); + if ( !packager->isYouMode() ) + { + // add the checkBox ignore case + NCSplit * hSplit2 = new NCSplit( vSplit, opt, YD_HORIZ ); + vSplit->addChild( hSplit2 ); + ignoreCase = new NCCheckBox( hSplit2, opt, YCPString(PkgNames::IgnoreCase()), true ); + hSplit2->addChild( new NCSpacing( hSplit2, opt, 0.1, true, false ) ); + hSplit2->addChild( ignoreCase ); + + vSplit->addChild( new NCSpacing( vSplit, opt, 0.6, false, true ) ); // VSpacing + + // add a frame containing the other check boxes + opt.isHStretchable.setValue( true ); + opt.isVStretchable.setValue( true ); + NCFrame * frame = new NCFrame( vSplit, opt, YCPString(PkgNames::SearchIn()) ); + NCSplit * vSplit3 = new NCSplit( frame, opt, YD_VERT ); + + opt.isVStretchable.setValue( false ); + checkName = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckName()), true ); + checkSummary = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckSummary()), true ); + checkDescr = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckDescr()), false ); + checkProvides = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckProvides()), false ); + checkRequires = new NCCheckBox( vSplit3, opt, YCPString(PkgNames::CheckRequires()), false ); + + vSplit3->addChild( checkName ); + vSplit3->addChild( checkSummary ); + vSplit3->addChild( checkDescr ); + vSplit3->addChild( checkProvides ); + vSplit3->addChild( checkRequires ); - frame->addChild( vSplit3 ); - vSplit->addChild( frame ); + frame->addChild( vSplit3 ); + vSplit->addChild( frame ); - vSplit->addChild( new NCSpacing( vSplit, opt, 0.8, false, true ) ); // VSpacing + vSplit->addChild( new NCSpacing( vSplit, opt, 0.8, false, true ) ); // VSpacing + } NCSplit * hSplit3 = new NCSplit( vSplit, opt, YD_HORIZ ); vSplit->addChild( hSplit3 ); - + // add the cancel and the ok button opt.key_Fxx.setValue( 10 ); okButton = new NCPushButton( hSplit3, opt, YCPString(PkgNames::OKLabel()) ); @@ -157,6 +169,7 @@ hSplit3->addChild( new NCSpacing( hSplit3, opt, 0.4, true, false ) ); hSplit3->addChild( cancelButton ); hSplit3->addChild( new NCSpacing( hSplit3, opt, 0.2, true, false ) ); + } /////////////////////////////////////////////////////////////////// @@ -217,11 +230,19 @@ long NCPopupSearch::nicesize(YUIDimension dim) { long vdim; - if ( NCurses::lines() > 20 ) - vdim = 20; + + if ( !packager->isYouMode() ) + { + if ( NCurses::lines() > 20 ) + vdim = 20; + else + vdim = NCurses::lines()-4; + } else - vdim = NCurses::lines()-4; - + { + vdim = 10; + } + return ( dim == YD_HORIZ ? NCurses::cols()/2 : vdim ); } /////////////////////////////////////////////////////////////////// @@ -277,15 +298,22 @@ filter = postevent.result->asString(); } - // fill the package list with packages matching the search expression - packager->fillSearchList( filter, - getCheckBoxValue( ignoreCase ), - getCheckBoxValue( checkName ), - getCheckBoxValue( checkSummary ), - getCheckBoxValue( checkDescr ), - getCheckBoxValue( checkProvides ), - getCheckBoxValue( checkRequires ) - ); + if ( !packager->isYouMode() ) + { + // fill the package list with packages matching the search expression + packager->fillSearchList( filter, + getCheckBoxValue( ignoreCase ), + getCheckBoxValue( checkName ), + getCheckBoxValue( checkSummary ), + getCheckBoxValue( checkDescr ), + getCheckBoxValue( checkProvides ), + getCheckBoxValue( checkRequires ) + ); + } + else + { + packager->fillPatchSearchList( filter ); + } } if ( postevent == NCursesEvent::button || postevent == NCursesEvent::cancel ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PackageSelector.cc new/yast2-ncurses-2.15.2/src/PackageSelector.cc --- old/yast2-ncurses-2.15.1/src/PackageSelector.cc 2006-11-29 14:44:08.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PackageSelector.cc 2006-12-12 12:49:05.000000000 +0100 @@ -161,6 +161,7 @@ // Etc. menu eventHandlerMap[ PkgNames::ShowDeps()->toString() ] = &PackageSelector::DependencyHandler; eventHandlerMap[ PkgNames::AutoDeps()->toString() ] = &PackageSelector::DependencyHandler; + eventHandlerMap[ PkgNames::VerifySystem()->toString() ] = &PackageSelector::DependencyHandler; eventHandlerMap[ PkgNames::SaveSel()->toString() ] = &PackageSelector::SelectionHandler; eventHandlerMap[ PkgNames::LoadSel()->toString() ] = &PackageSelector::SelectionHandler; eventHandlerMap[ PkgNames::Testcase()->toString() ] = &PackageSelector::TestcaseHandler; @@ -208,14 +209,14 @@ // create the filter popup filterPopup = new NCPopupTree( wpos( 1, 1 ), this ); - // create the search popup - searchPopup = new NCPopupSearch( wpos( 1, 1 ), this ); - // the file popup filePopup = new NCPopupFile( wpos( 1, 1), floppyDevice, this ); } + + // create the search popup + searchPopup = new NCPopupSearch( wpos( 1, 1 ), this ); - // the dependency popups + // the dependency popup depsPopup = new NCPopupDeps( wpos( 1, 1 ), this ); // the disk space popup @@ -705,6 +706,57 @@ /////////////////////////////////////////////////////////////////// // +// fillPatchSearchList +// +// Fills the patch list with search results +// +bool PackageSelector::fillPatchSearchList( const YCPString & expr ) +{ + NCPkgTable * packageList = getPackageList(); + + if ( !packageList + || expr.isNull() ) + { + return false; + } + + // clear the patch list + packageList->itemsCleared (); + // get the patch list and sort it + list<ZyppSel> patchList( zyppPatchesBegin (), zyppPatchesEnd () ); + patchList.sort( sortByName ); + list<ZyppSel>::iterator listIt = patchList.begin(); + + while ( listIt != patchList.end() ) + { + ZyppPatch patchPtr = tryCastToZyppPatch( ( *listIt)->theObj() ); + + if ( patchPtr ) + { + if ( match( (*listIt)->name(), expr->value(), true ) ) + { + // search sucessful + packageList->createPatchEntry( patchPtr, *listIt ); + } + } + ++listIt; + } + // show the patch list with search result + packageList->drawList(); + + // set filter label to 'Search' + YWidget * filterLabel = y2ui->widgetWithId( PkgNames::Filter(), true ); + if ( filterLabel ) + { + static_cast<NCLabel *>(filterLabel)->setLabel( YCPString(PkgNames::SearchResults()) ); + } + + return true; +} + + +/////////////////////////////////////////////////////////////////// +// // fillPatchList // // Fills the package table with the list of YOU patches @@ -1424,6 +1476,12 @@ updatePackageList(); showDiskSpace(); } + else if ( event.selection->compare( PkgNames::VerifySystem() ) == YO_EQUAL ) + { + verifyPackageDependencies(); + updatePackageList(); + showDiskSpace(); + } else if ( event.selection->compare( PkgNames::AutoDeps() ) == YO_EQUAL ) { char menu[2000]; @@ -1432,7 +1490,8 @@ { snprintf ( menu, sizeof(menu) - 1, "`MenuButton( \"%s\", [" - "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ) ] )" + "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," + "`item( `id(\"testcase\"), \"%s\" )" #ifdef FIXME "," "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" @@ -1441,7 +1500,9 @@ PkgNames::MenuEtc().c_str(), PkgNames::MenuDeps().c_str(), PkgNames::MenuCheckDeps().c_str(), - PkgNames::MenuNoAutoDeps().c_str() + PkgNames::MenuNoAutoDeps().c_str(), + PkgNames::MenuVerifySystem().c_str(), + PkgNames::MenuTestCase().c_str() #ifdef FIXME , PkgNames::MenuSel().c_str(), @@ -1468,7 +1529,8 @@ { snprintf ( menu, sizeof(menu) - 1, "`MenuButton( \"%s\", [" - "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ) ] )" + "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," + "`item( `id(\"testcase\"), \"%s\" )" #ifdef FIXME "," "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" @@ -1477,7 +1539,9 @@ PkgNames::MenuEtc().c_str(), PkgNames::MenuDeps().c_str(), PkgNames::MenuCheckDeps().c_str(), - PkgNames::MenuAutoDeps().c_str() + PkgNames::MenuAutoDeps().c_str(), + PkgNames::MenuVerifySystem().c_str(), + PkgNames::MenuTestCase().c_str() #ifdef FIXME , PkgNames::MenuSel().c_str(), @@ -2234,12 +2298,22 @@ && (doit || autoCheck) ) { NCMIL << "Checking dependencies" << endl; - cancel = depsPopup->showDependencies( ); + cancel = depsPopup->showDependencies( NCPopupDeps::S_Solve ); } return cancel; } +bool PackageSelector::verifyPackageDependencies () +{ + bool cancel = false; + if ( depsPopup ) + { + cancel = depsPopup->showDependencies( NCPopupDeps::S_Verify ); + } + return cancel; +} + /////////////////////////////////////////////////////////////////// // // showDependencies diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PackageSelector.h new/yast2-ncurses-2.15.2/src/PackageSelector.h --- old/yast2-ncurses-2.15.1/src/PackageSelector.h 2006-11-10 16:19:49.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PackageSelector.h 2006-12-12 12:49:05.000000000 +0100 @@ -187,6 +187,9 @@ bool checkProvides, bool checkRequires ); + bool fillPatchSearchList( const YCPString & expr ); + + bool isYouMode() { return youMode; } /** * Gets default RPM group (the first group) * @return YStringTreeItem * @@ -312,13 +315,18 @@ */ bool showPackageInformation ( ZyppObj pkgPtr, ZyppSel slbPtr ); - /** + /** * Checks and shows the dependencies * @param doit true: do the check, false: only check if auto check is on */ bool showPackageDependencies ( bool doit ); /** + * Verifies and shows the dependencies + */ + bool verifyPackageDependencies (); + + /** * Checks and shows the selectiondependencies */ void showSelectionDependencies ( ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PkgNames.cc new/yast2-ncurses-2.15.2/src/PkgNames.cc --- old/yast2-ncurses-2.15.1/src/PkgNames.cc 2006-11-10 16:19:49.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PkgNames.cc 2006-12-12 12:04:27.000000000 +0100 @@ -194,7 +194,12 @@ static const YCPValue value = createIdValue ( "showdeps" ); return value; } - +// the menu entry Etc./verify system +const YCPValue& PkgNames::VerifySystem () +{ + static const YCPValue value = createIdValue ( "verifysystem" ); + return value; +} // the menu entry Etc./auto check dep const YCPValue& PkgNames::AutoDeps () { @@ -1263,6 +1268,21 @@ return value; } +const string PkgNames::MenuVerifySystem() +{ + // menu entry: verify system + // Please note: preserve the whitespaces at the beginning + static const string value = _( " &Verify System" ); + return value; +} + +const string PkgNames::MenuTestCase() +{ + // menu entry: generate test case for solver + static const string value = _( "Generate Dependency Resolver &Test Case" ); + return value; +} + const string PkgNames::MenuSel() { // submenu: selections diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/PkgNames.h new/yast2-ncurses-2.15.2/src/PkgNames.h --- old/yast2-ncurses-2.15.1/src/PkgNames.h 2006-11-10 16:19:49.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/PkgNames.h 2006-12-12 12:04:27.000000000 +0100 @@ -215,6 +215,11 @@ */ static const YCPValue& ShowDeps (); + /** + * Widget id of the Etc./Dependencies/verify system menu item + */ + static const YCPValue& VerifySystem (); + /** * Widget id of the Etc./Dependencies/Auto check menu item */ @@ -838,6 +843,8 @@ static const string MenuCheckDeps(); static const string MenuAutoDeps(); static const string MenuNoAutoDeps(); + static const string MenuVerifySystem(); + static const string MenuTestCase(); static const string MenuSel(); static const string MenuSaveSel(); static const string MenuLoadSel(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/pkg_layout.ycp new/yast2-ncurses-2.15.2/src/pkg_layout.ycp --- old/yast2-ncurses-2.15.1/src/pkg_layout.ycp 2006-11-29 17:02:30.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/pkg_layout.ycp 2006-12-12 11:23:53.000000000 +0100 @@ -7,7 +7,7 @@ * * ncurses layout for package selection * - * $Id: pkg_layout.ycp 34651 2006-11-29 16:02:29Z kmachalkova $ + * $Id: pkg_layout.ycp 34907 2006-12-12 10:23:51Z gs $ */ { textdomain "packages"; @@ -84,7 +84,8 @@ [`menu( _( "&Dependencies" ), // menu items of the Etc./Dependencies submenu [`item( `id("showdeps"), _( " &Check Dependencies Now" ) ), - `item( `id("autodeps"), _( "[X] &Automatic Dependency Check" ) ) ] + `item( `id("autodeps"), _( "[X] &Automatic Dependency Check" ) ), + `item( `id("verifysystem"), _( " &Verify System" ) ) ] ), `item( `id("testcase"), _( "Generate Dependency Resolver &Test Case" ) ) /*#ifdef FIXME diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.1/src/you_layout.ycp new/yast2-ncurses-2.15.2/src/you_layout.ycp --- old/yast2-ncurses-2.15.1/src/you_layout.ycp 2006-11-10 16:19:48.000000000 +0100 +++ new/yast2-ncurses-2.15.2/src/you_layout.ycp 2006-12-12 12:52:04.000000000 +0100 @@ -7,7 +7,7 @@ * * ncurses layout for YOU * - * $Id: you_layout.ycp 34118 2006-11-07 13:37:19Z gs $ + * $Id: you_layout.ycp 34916 2006-12-12 11:52:02Z gs $ */ { textdomain "packages"; @@ -27,7 +27,7 @@ `item( `id("security"), _( "&Security" ) ), `item( `id("optional"), _( "&Optional" ) ), // end: - `item( `id("yast2"), _( "YaS&T2" ) ) + `item( `id("search"), _( "S&earch" ) ) ] )), // label of the Online Update 'Actions' menu (keep it short) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libgpg-error
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package libgpg-error checked in at Tue Dec 12 18:28:39 CET 2006. -------- --- libgpg-error/libgpg-error.changes 2006-09-21 16:54:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/libgpg-error/libgpg-error.changes 2006-12-05 18:47:29.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 5 18:47:06 CET 2006 - mkoenig(a)suse.de + +- move shared lib to /%_lib + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgpg-error.spec ++++++ --- /var/tmp/diff_new_pack.hXXeaP/_old 2006-12-12 18:28:28.000000000 +0100 +++ /var/tmp/diff_new_pack.hXXeaP/_new 2006-12-12 18:28:28.000000000 +0100 @@ -13,9 +13,9 @@ Name: libgpg-error URL: http://www.gnupg.org/ Version: 1.4 -Release: 1 +Release: 16 Summary: Library That Defines Common Error Values for All GnuPG Components -License: GPL, LGPL +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/C and C++ Autoreqprov: on Source: %name-%version.tar.bz2 @@ -68,13 +68,17 @@ autoconf ./configure --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ + --libdir=/%{_lib} \ --infodir=%{_infodir} \ CFLAGS="$RPM_OPT_FLAGS" make %install make DESTDIR=$RPM_BUILD_ROOT install +# move static lib and .la to %_libdir +# they are not allowed to reside in /%_lib +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mv $RPM_BUILD_ROOT/%{_lib}/libgpg-error.{a,la} $RPM_BUILD_ROOT%{_libdir} # Drop the lisp stuff, it depends on ASDF and CFFI # which needs to be packaged first rm -r %{buildroot}/usr/share/common-lisp @@ -92,7 +96,7 @@ %defattr(-,root,root) %doc README NEWS ChangeLog COPYING.LIB COPYING AUTHORS ABOUT-NLS %_datadir/locale/*/LC_MESSAGES/libgpg-error*.mo -%_libdir/libgpg-error*.so.* +/%_lib/libgpg-error*.so.* %files devel %defattr(-,root,root) @@ -101,9 +105,11 @@ %_bindir/* %_libdir/libgpg-error*.a %_libdir/libgpg-error*.la -%_libdir/libgpg-error*.so +/%_lib/libgpg-error*.so %changelog -n libgpg-error +* Tue Dec 05 2006 - mkoenig(a)suse.de +- move shared lib to /%%_lib * Tue Sep 19 2006 - mkoenig(a)suse.de - update to version 1.4: * New error codes for the Assuan IPC library. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-installation
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package yast2-installation checked in at Tue Dec 12 02:30:14 CET 2006. -------- --- yast2-installation/yast2-installation.changes 2006-12-07 11:20:39.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-12-11 16:16:39.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Dec 11 16:11:21 CET 2006 - locilka(a)suse.cz + +- Handling new flag REGISTERPRODUCT from add-on product content + file. This flag demands running the registration client after + an add-on product is installed (on a running system) and demands + running the registration client even if it is disabled in + the base-product's control file (during installation) + (FATE #301312). +- 2.15.2 + +------------------------------------------------------------------- +Thu Dec 7 18:28:21 CET 2006 - locilka(a)suse.cz + +- Release Notes dialog in the second stage installation now offers + to select a different language for release notes than the default + one (#224875). + +------------------------------------------------------------------- Old: ---- yast2-installation-2.15.1.tar.bz2 New: ---- yast2-installation-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.gxQ8hB/_old 2006-12-12 02:29:55.000000000 +0100 +++ /var/tmp/diff_new_pack.gxQ8hB/_new 2006-12-12 02:29:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.15.1) +# spec file for package yast2-installation (Version 2.15.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.15.1 +Version: 2.15.2 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.1.tar.bz2 +Source0: yast2-installation-2.15.2.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite Requires: yast2-slp yast2-firewall @@ -69,7 +69,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-installation-2.15.1 +%setup -n yast2-installation-2.15.2 %build %{prefix}/bin/y2tool y2autoconf @@ -133,6 +133,18 @@ %endif %changelog -n yast2-installation +* Mon Dec 11 2006 - locilka(a)suse.cz +- Handling new flag REGISTERPRODUCT from add-on product content + file. This flag demands running the registration client after + an add-on product is installed (on a running system) and demands + running the registration client even if it is disabled in + the base-product's control file (during installation) + (FATE #301312). +- 2.15.2 +* Thu Dec 07 2006 - locilka(a)suse.cz +- Release Notes dialog in the second stage installation now offers + to select a different language for release notes than the default + one (#224875). * Thu Dec 07 2006 - locilka(a)suse.cz - Reworked adding and removing Add-Ons during the first stage installation. If some Add-Ons are added or removed, the entire ++++++ yast2-installation-2.15.1.tar.bz2 -> yast2-installation-2.15.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/VERSION new/yast2-installation-2.15.2/VERSION --- old/yast2-installation-2.15.1/VERSION 2006-12-07 10:59:32.000000000 +0100 +++ new/yast2-installation-2.15.2/VERSION 2006-12-11 16:11:07.000000000 +0100 @@ -1 +1 @@ -2.15.1 +2.15.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/configure new/yast2-installation-2.15.2/configure --- old/yast2-installation-2.15.1/configure 2006-12-07 11:24:28.000000000 +0100 +++ new/yast2-installation-2.15.2/configure 2006-12-11 16:25:41.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.1. +# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.15.1' -PACKAGE_STRING='yast2-installation 2.15.1' +PACKAGE_VERSION='2.15.2' +PACKAGE_STRING='yast2-installation 2.15.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1192,7 +1192,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-installation 2.15.1 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.15.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1263,7 +1263,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.15.1:";; + short | recursive ) echo "Configuration of yast2-installation 2.15.2:";; esac cat <<\_ACEOF @@ -1341,7 +1341,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.15.1 +yast2-installation configure 2.15.2 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1355,7 +1355,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-installation $as_me 2.15.1, which was +It was created by yast2-installation $as_me 2.15.2, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2156,7 +2156,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.15.1' + VERSION='2.15.2' cat >>confdefs.h <<_ACEOF @@ -2383,7 +2383,7 @@ -VERSION="2.15.1" +VERSION="2.15.2" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3512,7 +3512,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.15.1, which was +This file was extended by yast2-installation $as_me 2.15.2, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3555,7 +3555,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.15.1 +yast2-installation config.status 2.15.2 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/configure.in new/yast2-installation-2.15.2/configure.in --- old/yast2-installation-2.15.1/configure.in 2006-12-07 11:24:23.000000000 +0100 +++ new/yast2-installation-2.15.2/configure.in 2006-12-11 16:25:36.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.15.1, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.15.2, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.1" +VERSION="2.15.2" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/src/clients/inst_release_notes.ycp new/yast2-installation-2.15.2/src/clients/inst_release_notes.ycp --- old/yast2-installation-2.15.1/src/clients/inst_release_notes.ycp 2006-11-29 15:47:32.000000000 +0100 +++ new/yast2-installation-2.15.2/src/clients/inst_release_notes.ycp 2006-12-07 18:32:08.000000000 +0100 @@ -7,7 +7,7 @@ * * Display release notes. * - * $Id: inst_release_notes.ycp 33279 2006-10-09 14:16:49Z locilka $ + * $Id: inst_release_notes.ycp 34857 2006-12-07 17:32:05Z locilka $ */ { @@ -23,46 +23,135 @@ map argmap = GetInstArgs::argmap(); + integer minwidtprodsel = 0; list<string> relnotesproducts = []; - list<string> readproducts = []; + map<string, string> relnotesmap = $[]; - list<string> default_patterns = ["RELEASE-NOTES.%1.rtf"]; - list<string> patterns = argmap["patterns"]:default_patterns; - string basedirectory = argmap["directory"]:"/usr/share/doc/release-notes"; + string basedirectory = "/usr/share/doc/release-notes"; string directory=""; integer prodnamelen=0; + map <string, string> CreateLanguagesTranslations () { + map <string, string> ret = $[]; + map <string, list> all_languages = Language::GetLanguagesMap(false); + foreach (string short, list translations, all_languages, { + string translation = nil; + if (translations[4]:"" != "") translation = translations[4]:""; + else if (translations[1]:"" != "") translation = translations[1]:""; + else if (translations[0]:"" != "") translation = translations[0]:""; + + ret[short] = translation; + + // fallback for short names without xx_YY + if (regexpmatch(short, "_")) { + short = regexpsub(short, "^(.*)_.*$", "\\1"); + if (ret[short]:nil == nil) ret[short] = translation; + } + }); + + // exceptions + if (ret["en"]:nil != nil && ret["en_US"]:nil != nil) ret["en"] = ret["en_US"]:""; + if (ret["zh"]:nil != nil && ret["zh_CN"]:nil != nil) ret["zh"] = ret["zh_CN"]:""; + if (ret["pt"]:nil != nil && ret["pt_PT"]:nil != nil) ret["pt"] = ret["pt_PT"]:""; + + return ret; + } + + // --- // + if (argmap["directory"]:"" != "") basedirectory = Directory::custom_workflow_dir + basedirectory; + list<string> readproducts = []; readproducts = (list<string>) SCR::Read(.target.dir, basedirectory); - foreach ( string product, readproducts , - { + map <string, string> languages_translations = CreateLanguagesTranslations(); + map <string, list <term> > languages_of_relnotes = $[]; + + list <string> preferred_langs = [ + Language::language, + substring (Language::language, 0, 2), + "en_US", + "en_GB", + "en" + ]; + + map <string, integer> minwidthlang = $[]; + + map <string, string> cleanproduct_product = $[]; + // Creating term `ComboBox with languages for every single product + foreach ( string product, readproducts, { // beautify product string string cleanproduct = mergestring(splitstring(product, "_"), " "); - relnotesproducts = add (relnotesproducts, cleanproduct ); + relnotesproducts = add (relnotesproducts, cleanproduct); + if (minwidtprodsel < size (cleanproduct)) + minwidtprodsel = size (cleanproduct); + cleanproduct_product[cleanproduct] = product; + prodnamelen=prodnamelen + size(cleanproduct); // read release notes - string directory = basedirectory + "/" + product; - map relnotes = CustomDialogs::load_file_locale(patterns, directory, Language::language); - - // add release notes to map - relnotesmap[cleanproduct] = (string) relnotes["text"]:""; + string directory = basedirectory + "/" + product + "/"; - /* filename of release notes */ - //string file = relnotes["file"]:""; - /* release notes */ - // string text = relnotes["text"]:""; + list <string> relnotest_list = (list <string>) SCR::Read (.target.dir, directory); + relnotest_list = filter (string one_relnotes, relnotest_list, { + return regexpmatch (one_relnotes, "^RELEASE-NOTES\..*\.rtf$"); + }); + + list <term> combobox_items = []; + foreach (string one_relnotes, relnotest_list, { + string relnotes_lang = regexpsub (one_relnotes, "^RELEASE-NOTES\.(.*)\.rtf$", "\\1"); + string lang_name = languages_translations[relnotes_lang]:""; + // combobox item + if (lang_name == nil || lang_name == "") lang_name = sformat (_("Language: %1"), relnotes_lang); + + // set minimal width (maximal length of language name) + if (minwidthlang[product]:0 < size (lang_name)) + minwidthlang[product] = size (lang_name); + + combobox_items = add (combobox_items, + `item (`id (sformat ("%1%2", directory, one_relnotes)), lang_name) + ); + }); + + // Selecting default language + string item_id = nil; + boolean preferred_found = false; + foreach (string preffered_lang, preferred_langs, { + integer conter = -1; + foreach (term one_item, combobox_items, { + conter = conter + 1; + string item_id = one_item[0,0]:""; + + if (regexpmatch (item_id, sformat ("RELEASE-NOTES\.%1\.rtf$", preffered_lang))) { + preferred_found = true; + break; + } + }); + + if (preferred_found) { + combobox_items[conter] = add (combobox_items[conter]:`item(`id(nil), nil), true); + break; + } + }); + + languages_of_relnotes[product] = sort (term a, term b, combobox_items, ``( a[1]:"" < b[1]:"" )); }); - + /* caption for dialog "Release Notes" */ string caption = _("Release Notes"); - term relnoteslayout=nil; - term relnotesrichtext=`RichText(`id(`relnotescontent), - relnotesmap[relnotesproducts[0]:""]:"Select product" ); + term relnoteslayout = nil; + term relnotesscreen = `VBox ( + // combobox + `Left ( + `ReplacePoint ( + `id(`lang_rp), + `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) + ) + ), + `RichText (`id (`relnotescontent), "") + ); // use DumpTab or ComboBox layout if ( UI::HasSpecialWidget(`DumbTab ) && ( @@ -70,15 +159,23 @@ ( size(relnotesproducts)>3 && prodnamelen<70 ) ) ) { - relnoteslayout= `DumbTab ( relnotesproducts , relnotesrichtext ); + relnoteslayout = `DumbTab (relnotesproducts, relnotesscreen); } else { - relnoteslayout=`VBox( `Left( `ComboBox(`id(`productsel), `opt(`notify), _("&Product"), relnotesproducts)), - relnotesrichtext ); + relnoteslayout = `VBox ( + `Left ( + `MinWidth ( + // +2 thingies on the right + minwidtprodsel + 2, + `ComboBox (`id(`productsel), `opt(`notify), _("&Product"), relnotesproducts) + ) + ), + relnotesscreen + ); } - term contents = `VBox ( `VSpacing (0.5), relnoteslayout, `VSpacing (0.5)); + term contents = `VBox (`VSpacing (0.5), relnoteslayout, `VSpacing (0.5)); /* help text for dialog "Release Notes" */ string help = _("<p>Here are the <b>release notes</b> for the installed @@ -91,39 +188,69 @@ GetInstArgs::enable_next()); Wizard::SetTitleIcon("yast-release-notes"); - // FIXME: richtext eats return key, but only in NCurses and we want to - // make users read release notes (and make PgDn work). For Next, F10 is - // availbale - UI::SetFocus (`id (`relnotescontent)); + // Default settings + UI::ChangeWidget (`id(`lang), `Enabled, false); + if (UI::WidgetExists(`productsel) && (size(relnotesproducts) < 2)) + UI::ChangeWidget (`id(`productsel), `Enabled, false); + + void RedrawRelnotesLang (string use_file) { + string contents = (string) SCR::Read (.target.string, use_file); + if (contents == nil || contents == "") { + y2error ("Wrong relnotesfile: %1", use_file); + } else { + UI::ChangeWidget (`id(`relnotescontent), `Value, contents); + } + + UI::SetFocus (`id (`relnotescontent)); + } + + void RedrawRelnotesProduct (symbol redraw_type, any current_ret) { + if (redraw_type == `tab) { + string product = cleanproduct_product[tostring(current_ret)]:""; + + UI::ReplaceWidget ( + `id (`lang_rp), + `MinWidth ( + // +2 for thingies on the right + minwidthlang[product]:16 + 2, + `ComboBox (`id (`lang), `opt (`notify), _("&Language"), languages_of_relnotes[product]:[]) + ) + ); + if (size(languages_of_relnotes[product]:[]) > 1) + UI::ChangeWidget (`id (`lang), `Enabled, true); + else + UI::ChangeWidget (`id (`lang), `Enabled, false); + } + + RedrawRelnotesLang ((string) UI::QueryWidget (`id (`lang), `Value)); + } // for debugging // UI::DumpWidgetTree(); + // Init the first product + RedrawRelnotesProduct (`tab, relnotesproducts[0]:""); + any ret = nil; repeat { ret = Wizard::UserInput(); - if (ret == `abort) - { + if (ret == `abort) { if (Mode::normal()) break; if (Popup::ConfirmAbort (`incomplete)) break; - } - else if (ret == `help) - { + } else if (ret == `help) { Wizard::ShowHelp (help); - } - else if ( ret == `productsel ) - { - UI::ChangeWidget(`relnotescontent, `Value, relnotesmap[ (string) UI::QueryWidget(`id(`productsel), `Value) ]:"" ); - UI::SetFocus (`id (`relnotescontent)); - } - else if ( is( ret, string ) ) - { - UI::ChangeWidget(`relnotescontent, `Value, relnotesmap[(string) ret]:""); - UI::SetFocus (`id (`relnotescontent)); + // using combobox for products + } else if (ret == `productsel) { + RedrawRelnotesProduct (`tab, (string) UI::QueryWidget (`id (`productsel), `Value)); + } else if (ret == `lang) { + RedrawRelnotesLang ((string) UI::QueryWidget (`id (`lang), `Value)); + // using tabs for products + } else if (is (ret, string)) { + RedrawRelnotesProduct (`tab, ret); } } until ( ret == `next || ret == `back ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/src/include/add-on-workflow.ycp new/yast2-installation-2.15.2/src/include/add-on-workflow.ycp --- old/yast2-installation-2.15.1/src/include/add-on-workflow.ycp 2006-12-07 10:07:09.000000000 +0100 +++ new/yast2-installation-2.15.2/src/include/add-on-workflow.ycp 2006-12-11 16:10:10.000000000 +0100 @@ -353,6 +353,7 @@ { // error report Report::Error (_("Failed to initialize the catalog.")); + AddOnProduct::ClearRegistrationRequest (src_id); return `finish; } /* @@ -461,6 +462,7 @@ { // error report Report::Error (_("Failed to initialize the catalog.")); + AddOnProduct::ClearRegistrationRequest (selected); return `finish; } @@ -536,6 +538,7 @@ or selected for installation.")); y2milestone ("Deleting installatino source %1", AddOnProduct::src_id); Pkg::SourceDelete (AddOnProduct::src_id); + AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); return `finish; } // Display /media.1/info.txt if such file exists @@ -870,18 +873,25 @@ // remove a temporary file, not needed anymore AddOnProduct::RemoveAddOnControlFile (selected); some_addon_changed = true; + // remove product from list of product to register (FATE #301312) + AddOnProduct::RemoveRegistrationFlag (media); Redraw (enable_back, enable_next); // adding new add-on } else if (ret == `add) { symbol ret = RunWizard (); - if (ret == `next) some_addon_changed = true; + if (ret == `next) { + // check whether it requests registration (FATE #301312) + AddOnProduct::PrepareForRegistration (AddOnProduct::src_id); + some_addon_changed = true; + } Redraw (enable_back, enable_next); } } until ( ret == `next || ret == `back ); y2milestone ("Ret: %1, Some Add-on Added/Removed: %2", ret, some_addon_changed); + y2milestone ("Registration will be requested: %1", AddOnProduct::ProcessRegistration()); if (Mode::installation() && Stage::initial()) { // bugzilla #221377 @@ -889,7 +899,7 @@ AddOnProduct::ReIntegrateFromScratch(); } } - + return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/src/modules/AddOnProduct.ycp new/yast2-installation-2.15.2/src/modules/AddOnProduct.ycp --- old/yast2-installation-2.15.1/src/modules/AddOnProduct.ycp 2006-12-07 08:24:53.000000000 +0100 +++ new/yast2-installation-2.15.2/src/modules/AddOnProduct.ycp 2006-12-11 16:10:14.000000000 +0100 @@ -723,37 +723,15 @@ return true; } -/** - * Do installation of the add-on product within an installed system - * srcid is got via AddOnProduct::src_id - * - * @param string src_id - * @return symbol the result symbol from wizard sequencer - */ -global symbol DoInstall() { - // Display /media.1/info.txt if such file exists - // Display license and wait for agreement - // Not needed here, license already shown in the workflow - /* - boolean license_ret = AcceptedLicenseAndInfoFile(src_id); - if (license_ret != true) { - y2milestone("Removing the current source ID %1", src_id); - Pkg::SourceDelete(src_id); - return nil; - } - */ - - string control = Pkg::SourceProvideOptionalFile (src_id, 1, "/installation.xml"); - // Fallback -- Source didn't provide needed controll file - // Handling as it was an installation source - if (control == nil) - { - y2milestone("File /installation.xml not found, running sw_single for this source"); - WFM::CallFunction ("sw_single", []); +symbol DoInstall_NoControlFile () { + y2milestone("File /installation.xml not found, running sw_single for this source"); + WFM::CallFunction ("sw_single", []); - return nil; - } + return `register; +} +symbol DoInstall_WithControlFile (string control) { + y2milestone ("File /installation.xml was found, running own workflow..."); // copy the control file to local filesystem - in case of media release string tmp = (string)SCR::Read (.target.tmpdir); tmp = tmp + "/installation.xml"; @@ -799,6 +777,7 @@ CleanY2Update(); return nil; } + // start workflow Wizard::OpenNextBackStepsDialog(); // dialog caption @@ -809,6 +788,181 @@ symbol ret = ProductControl::Run(); UI::CloseDialog(); CleanY2Update(); + + return ret; +} + +/** + * Contains list of source IDs that request registration + */ +list <integer> addons_requesting_registration = []; + +global void ClearRegistrationRequest (integer src_id) { + y2milestone ("Clearing registration flag for source ID %1", src_id); + if (src_id != nil) { + addons_requesting_registration = filter (integer one_source, addons_requesting_registration, { + return one_source != src_id; + }); + } +} + +/** + * Returns whether registration is requested by at least one of + * used Add-On products. + * + * @return boolean if requested + */ +global boolean ProcessRegistration () { + boolean force_registration = false; + + // checking add-on products one by one + foreach (map<string,any> prod, AddOnProduct::add_on_products, { + integer srcid = (integer) prod["media"]:nil; + + if (srcid != nil && contains (addons_requesting_registration, srcid)) { + force_registration = true; + break; + } + }); + + y2milestone ("Requesting registration: %1", force_registration); + return force_registration; +} + +/** + * Add-On product might have been added into products requesting + * registration. This pruduct has been removed (during configuring + * list of add-on products). + */ +global void RemoveRegistrationFlag (integer src_id) { + // filtering out src_id + addons_requesting_registration = filter (integer one_id, addons_requesting_registration, { + return one_id != src_id; + }); + + // removing cached file + string tmpdir = (string) SCR::Read (.target.tmpdir) + "/add-on-content-files/"; + string cachedfile = sformat ("%1content-%2", tmpdir, src_id); + if (FileUtils::Exists (cachedfile)) { + y2milestone ("Removing cached file %1", cachedfile); + SCR::Execute (.target.remove, cachedfile); + } +} + +/** + * Checks whether the content file of the add-on has a flag REGISTERPRODUCT + * set to "true" or "yes". If it has, product is added into list of pruducts + * that need registration. Cached content file is used if possible. + * + * @param integer source id + */ +global void PrepareForRegistration (integer src_id) { + string tmpdir = (string) SCR::Read (.target.tmpdir) + "/add-on-content-files/"; + + // create directory if doesn't exist + if (! FileUtils::Exists (tmpdir)) { + integer run = (integer) SCR::Execute (.target.bash, sformat("/bin/mkdir -p '%1'", tmpdir)); + if (run != 0) { + y2error ("Cannot create directory %1", tmpdir); + return nil; + } + } + + // use cached file if possible + string contentfile = sformat ("%1content-%2", tmpdir, src_id); + if (FileUtils::Exists (contentfile)) { + y2milestone ("Using cached contentfile %1", contentfile); + } else { + y2milestone ("Checking contentfile from source"); + string sourcefile = Pkg::SourceProvideOptionalFile (src_id, 1, "/content"); + if (sourcefile == nil) { + y2warning ("Cannot obtain content file!"); + return nil; + } + // copying content file + integer run = (integer) SCR::Execute (.target.bash, + sformat ("/bin/cp '%1' '%2'", sourcefile, contentfile) + ); + if (run != 0) { + y2error ("Cannot copy %1 to %2", sourcefile, contentfile); + return nil; + } + } + + // registering agent for the current content file + SCR::RegisterAgent (.addon.content, `ag_ini ( + `IniAgent( contentfile, $[ + "options" : [ "read_only", "global_values", "flat" ], + "comments" : [ "^#.*", "^[ \t]*$", ], + "params" : [ + $[ "match" : [ "^[ \t]*([a-zA-Z0-9_\.]+)[ \t]*(.*)[ \t]*$", "%s %s" ] ] + ] + ] + ))); + string register_product = (string) SCR::Read (.addon.content.REGISTERPRODUCT); + SCR::UnregisterAgent (.addon.content); + + // evaluating REGISTERPRODUCT flag, default (nil == false) + y2milestone ("RegisterProduct flag for source %1 is %2", src_id, register_product); + if (register_product == "yes" || register_product == "true") { + addons_requesting_registration = add (addons_requesting_registration, src_id); + } +} + +/** + * Calls registration client if needed. + * + * @param integer source id + */ +global void RegisterAddOnProduct (integer src_id) { + if (contains (addons_requesting_registration, src_id)) { + y2milestone ("Source ID %1 requests registration", src_id); + WFM::CallFunction ("suse_register", []); + } else { + y2milestone ("Source ID %1 doesn't need registration", src_id); + } +} + +/** + * Do installation of the add-on product within an installed system + * srcid is got via AddOnProduct::src_id + * + * @param string src_id + * @return symbol the result symbol from wizard sequencer + */ +global symbol DoInstall() { + // Display /media.1/info.txt if such file exists + // Display license and wait for agreement + // Not needed here, license already shown in the workflow + /* + boolean license_ret = AcceptedLicenseAndInfoFile(src_id); + if (license_ret != true) { + y2milestone("Removing the current source ID %1", src_id); + Pkg::SourceDelete(src_id); + return nil; + } + */ + + // FATE #301312 + PrepareForRegistration (src_id); + + symbol ret = nil; + + string control = Pkg::SourceProvideOptionalFile (src_id, 1, "/installation.xml"); + // Fallback -- Source didn't provide needed controll file + // Handling as it was an installation source + if (control == nil) { + ret = DoInstall_NoControlFile(); + } else { + ret = DoInstall_WithControlFile (control); + } + + if (ret != nil) { + // registers Add-On product if requested + RegisterAddOnProduct (src_id); + } + + y2milestone ("Returning: %1", ret); return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/src/modules/ProductLicense.ycp new/yast2-installation-2.15.2/src/modules/ProductLicense.ycp --- old/yast2-installation-2.15.1/src/modules/ProductLicense.ycp 2006-12-07 10:13:47.000000000 +0100 +++ new/yast2-installation-2.15.2/src/modules/ProductLicense.ycp 2006-12-11 16:10:17.000000000 +0100 @@ -165,6 +165,9 @@ list<string> files = (list<string>)SCR::Read (.target.dir, dir); y2milestone ("All files in license directory: %1", files); + // no license + if (files == nil) return $[]; + foreach (string p, patterns, { if (! issubstring (p, "%")) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.1/src/modules/X11Version.ycp new/yast2-installation-2.15.2/src/modules/X11Version.ycp --- old/yast2-installation-2.15.1/src/modules/X11Version.ycp 2006-11-29 15:47:34.000000000 +0100 +++ new/yast2-installation-2.15.2/src/modules/X11Version.ycp 2006-12-08 12:57:58.000000000 +0100 @@ -16,7 +16,7 @@ : STATUS : Development * - * $Id: X11Version.ycp 22825 2005-03-29 09:31:42Z jsrain $ + * $Id: X11Version.ycp 34863 2006-12-08 11:57:55Z locilka $ */ { @@ -117,7 +117,7 @@ count = count + 1; } - if(file != nil && find(file, "XFree86") == -1) ret = "3"; + if (file != nil && ! regexpmatch(file, "XFree86")) ret = "3"; y2milestone("X link: %1", ret); return ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gecko-sharp2
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package gecko-sharp2 checked in at Tue Dec 12 02:29:48 CET 2006. -------- --- GNOME/gecko-sharp2/gecko-sharp2.changes 2006-11-30 19:37:28.000000000 +0100 +++ /mounts/work_src_done/NOARCH/gecko-sharp2/gecko-sharp2.changes 2006-12-12 00:25:56.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Dec 12 00:13:04 CET 2006 - wberrier(a)suse.de + +- Undo gecko-sharp2 doc package split. + -gecko-sharp2-r69353_break_cyclic_dep.patch: Patch to depend on + monodoc-core instead of mono-tools to break cyclic dep + -gecko-sharp2-r69372_fix_autoconf_docdir.patch: now that we use + autoreconf for the above patch, we must rename docdir to + monodocdir so docdir doesn't get overwritten + +------------------------------------------------------------------- Old: ---- gecko-sharp2-docs.changes gecko-sharp2-docs.spec New: ---- gecko-sharp2-r69353_break_cyclic_dep.patch gecko-sharp2-r69372_fix_autoconf_docdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gecko-sharp2.spec ++++++ --- /var/tmp/diff_new_pack.sRXhki/_old 2006-12-12 02:29:17.000000000 +0100 +++ /var/tmp/diff_new_pack.sRXhki/_new 2006-12-12 02:29:17.000000000 +0100 @@ -12,13 +12,15 @@ Name: gecko-sharp2 %define xulrunner_version 181 -BuildRequires: glib-sharp2 gtk-sharp2 gtk-sharp2-gapi gtk2-devel mono-devel +BuildRequires: glib-sharp2 gtk-sharp2 gtk-sharp2-gapi gtk2-devel mono-devel monodoc-core Version: 0.11 -Release: 56 +Release: 57 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), MOZILLA PUBLIC LICENSE (MPL/NPL) BuildArch: noarch URL: www.monodevelop.com Source0: gecko-sharp-2.0-%{version}.tar.gz +Patch0: gecko-sharp2-r69353_break_cyclic_dep.patch +Patch1: gecko-sharp2-r69372_fix_autoconf_docdir.patch Summary: Gecko bindings for Mono Group: Development/Libraries/Other %if %suse_version > 1010 || 0%{?opensuse_bs} @@ -60,8 +62,11 @@ %prep %setup -q -n gecko-sharp-2.0-%{version} +%patch0 +%patch1 %build +autoreconf -fi ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var %install @@ -77,8 +82,16 @@ /usr/lib/mono/gecko-sharp-2.0 /usr/lib/mono/gac/gecko-sharp /usr/share/pkgconfig/*.pc +/usr/lib/monodoc/sources/* %changelog -n gecko-sharp2 +* Tue Dec 12 2006 - wberrier(a)suse.de +- Undo gecko-sharp2 doc package split. + -gecko-sharp2-r69353_break_cyclic_dep.patch: Patch to depend on + monodoc-core instead of mono-tools to break cyclic dep + -gecko-sharp2-r69372_fix_autoconf_docdir.patch: now that we use + autoreconf for the above patch, we must rename docdir to + monodocdir so docdir doesn't get overwritten * Thu Nov 30 2006 - sbrabec(a)suse.cz - Fixed xulrunner dependencies for older products. * Tue Nov 14 2006 - ro(a)suse.de ++++++ gecko-sharp2-r69353_break_cyclic_dep.patch ++++++ Index: configure.in =================================================================== --- configure.in (revision 69351) +++ configure.in (working copy) @@ -108,15 +108,15 @@ PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no) if test "x$enable_monodoc" = "xyes"; then - AC_PATH_PROG(MONODOC, monodoc, no) - if test x$MONODOC = xno; then + AC_PATH_PROG(MONODOCER, monodocer, no) + if test x$MONODOCER = xno; then enable_monodoc=no fi else - MONODOC= + MONODOCER= fi -AC_SUBST(MONODOC) +AC_SUBST(MONODOCER) AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") @@ -154,7 +154,7 @@ echo "" echo " * Installation prefix: $prefix" echo " * compiler: $CSC" -echo " * Documentation: $enable_monodoc ($MONODOC)" +echo " * Documentation: $enable_monodoc ($MONODOCER)" echo "" echo "---" Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 69352) +++ doc/Makefile.am (working copy) @@ -7,13 +7,13 @@ noinst_DATA = $(TARGETS) ASSEMBLER = mdassembler -UPDATER = $(MONODOC) --update gecko-sharp-docs.zip gecko-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml $(ASSEMBLER) --ecma $(srcdir)/en -o gecko-sharp-docs update: - $(UPDATER) ../gtkmozembed-sharp/gecko-sharp.dll -o ./en -f + rm -Rf ./en/Gecko/* ./en/GtkSharp.GeckoSharp/* + $(MONODOCER) -updateto:./en -path:. -assembly:../gtkmozembed/gecko-sharp.dll CLEANFILES = gecko-sharp-docs.zip gecko-sharp-docs.tree ++++++ gecko-sharp2-r69372_fix_autoconf_docdir.patch ++++++ diff -ur ./doc/Makefile.am ../new/gecko-sharp-2.0-0.11/doc/Makefile.am --- ./doc/Makefile.am 2005-09-09 06:11:51.000000000 +0200 +++ ../new/gecko-sharp-2.0-0.11/doc/Makefile.am 2006-12-12 00:03:59.000000000 +0100 @@ -1,6 +1,6 @@ if ENABLE_MONODOC -docdir = $(prefix)/lib/monodoc/sources -doc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source +monodocdir = $(prefix)/lib/monodoc/sources +monodoc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source endif noinst_DATA = $(TARGETS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apparmor-profiles
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package apparmor-profiles checked in at Tue Dec 12 02:29:12 CET 2006. -------- --- apparmor-profiles/apparmor-profiles.changes 2006-11-27 23:48:45.000000000 +0100 +++ /mounts/work_src_done/NOARCH/apparmor-profiles/apparmor-profiles.changes 2006-12-11 22:42:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 22:42:16 CET 2006 - srarnold(a)suse.de + +- Newer postfix uses a session cache for TLS + +------------------------------------------------------------------- Old: ---- apparmor-profiles-2.0.1-262.tar.gz New: ---- apparmor-profiles-2.0.1-267.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-profiles.spec ++++++ --- /var/tmp/diff_new_pack.MqvW6G/_old 2006-12-12 02:29:04.000000000 +0100 +++ /var/tmp/diff_new_pack.MqvW6G/_new 2006-12-12 02:29:04.000000000 +0100 @@ -16,9 +16,9 @@ %endif Summary: AppArmor profiles that are loaded into the apparmor kernel module Version: 2.0.1 -Release: 13 +Release: 14 Group: Productivity/Security -Source0: %{name}-%{version}-262.tar.gz +Source0: %{name}-%{version}-267.tar.gz License: GNU General Public License (GPL), Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -77,6 +77,8 @@ %preun %changelog -n apparmor-profiles +* Mon Dec 11 2006 - srarnold(a)suse.de +- Newer postfix uses a session cache for TLS * Mon Nov 27 2006 - srarnold(a)suse.de - Bug 220331 - syslog-ng cannot log news messages - capability fowner, to change uid/gid of logfiles ++++++ apparmor-profiles-2.0.1-262.tar.gz -> apparmor-profiles-2.0.1-267.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0.1/extras/usr.lib.postfix.tlsmgr new/apparmor-profiles-2.0.1/extras/usr.lib.postfix.tlsmgr --- old/apparmor-profiles-2.0.1/extras/usr.lib.postfix.tlsmgr 2006-08-04 21:13:59.000000000 +0200 +++ new/apparmor-profiles-2.0.1/extras/usr.lib.postfix.tlsmgr 2006-12-08 07:26:21.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: usr.lib.postfix.tlsmgr 90 2006-08-04 19:13:59Z seth_arnold $ +# $Id: usr.lib.postfix.tlsmgr 267 2006-12-08 06:26:21Z steve-beattie $ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE @@ -22,4 +22,6 @@ /etc/postfix/prng_exch rw, /proc/sys/kernel/ngroups_max r, /{var/spool/postfix/,}private/tlsmgr r, + /var/run/__db.smtpd_tls_session_cache.db rw, + /var/run/smtpd_tls_session_cache.db rw, } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 smart
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package smart checked in at Tue Dec 12 02:28:55 CET 2006. -------- --- smart/smart.changes 2006-12-04 16:47:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2006-12-11 20:03:03.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 20:04:14 CET 2006 - cthiel(a)suse.de + +- updated smart-trunk.patch to r839 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.8p6qOb/_old 2006-12-12 02:28:49.000000000 +0100 +++ /var/tmp/diff_new_pack.8p6qOb/_new 2006-12-12 02:28:49.000000000 +0100 @@ -20,7 +20,7 @@ %endif Summary: Smart Package Manager Version: 0.49.1 -Release: 1 +Release: 2 Source: smart-0.50rc1.tar.bz2 Source1: distro.py Source2: %{name}.desktop @@ -191,6 +191,8 @@ /opt/kde3/share/apps/konqueror %changelog -n smart +* Mon Dec 11 2006 - cthiel(a)suse.de +- updated smart-trunk.patch to r839 * Mon Dec 04 2006 - cthiel(a)suse.de - updated smart-channel-mirrors.patch * Sun Dec 03 2006 - cthiel(a)suse.de ++++++ smart-trunk.patch ++++++ ++++ 635 lines (skipped) ++++ between smart/smart-trunk.patch ++++ and /mounts/work_src_done/STABLE/smart/smart-trunk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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