July 2008 - openSUSE Commits - openSUSE Mailing Lists

commit aaa_base
by root＠Hilbert.suse.de 27 Jul '08

27 Jul '08

Hello community, here is the log from the commit of package aaa_base checked in at Sun Jul 27 11:33:08 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-07-24 17:17:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2008-07-25 17:56:09.848476000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 25 17:55:07 CEST 2008 - werner(a)suse.de + +- Make login procedure of bash and tcsh more equal (bnc#401470) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.x10212/_old 2008-07-27 11:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.x10212/_new 2008-07-27 11:31:53.000000000 +0200 @@ -21,7 +21,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.0.42 -Release: 10 +Release: 12 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -143,6 +143,8 @@ %defattr(-,root,root) %changelog +* Fri Jul 25 2008 werner(a)suse.de +- Make login procedure of bash and tcsh more equal (bnc#401470) * Tue Jul 22 2008 werner(a)suse.de - Restore the broken arch_special tar ball (bnc#410237) - Remove boot.getclock as insserv now can handle this ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.login new/aaa_base/etc/csh.login --- old/aaa_base/etc/csh.login 2008-05-05 15:20:30.000000000 +0200 +++ new/aaa_base/etc/csh.login 2008-07-25 16:57:18.000000000 +0200 @@ -101,7 +101,7 @@ set _upath=( /usr/local/bin /usr/bin /bin ) if ( "$HOME" != "/" ) then foreach _d (${HOME}/bin/${CPU} ${HOME}/bin) - if ( -d $_d ) set _hpath=( $_hpath $_d ) + if ( -d $_d ) set _hpath=( $_d $_hpath ) end endif if ( "$uid" == "0" ) then @@ -299,8 +299,8 @@ # if (${?TERM} && -o /dev/$tty && ${?prompt}) then if (${TERM} == "xterm") then - if ( -f /etc/motd ) cat /etc/motd if (! ${?SSH_TTY} ) then + if ( -f /etc/motd ) cat /etc/motd # Go home cd; echo "Directory: $cwd" endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2008-05-05 15:23:40.000000000 +0200 +++ new/aaa_base/etc/profile 2008-07-25 17:25:15.000000000 +0200 @@ -380,6 +380,27 @@ PATH=/usr/lib/restricted/bin export PATH fi + +# +# An X session +# +case "$-" in +*i*) + if test $TERM = "xterm" -a -O "$tty" ; then + if test -z ${SSH_TTY} ; then + test ! -f $HOME/.hushlogin -a /etc/motd && cat /etc/motd + # Go home + cd; echo "Directory: $PWD" + # Last but not least + date + fi + # + # shadow passwd + # Note: on normal console this will be done by /bin/login + type faillog > /dev/null 2>&1 && test -r /var/log/faillog && faillog + fi +esac + # # End of /etc/profile # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xine-lib
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package xine-lib checked in at Fri Jul 25 17:37:40 CEST 2008. -------- --- xine-lib/xine-lib.changes 2008-06-19 11:15:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/xine-lib/xine-lib.changes 2008-07-25 14:57:19.000000000 +0200 @@ -1,0 +2,43 @@ +Fri Jul 25 14:55:37 CEST 2008 - lnussel(a)suse.de + +- Update to 1.1.14: + + * DVB changes: + - Reacquire PIDs whenever a PMT is parsed. (Some channels' PIDs are + changed on a regular basis.) + - Recognise more stream formats (as defined in the broadcast PMT). + - Allow automatic detection of more DVB tuning parameters. + - Allow the GUI to be disabled. + - Allow configuration of the location of channels.conf. + * V4L: allow TV standard selection. + * Allow input plugins to report MIME type information. + This is used for demuxer plugin selection immediately before testing the + filename extension (so it won't work when demuxer selection is done by + stream content only). [Bug #120] + * Allow input plugins to ask for a specific demuxer, overriding the normal + demuxer selection methods. (Most won't need this.) + * The Xv and XxMC video output plugins now support Xv port selection via + two methods: port number and port type (currently "any", "overlay" and + "textured video"). Port number takes precedence; the plugins will fall + back on another port of the same type (if a type was specified) then on + whatever they can find. + XvMC does not support port selection at present. + (Backported from the 1.2 branch.) + * Fix MPEG TS audio stream problems introduced in 1.1.13. + * Add basic aspect ratio detection for Windows Media Video streams. + +- Update to 1.1.13: + * Security fixes: + - Buffer overflow in the NSF demuxer which may allow remote attackers to + cause a denial of service (crash) or possibly execute arbitrary code + via an NSF file with a long title or copyright message. (CVE-2008-1878) + - For extra safety against possible Integer overflows like the ones found + in CVE-2008-1482, backport more calloc usage from 1.2 branch. + * Improved JACK output plugin. + * Added MIME types and .mpp for musepack. + * Fixed display of some MJPEG streams (YUVJ420P). + * Deprecate xine_xmalloc() function, see src/xine-utils/utils.c for more + information about the reason. + * Provide a useful implementation of xine_register_log_cb(). + +------------------------------------------------------------------- Old: ---- xine-lib-1.1.12-crippled.tar.bz2 xine-lib-1.1.12.tar.bz2 xine-lib-CVE-2008-1878.diff New: ---- xine-lib-1.1.14-asprintf-typo.diff xine-lib-1.1.14-crippled.tar.bz2 xine-lib-1.1.14-ia64-is-not-alpha.diff xine-lib-1.1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.kx2011/_old 2008-07-25 17:35:48.000000000 +0200 +++ /var/tmp/diff_new_pack.kx2011/_new 2008-07-25 17:35:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.12) +# spec file for package xine-lib (Version 1.1.14) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -33,9 +33,9 @@ BuildRequires: mad-devel %endif Recommends: opensuse-codecs-installer -Version: 1.1.12 -Release: 11 -%define abiversion 1.21 +Version: 1.1.14 +Release: 1 +%define abiversion 1.23 Summary: Video Player with Plug-Ins Group: Productivity/Multimedia/Video/Players License: GPL v2 or later; Public Domain, Freeware @@ -52,7 +52,8 @@ Source99: precheckin_cripple_tarball.sh # *** xine-lib: Bugfixes Patch26: xine-lib-doc-fix-X11R6.diff -Patch28: xine-lib-CVE-2008-1878.diff +Patch27: xine-lib-1.1.14-asprintf-typo.diff +Patch28: xine-lib-1.1.14-ia64-is-not-alpha.diff # *** Addons Patch50: vdr-xine-0.8.2.diff.bz2 Patch51: vdr-xine-SUSE.diff @@ -171,20 +172,21 @@ fi cd xine-lib-%version %patch26 +%patch27 -p1 +%patch28 -p1 %patch50 -p1 %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am %patch61 -p0 #sed -i 's|^ac_config_files="|ac_config_files="src/vdr/Makefile src/mjpeg/Makefile|' configure %patch70 -%patch71 +%patch71 -p1 # Only apply to uncrippled source %if %BUILD_XINE > 0 %patch80 %endif %patch72 -p1 %patch73 -p1 -%patch28 -p1 %patch74 -p1 rm -f m4/libtool15.m4 @@ -450,6 +452,44 @@ %endif %changelog +* Fri Jul 25 2008 lnussel(a)suse.de +- Update to 1.1.14: + * DVB changes: + - Reacquire PIDs whenever a PMT is parsed. (Some channels' PIDs are + changed on a regular basis.) + - Recognise more stream formats (as defined in the broadcast PMT). + - Allow automatic detection of more DVB tuning parameters. + - Allow the GUI to be disabled. + - Allow configuration of the location of channels.conf. + * V4L: allow TV standard selection. + * Allow input plugins to report MIME type information. + This is used for demuxer plugin selection immediately before testing the + filename extension (so it won't work when demuxer selection is done by + stream content only). [Bug #120] + * Allow input plugins to ask for a specific demuxer, overriding the normal + demuxer selection methods. (Most won't need this.) + * The Xv and XxMC video output plugins now support Xv port selection via + two methods: port number and port type (currently "any", "overlay" and + "textured video"). Port number takes precedence; the plugins will fall + back on another port of the same type (if a type was specified) then on + whatever they can find. + XvMC does not support port selection at present. + (Backported from the 1.2 branch.) + * Fix MPEG TS audio stream problems introduced in 1.1.13. + * Add basic aspect ratio detection for Windows Media Video streams. +- Update to 1.1.13: + * Security fixes: + - Buffer overflow in the NSF demuxer which may allow remote attackers to + cause a denial of service (crash) or possibly execute arbitrary code + via an NSF file with a long title or copyright message. (CVE-2008-1878) + - For extra safety against possible Integer overflows like the ones found + in CVE-2008-1482, backport more calloc usage from 1.2 branch. + * Improved JACK output plugin. + * Added MIME types and .mpp for musepack. + * Fixed display of some MJPEG streams (YUVJ420P). + * Deprecate xine_xmalloc() function, see src/xine-utils/utils.c for more + information about the reason. + * Provide a useful implementation of xine_register_log_cb(). * Thu Jun 19 2008 schwab(a)suse.de - Remove local libtool macros and run autoreconf. * Wed May 14 2008 mhopf(a)suse.de ++++++ xine-lib-1.1.14-asprintf-typo.diff ++++++ >From e92cdef028f622efab711ce6b00cbeb1ded3df3c Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Fri, 25 Jul 2008 16:46:23 +0200 Subject: [PATCH] asprintf typo --- src/input/input_smb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/input/input_smb.c b/src/input/input_smb.c index dbab772..266cdc3 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -280,7 +280,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen, dir_files[num_dir_files].link = NULL; dir_files[num_dir_files].type = mrl_file | mrl_file_directory; dir_files[num_dir_files].origin = strdup("smb:/"); - asprintf(*(dir_files[num_dir_files].mrl), "%s/%s", "smb:/", pdirent->name); + asprintf(&(dir_files[num_dir_files].mrl), "%s/%s", "smb:/", pdirent->name); dir_files[num_dir_files].size = pdirent->dirlen; num_dir_files ++; } else if (pdirent->smbc_type == SMBC_FILE_SHARE){ -- 1.5.6 ++++++ xine-lib-1.1.12-crippled.tar.bz2 -> xine-lib-1.1.14-crippled.tar.bz2 ++++++ ++++ 143969 lines of diff (skipped) ++++++ xine-lib-1.1.14-ia64-is-not-alpha.diff ++++++ >From c781f4b2e726fa3fabf8cc0cdd592f617ae799e2 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Fri, 25 Jul 2008 16:58:56 +0200 Subject: [PATCH] ia64 is not alpha --- configure.ac | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index af881fc..93b2a95 100644 --- a/configure.ac +++ b/configure.ac @@ -2332,10 +2332,13 @@ case "$host_or_hostalias" in mips-*) AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) ;; - alphaev56-* | alpha* | ia64-* | hppa*-linux-*) + alphaev56-* | alpha* | hppa*-linux-*) AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) AC_DEFINE_UNQUOTED(ARCH_ALPHA,,[Define this if you're running Alpha architecture]) ;; + ia64-*) + AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) + ;; armv4l-*-linux*) AC_DEFINE_UNQUOTED(FPM_ARM,,[Define to select libmad fixed point arithmetic implementation]) AC_DEFINE_UNQUOTED(ARCH_ARM,,[Define this if you're running ARM architecture]) -- 1.5.6 ++++++ xine-lib-1.1.12-crippled.tar.bz2 -> xine-lib-1.1.14.tar.bz2 ++++++ xine-lib/xine-lib-1.1.12-crippled.tar.bz2 /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.14.tar.bz2 differ: byte 11, line 1 ++++++ xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff ++++++ --- /var/tmp/diff_new_pack.kx2011/_old 2008-07-25 17:35:57.000000000 +0200 +++ /var/tmp/diff_new_pack.kx2011/_new 2008-07-25 17:35:57.000000000 +0200 @@ -1,11 +1,21 @@ -Index: src/xine-engine/load_plugins.c +From 8861e0d755127fde4b57d32561491853e49a0edc Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel <lnussel(a)suse.de> +Date: Fri, 25 Jul 2008 15:07:23 +0200 +Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff + =================================================================== ---- src/xine-engine/load_plugins.c.orig -+++ src/xine-engine/load_plugins.c -@@ -2431,9 +2431,19 @@ char *xine_get_file_extensions (xine_t * - plugin_node_t *node; - char *str; - int list_id, list_size; +--- + src/xine-engine/load_plugins.c | 17 ++++++++++++++++- + 1 files changed, 16 insertions(+), 1 deletions(-) + +diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c +index a710927..e507c07 100644 +--- a/src/xine-engine/load_plugins.c ++++ b/src/xine-engine/load_plugins.c +@@ -2481,9 +2481,18 @@ char *xine_get_file_extensions (xine_t *self) { + + plugin_catalog_t *catalog = self->plugin_catalog; + int list_id; + int havempgdecoder = 0; + const char * const * p; @@ -18,27 +28,24 @@ + break; + } + } -+ - /* calc length of output */ - - len = 0; -@@ -2447,7 +2457,8 @@ char *xine_get_file_extensions (xine_t * - - cls = (demux_class_t *)node->plugin_class; - -- if((exts = cls->get_extensions(cls)) && *exts) -+ if((exts = cls->get_extensions(cls)) && *exts && -+ (havempgdecoder || !strstr (exts, "mp3"))) - len += strlen(exts) + 1; + /* calc length of output string and create an array of strings to + concatenate */ + size_t len = 0; +@@ -2495,7 +2504,13 @@ char *xine_get_file_extensions (xine_t *self) { + if (node->plugin_class || _load_plugin_class(self, node, NULL)) { + demux_class_t *const cls = (demux_class_t *)node->plugin_class; + if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) +- len += strlen(extensions[list_id]) +1; ++ { ++ if(havempgdecoder || !strstr(extensions[list_id], "mp3")) { ++ len += strlen(extensions[list_id]) +1; ++ } else { ++ extensions[list_id] = NULL; ++ } ++ } } } -@@ -2467,7 +2478,8 @@ char *xine_get_file_extensions (xine_t * - - cls = (demux_class_t *)node->plugin_class; -- if((e = cls->get_extensions (cls)) && *e) { -+ if((e = cls->get_extensions (cls)) && *e && -+ (havempgdecoder || !strstr (e, "mp3"))) { - l = strlen(e); - memcpy (&str[pos], e, l); - +-- +1.5.6 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pacemaker
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package pacemaker checked in at Fri Jul 25 17:34:48 CEST 2008. -------- --- pacemaker/pacemaker.changes 2008-05-03 07:51:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/pacemaker/pacemaker.changes 2008-07-25 16:50:16.000000000 +0200 @@ -1,0 +2,35 @@ +Mon Jul 21 16:26:00 CEST 2008 - abeekhof(a)suse.de + + - Update source tarball to revision: 7a31d0c33e22 (0.7.0) + + High: Performance enhancements + + High: Fix memory leaks and use-after-free + + High: Admin: All tools now use --node (-N) for specifying node unames + + High: Admin: All tools now use --xml-file (-x) and --xml-text (-X) for specifying where to find XML blobs + + High: cib: Implement CIB_shadow - a facility for making and testing changes before uploading them to the cluster + + High: cib: Make registering per-op callbacks an API call and renamed (for clarity) the API call for requesting notifications + + High: Core: Add a facility for automatically upgrading old configurations + + High: Core: Adopt libxml2 as the XML processing library - all external clients need to be recompiled + + High: PE: Bug LF:1459 - Allow failures to expire + + High: PE: Replace failure-stickiness with a simple 'migration-threshold' + + High: PE: Bug LF:1941 - Handle failed clone instance probes when clone-max < #nodes + + High: PE: Make OCF_ERR_ARGS a node-level error rather than a cluster-level one + + High: PE: Properly handle clones that are not installed on all nodes + + Medium: Admin: Bug LF:1438 - Allow the list of all/active resource operations to be queried by crm_resource + + Medium: Admin: Bug LF:1708 - crm_resource should print a warning if an attribute is already set as a meta attribute + + Medium: Admin: Bug LF:1883 - crm_mon should display fail-count and operation history + + Medium: Admin: Bug N:371785 - crm_resource -C doesn't also clean up fail-count attributes + + Medium: Admin: crm_mon - include timing data for failed actions + + Medium: cib: Bug LF:1348 - Allow rules and attribute sets to be referenced for use in other objects + + Medium: cib: BUG LF:1918 - By default, all cib calls now timeout after 30s + + Medium: cib: Remove some useless parts of the API + + Medium: cib: Implement the ability for clients to connect to remote servers + + Medium: Core: Add support for validating xml against RelaxNG schemas + + Medium: PE: Bug LF:1328 - Don't fencing nodes in clusters without managed resources + + Medium: PE: Bug LF:1461 - Give transient node attributes (in <status/>) preference over persistent ones (in <nodes/>) + + Medium: PE: Bug LF:1884, Bug LF:1885 - Implement N:M ordering and colocation constraints + + Medium: PE: Bug LF:1886 - Create a resource and operation 'defaults' config section + + Medium: PE: Bug LF:1892 - Allow recurring actions to be triggered at known times + + Medium: PE: Bug LF:1926 - Probes should complete before stop actions are invoked + + Medium: PE: Prefer the current location if it is one of a group of nodes with the same (highest) score + +------------------------------------------------------------------- @@ -2,0 +38 @@ + @@ -6,0 +43 @@ + @@ -14,0 +52 @@ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.b31065/_old 2008-07-25 17:34:31.000000000 +0200 +++ /var/tmp/diff_new_pack.b31065/_new 2008-07-25 17:34:31.000000000 +0200 @@ -25,7 +25,7 @@ Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager Version: 0.6.3 -Release: 4 +Release: 25 License: GPL v2 or later; LGPL v2.1 or later Url: http://www.clusterlabs.org %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} @@ -57,7 +57,7 @@ Conflicts: pacemaker Conflicts: pacemaker-ais %endif -BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel heartbeat-core heartbeat-core-devel libxml2-devel pam-devel python-devel swig +BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel heartbeat-core heartbeat-core-devel libxml2-devel libxslt-devel pam-devel python-devel swig %if 0%{?suse_version} %if 0%{?suse_version} > 1000 %if %with_ais_support @@ -247,6 +247,7 @@ %{_libdir}/libpe_rules.so.* %{_libdir}/libpengine.so.* %{_libdir}/libtransitioner.so.* +%{_libdir}/libstonithd.so.* %{_sbindir}/cibadmin %{_sbindir}/crm_attribute %{_sbindir}/crm_diff @@ -263,6 +264,8 @@ %{_sbindir}/ccm_tool %{_sbindir}/attrd_updater %{_sbindir}/ptest +%{_sbindir}/cib_shadow +%{_sbindir}/cibpipe %doc %{_mandir}/man8/cibadmin.8* %doc %{_mandir}/man8/crm_resource.8* %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm @@ -279,9 +282,42 @@ %defattr(-,root,root) #%doc %{_datadir}/doc/%{name}-%{version} %{_includedir}/pacemaker +%{_includedir}/heartbeat/fencing %{_libdir}/*.so %changelog +* Mon Jul 21 2008 abeekhof(a)suse.de +- Update source tarball to revision: 7a31d0c33e22 (0.7.0) + + High: Performance enhancements + + High: Fix memory leaks and use-after-free + + High: Admin: All tools now use --node (-N) for specifying node unames + + High: Admin: All tools now use --xml-file (-x) and --xml-text (-X) for specifying where to find XML blobs + + High: cib: Implement CIB_shadow - a facility for making and testing changes before uploading them to the cluster + + High: cib: Make registering per-op callbacks an API call and renamed (for clarity) the API call for requesting notifications + + High: Core: Add a facility for automatically upgrading old configurations + + High: Core: Adopt libxml2 as the XML processing library - all external clients need to be recompiled + + High: PE: Bug LF:1459 - Allow failures to expire + + High: PE: Replace failure-stickiness with a simple 'migration-threshold' + + High: PE: Bug LF:1941 - Handle failed clone instance probes when clone-max < #nodes + + High: PE: Make OCF_ERR_ARGS a node-level error rather than a cluster-level one + + High: PE: Properly handle clones that are not installed on all nodes + + Medium: Admin: Bug LF:1438 - Allow the list of all/active resource operations to be queried by crm_resource + + Medium: Admin: Bug LF:1708 - crm_resource should print a warning if an attribute is already set as a meta attribute + + Medium: Admin: Bug LF:1883 - crm_mon should display fail-count and operation history + + Medium: Admin: Bug N:371785 - crm_resource -C doesn't also clean up fail-count attributes + + Medium: Admin: crm_mon - include timing data for failed actions + + Medium: cib: Bug LF:1348 - Allow rules and attribute sets to be referenced for use in other objects + + Medium: cib: BUG LF:1918 - By default, all cib calls now timeout after 30s + + Medium: cib: Remove some useless parts of the API + + Medium: cib: Implement the ability for clients to connect to remote servers + + Medium: Core: Add support for validating xml against RelaxNG schemas + + Medium: PE: Bug LF:1328 - Don't fencing nodes in clusters without managed resources + + Medium: PE: Bug LF:1461 - Give transient node attributes (in <status/>) preference over persistent ones (in <nodes/>) + + Medium: PE: Bug LF:1884, Bug LF:1885 - Implement N:M ordering and colocation constraints + + Medium: PE: Bug LF:1886 - Create a resource and operation 'defaults' config section + + Medium: PE: Bug LF:1892 - Allow recurring actions to be triggered at known times + + Medium: PE: Bug LF:1926 - Probes should complete before stop actions are invoked + + Medium: PE: Prefer the current location if it is one of a group of nodes with the same (highest) score * Sat May 03 2008 abeekhof(a)suse.de - Use a libexecdir consistent with openais * Tue Apr 29 2008 abeekhof(a)suse.de ++++++ pacemaker.tar.gz ++++++ ++++ 146808 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 FreeNX
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package FreeNX checked in at Fri Jul 25 17:11:00 CEST 2008. -------- --- FreeNX/FreeNX.changes 2008-03-17 23:34:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/FreeNX/FreeNX.changes 2008-07-21 18:27:21.931303000 +0200 @@ -1,0 +2,29 @@ +Mon Jul 21 18:26:34 CEST 2008 - sndirsch(a)suse.de + +- nxloadconfig: NX_VERSION no longer needs to be set back to + 1.5.0-70, (upstream of 2.1.0-71 is safe now) + +------------------------------------------------------------------- +Mon Jul 21 17:41:53 CEST 2008 - sndirsch(a)suse.de + +- enabled nxserver.diff again (bnc #401366) + +------------------------------------------------------------------- +Mon Jul 21 11:00:45 CEST 2008 - sndirsch(a)suse.de + +- NX-3.2.0.diff + * adjusted FreeNX to changes in NX 3.2.0 +- disabled nxserver.diff for now (bnc #401366) + +------------------------------------------------------------------- +Mon Jun 30 14:40:53 CEST 2008 - sndirsch(a)suse.de + +- nxserver.diff + "This line does the pstree, pipe it to perl, which in turn find + the lines that have this and only this on it 'sshd(number)', + and kills the processes with that number. The stubborn process + gets to live after the first suspend, which is not so good, but + it gets killed before the next resume is done, so it is good + enough for that resume to succeed." (bnc #401366) + +------------------------------------------------------------------- New: ---- NX-3.2.0.diff nxserver.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeNX.spec ++++++ --- /var/tmp/diff_new_pack.k30762/_old 2008-07-25 17:07:31.000000000 +0200 +++ /var/tmp/diff_new_pack.k30762/_new 2008-07-25 17:07:31.000000000 +0200 @@ -21,7 +21,7 @@ Url: http://freenx.berlios.de/ Group: System/X11/Servers/XF86_4 Version: 0.7.2 -Release: 1 +Release: 27 Requires: NX openssh expect netcat Summary: FreeNX Application and Thin Client Server Source: freenx-server-%{version}.tar.gz @@ -41,6 +41,8 @@ Patch1: xorg7.diff Patch2: xcb-unix.diff Patch3: freenx-server-0.7.2-cups.diff +Patch4: nxserver.diff +Patch5: NX-3.2.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,6 +72,8 @@ if [ "%{_lib}" == "lib64" ]; then %patch3 -p1 fi +%patch4 +%patch5 %build make @@ -92,6 +96,23 @@ /usr/lib/NX/lib/libnxredir.so.0 %changelog +* Mon Jul 21 2008 sndirsch(a)suse.de +- nxloadconfig: NX_VERSION no longer needs to be set back to + 1.5.0-70, (upstream of 2.1.0-71 is safe now) +* Mon Jul 21 2008 sndirsch(a)suse.de +- enabled nxserver.diff again (bnc #401366) +* Mon Jul 21 2008 sndirsch(a)suse.de +- NX-3.2.0.diff + * adjusted FreeNX to changes in NX 3.2.0 +- disabled nxserver.diff for now (bnc #401366) +* Mon Jun 30 2008 sndirsch(a)suse.de +- nxserver.diff + "This line does the pstree, pipe it to perl, which in turn find + the lines that have this and only this on it 'sshd(number)', + and kills the processes with that number. The stubborn process + gets to live after the first suspend, which is not so good, but + it gets killed before the next resume is done, so it is good + enough for that resume to succeed." (bnc #401366) * Tue Mar 18 2008 sndirsch(a)suse.de - updated to release 0.7.2 * see ANNOUNCE-0.7.2 for more details @@ -205,7 +226,7 @@ - updated to FreeNX 0.4.3 - freenx-enable_backend.diff: * enables fake cookie authentication, when a 1.5.0 client connects -* Tue Jul 26 2005 sndirsch(a)suse.de +* Wed Jul 27 2005 sndirsch(a)suse.de - added announcement for 0.4.2 to docs * Mon Jul 25 2005 sndirsch(a)suse.de - updated to FreeNX 0.4.2 @@ -228,7 +249,7 @@ -use norootforbuild * Wed May 11 2005 sndirsch(a)suse.de - added announcement for 0.4.0 to docs -* Thu May 05 2005 sndirsch(a)suse.de +* Fri May 06 2005 sndirsch(a)suse.de - updated to release 0.4.0: * obsoletes freenx-0.3.1.diff * Thu Apr 28 2005 sndirsch(a)suse.de @@ -281,7 +302,7 @@ - README.SuSE: * added KNOWN ISSUES section (suspend/resume problem with knx, Bug #48753) -* Mon Nov 29 2004 sndirsch(a)suse.de +* Tue Nov 30 2004 sndirsch(a)suse.de - freenx-0.2.7.diff: * use absolute path for nxnode-login * Mon Nov 22 2004 sndirsch(a)suse.de @@ -323,7 +344,7 @@ * Added patch by Rick Stout for a typo in nxkeygen. * Updated gentoo-nomachine.diff. * Updated CONTRIB to include a description of lazy-image encoding. -* Sun Sep 12 2004 sndirsch(a)suse.de +* Mon Sep 13 2004 sndirsch(a)suse.de - updated to release 0.2.4 * Added timeout to avoid having hanging tail processes. * Added "locking" of the display-offset if nxagent failed to @@ -397,7 +418,7 @@ - added nxclient to filelist - removed dummy manual page for nxserver - added some docs (AUTHORS, COPYING, ChangeLog, INSTALL) -* Mon Sep 06 2004 sndirsch(a)suse.de +* Tue Sep 07 2004 sndirsch(a)suse.de - nxuseradd.diff: * fixed creating of nx user * Mon Sep 06 2004 sndirsch(a)suse.de ++++++ freenx-server-0.7.2.diff ++++++ --- /var/tmp/diff_new_pack.k30762/_old 2008-07-25 17:07:32.000000000 +0200 +++ /var/tmp/diff_new_pack.k30762/_new 2008-07-25 17:07:32.000000000 +0200 @@ -53,7 +53,7 @@ ######################################################################### -NX_VERSION=2.1.0-72 -+NX_VERSION=1.5.0-70 ++NX_VERSION=2.1.0-72 NX_LICENSE="OS (GPL, using backend: %BACKEND%)" # Where can different nx components be found ++++++ NX-3.2.0.diff ++++++ diff -u -r ../freenx-server-0.7.2.orig//nxloadconfig ./nxloadconfig --- ../freenx-server-0.7.2.orig//nxloadconfig 2008-07-21 08:32:37.000000000 +0000 +++ ./nxloadconfig 2008-07-21 08:55:38.000000000 +0000 @@ -276,8 +276,8 @@ { ! mywhich "$COMMAND_XAUTH" && which xauth; } >/dev/null 2>&1 && COMMAND_XAUTH=$(which xauth) { ! mywhich "$COMMAND_NETCAT" && which nc; } >/dev/null 2>&1 && COMMAND_NETCAT=$(which nc) { ! mywhich "$COMMAND_FOOMATIC" && which foomatic-ppdfile; } >/dev/null 2>&1 && COMMAND_FOOMATIC=$(which foomatic-ppdfile) - { ! mywhich "$PATH_BIN/nxdesktop"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXDESKTOP="1" - { ! mywhich "$PATH_BIN/nxviewer"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXVIEWER="1" + { ! mywhich "$PATH_BIN/rdesktop"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXDESKTOP="1" + { ! mywhich "$PATH_BIN/vncviewer"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXVIEWER="1" { ! mywhich "$COMMAND_VNCPASSWD" && which vncpasswd; } >/dev/null 2>&1 && COMMAND_VNCPASSWD=$(which vncpasswd) fi @@ -307,7 +307,7 @@ [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB -[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6:$APPLICATION_LIBRARY_PATH/libXext.so.6:$APPLICATION_LIBRARY_PATH/libXcomp.so.2:$APPLICATION_LIBRARY_PATH/libXcompext.so.2:$APPLICATION_LIBRARY_PATH/libXrender.so.1" +[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6:$APPLICATION_LIBRARY_PATH/libXext.so.6:$APPLICATION_LIBRARY_PATH/libXcomp.so.3:$APPLICATION_LIBRARY_PATH/libXcompext.so.3:$APPLICATION_LIBRARY_PATH/libXrender.so.1" NX_BACKEND_VERSION=$(strings /usr/lib/NX/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') @@ -354,8 +354,8 @@ [ ! mywhich "$COMMAND_RDESKTOP" >/dev/null 2>&1 ] && \ WARNING="yes" && echo "Warning: Could not find COMMAND_RDESKTOP=$COMMAND_RDESKTOP. RDP sessions won't work." else - [ ! -x "$PATH_BIN/nxdesktop" ] && \ - WARNING="yes" && echo "Warning: Could not find nxdesktop in $PATH_BIN. RDP sessions won't work." + [ ! -x "$PATH_BIN/rdesktop" ] && \ + WARNING="yes" && echo "Warning: Could not find rdesktop in $PATH_BIN. RDP sessions won't work." fi if [ "ENABLE_EXTERNAL_NXVIEWER" = "1" ] @@ -365,8 +365,8 @@ [ ! mywhich "$COMMAND_VNCPASSWD" >/dev/null 2>&1 ] && \ WARNING="yes" && echo "Warning: Could not find COMMAND_VNCPASSWD=$COMMAND_VNCPASSWD. VNC sessions won't work." else - [ ! -x "$PATH_BIN/nxviewer" ] && \ - WARNING="yes" && echo "Warning: Could not find nxviewer in $PATH_BIN. VNC sessions won't work." + [ ! -x "$PATH_BIN/vncviewer" ] && \ + WARNING="yes" && echo "Warning: Could not find vncviewer in $PATH_BIN. VNC sessions won't work." fi [ ! mywhich "$COMMAND_X11VNC" >/dev/null 2>&1 ] && \ @@ -598,8 +598,8 @@ [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \ ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\"" - [ -z "$(strings /usr/lib/NX/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && \ - ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[01].0 backend is needed for this version of FreeNX." + [ -z "$(strings /usr/lib/NX/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ + ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX." [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\"" diff -u -r ../freenx-server-0.7.2.orig//nxnode ./nxnode --- ../freenx-server-0.7.2.orig//nxnode 2008-07-21 08:32:37.000000000 +0000 +++ ./nxnode 2008-07-21 08:46:59.000000000 +0000 @@ -476,7 +476,7 @@ # Start the agent - echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 & + echo "$agent_password" | $PATH_BIN/rdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 & elif [ "$type" = "vnc" ] then @@ -508,7 +508,7 @@ # Start the agent - $PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd" -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 & + $PATH_BIN/vncviewer -encodings tight hextile copyrect raw -passwd "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd" -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 & elif [ "$R" = "-R" -a "$rootless" != "1" ] then ++++++ nxserver.diff ++++++ --- nxserver.orig 2008-06-30 14:38:54.688777713 +0200 +++ nxserver 2008-06-30 14:40:00.960036194 +0200 @@ -1,5 +1,8 @@ #!/bin/bash +# Novell Bug #401366 +pstree -p nx| perl -e '@lines=<STDIN>; foreach $line (@lines){if ($line=~/^sshd$(\d+)$$/) { kill 9, $1;}}' + # Free implementation of nxserver components # # To use nxserver add the user "nx" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 linuxrc
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package linuxrc checked in at Fri Jul 25 17:08:50 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-07-24 15:52:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-07-25 16:52:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 25 16:52:52 CEST 2008 - snwint(a)suse.de + +- support .init/.done scripts in extensions +- show motd when starting a shell + +------------------------------------------------------------------- Old: ---- linuxrc-3.2.2.tar.bz2 New: ---- linuxrc-3.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.n31269/_old 2008-07-25 17:07:39.000000000 +0200 +++ /var/tmp/diff_new_pack.n31269/_new 2008-07-25 17:07:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.2.2) +# spec file for package linuxrc (Version 3.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.2.2 +Version: 3.2.3 Release: 1 -Source: linuxrc-3.2.2.tar.bz2 +Source: linuxrc-3.2.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +54,9 @@ %doc linuxrc.html %changelog +* Fri Jul 25 2008 snwint(a)suse.de +- support .init/.done scripts in extensions +- show motd when starting a shell * Thu Jul 24 2008 snwint(a)suse.de - 'extend' can now add and remove inst-sys parts - added 'sax2' option: use sax2 for inst-sys X11 config ++++++ linuxrc-3.2.2.tar.bz2 -> linuxrc-3.2.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.2.2/auto2.c new/linuxrc-3.2.3/auto2.c --- old/linuxrc-3.2.2/auto2.c 2008-07-23 16:06:17.000000000 +0200 +++ new/linuxrc-3.2.3/auto2.c 2008-07-25 12:27:10.000000000 +0200 @@ -1050,7 +1050,7 @@ { int err = 0; char *argv[3] = { }; - char *s; + char *s, *cmd = NULL; slist_t *sl; fprintf(stderr, "instsys add extension: %s\n", extension); @@ -1107,6 +1107,11 @@ argv[1] = sl->value; argv[2] = "/"; util_lndir_main(3, argv); + if(util_check_exist2(sl->value, ".init") == 'r') { + strprintf(&cmd, "%s/.init %s", sl->value, sl->value); + system(cmd); + str_copy(&cmd, NULL); + } } } } @@ -1118,7 +1123,7 @@ int auto2_remove_extension(char *extension) { int err = 0; - char *s, *prefix, *path = NULL, *lbuf = NULL; + char *s, *prefix, *path = NULL, *lbuf = NULL, *cmd = NULL; size_t lbuf_size = 0; FILE *f, *w; slist_t *sl0 = NULL, *sl; @@ -1141,6 +1146,11 @@ if(slist_getentry(config.url.instsys_list, sl0->key)) { prefix = "# "; for(sl = sl0->next; sl; sl = sl->next) { + if(util_check_exist2(sl->key, ".done") == 'r') { + strprintf(&cmd, "%s/.done %s", sl->key, sl->key); + system(cmd); + str_copy(&cmd, NULL); + } util_umount(sl->key); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.2.2/Changelog new/linuxrc-3.2.3/Changelog --- old/linuxrc-3.2.2/Changelog 2008-07-24 15:51:48.000000000 +0200 +++ new/linuxrc-3.2.3/Changelog 2008-07-25 14:48:15.000000000 +0200 @@ -1,3 +1,7 @@ +25/7/2008: v3.2.3 + - support .init/.done scripts in extensions + - show motd when starting a shell + 23/7/2008: v3.2.2 - 'extend' can now add and remove inst-sys parts - added 'sax2' option: use sax2 for inst-sys X11 config diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.2.2/util.c new/linuxrc-3.2.3/util.c --- old/linuxrc-3.2.2/util.c 2008-07-24 10:15:39.000000000 +0200 +++ new/linuxrc-3.2.3/util.c 2008-07-25 14:42:13.000000000 +0200 @@ -1876,7 +1876,8 @@ */ void util_start_shell(char *tty, char *shell, int flags) { - int fd; + int fd, i; + FILE *f; char *s, *args[] = { NULL, NULL, NULL }; char *env[] = { NULL, /* TERM */ @@ -1909,6 +1910,11 @@ fflush(stdout); } + if((f = fopen("/etc/motd", "r"))) { + while((i = fgetc(f)) != EOF) putchar(i); + fclose(f); + } + execve(shell, args, (flags & 1) ? env : environ); fprintf(stderr, "Couldn't start shell (errno = %d)\n", errno); exit(-1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.2.2/VERSION new/linuxrc-3.2.3/VERSION --- old/linuxrc-3.2.2/VERSION 2008-07-23 12:09:32.000000000 +0200 +++ new/linuxrc-3.2.3/VERSION 2008-07-25 12:27:59.000000000 +0200 @@ -1 +1 @@ -3.2.2 +3.2.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Fri Jul 25 17:07:21 CEST 2008. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-07-23 18:16:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-07-25 15:47:45.899580561 +0200 @@ -1,0 +2,10 @@ +Fri Jul 25 15:46:53 CEST 2008 - sndirsch(a)suse.de + +- xf86-video-nv.diff + * Move hardware cursor initialization to after AcquireDisplay. + The original order works fine when the server starts, but on + the second server generation the server tries to call + G80CrtcHideCursor before the display engine has been + initialized, causing a hang. + +------------------------------------------------------------------- New: ---- xf86-video-nv.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.w27023/_old 2008-07-25 17:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.w27023/_new 2008-07-25 17:06:22.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 155 +Release: 156 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -72,7 +72,7 @@ Source100: sax2-hwinfo-data.tar.gz Patch: xf86-video-intel.diff Patch3: ps_nv.diff -#Patch4: xf86-video-nv.diff +Patch4: xf86-video-nv.diff Patch10: xf86-video-tdfx.diff Patch12: xf86-video-mga-hal.diff Patch14: xf86-video-rendition.diff @@ -136,7 +136,7 @@ popd pushd xf86-video-nv-* %patch3 -p0 -#%patch4 -p1 +%patch4 -p1 popd pushd xf86-video-mga-1.4.9/src tar xzf %{SOURCE44} @@ -265,6 +265,13 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Fri Jul 25 2008 sndirsch(a)suse.de +- xf86-video-nv.diff + * Move hardware cursor initialization to after AcquireDisplay. + The original order works fine when the server starts, but on + the second server generation the server tries to call + G80CrtcHideCursor before the display engine has been + initialized, causing a hang. * Wed Jul 23 2008 sndirsch(a)suse.de - xf86-video-intel 2.4.0 * New Intel 4 series chipset support ++++++ xf86-video-nv.diff ++++++ commit 9b727b8384d51e3657bb50efa090adde91c17a73 Author: Aaron Plattner <aplattner(a)nvidia.com> Date: Thu Jul 24 18:03:31 2008 -0700 Move hardware cursor initialization to after AcquireDisplay. The original order works fine when the server starts, but on the second server generation the server tries to call G80CrtcHideCursor before the display engine has been initialized, causing a hang. diff --git a/src/g80_driver.c b/src/g80_driver.c index a0182a1..50d55a0 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -914,13 +914,6 @@ G80ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) Must precede creation of the default colormap */ miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); - /* Initialize hardware cursor. Must follow software cursor initialization. */ - if(pNv->HWCursor && !G80CursorInit(pScreen)) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Hardware cursor initialization failed\n"); - pNv->HWCursor = FALSE; - } - /* Initialize default colormap */ if(!miCreateDefColormap(pScreen)) return FALSE; @@ -949,6 +942,13 @@ G80ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if(!AcquireDisplay(pScrn)) return FALSE; + /* Initialize hardware cursor. Must follow software cursor initialization. */ + if(pNv->HWCursor && !G80CursorInit(pScreen)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Hardware cursor initialization failed\n"); + pNv->HWCursor = FALSE; + } + pScreen->SaveScreen = G80SaveScreen; pNv->CloseScreen = pScreen->CloseScreen; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tomcat6
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package tomcat6 checked in at Fri Jul 25 17:06:32 CEST 2008. -------- New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/libtcnative-1-0.changes 2008-07-09 15:57:15.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Wed Jul 9 15:52:08 CEST 2008 - mvyskocil(a)suse.cz + +- The first release in SUSE (1.2.12) + - fix of enhancenment request [bnc#202339] + --- tomcat6/tomcat6.changes 2008-06-27 14:49:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2008-07-21 15:46:05.000000000 +0200 @@ -1,0 +2,24 @@ +Mon Jul 21 15:45:27 CEST 2008 - mvyskocil(a)suse.cz + +- fixed [bnc#394503]: tomcat6 is missing rctomcat6 link + - add a /usr/sbin/rctomcat6 symlink + - and heavy rewrite and improve of original jpackage tomcat6 init script + - add Should-Start and Should-Stop section and values for Default-Start and + Default-Stop + - removed the echo_success and echo_failure functions and usage + - include a /etc/rc.status and use a rc_XXXXX functions instead of echo and + return. Plus add a comments with error codes explanations + - merge the start/stop/status messages from previous version + - use `ps' command instead of pgrep + - changes in commands: added a try-restart|force-reload|reload|probe and + removed the version|conrestart +- fixed [bnc#394499]: add a PreReq to jpackage-utils +- fixed [bnc#408253]: tomcat6 fails because if missing commons-xxxx jars + - add a removed dependencies to the jakarta-commons-*-tomcat5 packages + - fixed a proper link creation in post/n scripts + - fixed a build cycle, jakarta-commons-dbcp-tomcat5 needs the tomcat6-lib for + build, but the tomcat6-lib has this package in Requires(post). The + %post scripplet is non-fatal if the jars cannot be found (but this would + not happens in a production state). + +------------------------------------------------------------------- New: ---- apr-1.2.12.tar.bz2 libtcnative-1-0.changes libtcnative-1-0.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ # # spec file for package libtcnative-1-0 (Version MACRO) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define section free %define tomcat_macro_version 16 %define tomcat_major_version 6 %define tomcat_minor_version 0 %define tomcat_version %{tomcat_major_version}.%{tomcat_minor_version}.%{tomcat_macro_version} %define packdname apache-tomcat-%{tomcat_version}-src %define libname libtcnative-1 %define major 1 %define minor 2 %define micro 12 Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} Release: 2 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: The Apache Software License Url: http://tomcat.apache.org/tomcat-6.0-doc/apr.html Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{tomcat_version}/src/%{packdna… Source1: apr-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python BuildRequires: libapr1-devel BuildRequires: openssl-devel BuildRequires: java-devel BuildRequires: fdupes AutoReqProv: on %description Tomcat can use the Apache Portable Runtime to provide superior scalability, performance, and better integration with native server technologies. The Apache Portable Runtime is a highly portable library that is at the heart of Apache HTTP Server 2.x. APR has many uses, including access to advanced IO functionality (such as sendfile, epoll and OpenSSL), OS level functionality (random number generation, system status, etc), and native process handling (shared memory, NT pipes and Unix sockets). These features allows making Tomcat a general purpose webserver, will enable much better integration with other native web technologies, and overall make Java much more viable as a full fledged webserver platform rather than simply a backend focused technology. %package devel License: The Apache Software License Requires: %{name} = %{version}-%{release} Requires: libapr1-devel Requires: libopenssl-devel Requires: glibc-devel Group: Development/Libraries/C and C++ Summary: JNI wrappers for Apache Portable Runtime for Tomcat %description devel Tomcat can use the Apache Portable Runtime to provide superior scalability, performance, and better integration with native server technologies. The Apache Portable Runtime is a highly portable library that is at the heart of Apache HTTP Server 2.x. APR has many uses, including access to advanced IO functionality (such as sendfile, epoll and OpenSSL), OS level functionality (random number generation, system status, etc), and native process handling (shared memory, NT pipes and Unix sockets). These features allows making Tomcat a general purpose webserver, will enable much better integration with other native web technologies, and overall make Java much more viable as a full fledged webserver platform rather than simply a backend focused technology. %prep %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version} %setup -q -c -T -a 0 -a 1 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/native/connector chmod a+x build/*.sh mv BUILDING README popd %build pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} # remove pre-built binaries and windows files find . $ -name "*.bat" -o -name "*.class" -o -name "*.gz" -o \ -name "*.jar" -o -name "*.zip" $ | xargs -t %{__rm} -f # we don't care about the tarballs and we're going to replace # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK pushd native/connector sh buildconf --with-apr=../../../apr-1.2.12/ ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --with-apr=%{_prefix} --with-openssl=%{_prefix} make popd popd %install pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/native/connector make DESTDIR=${RPM_BUILD_ROOT} install %{__install} -d -m 755 ${RPM_BUILD_ROOT}/%{_includedir} %{__install} -m 644 include/* ${RPM_BUILD_ROOT}/%{_includedir} rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la popd %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_libdir}/%{libname}.so* %doc %{packdname}/native/connector/README %files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/pkgconfig/*.pc %changelog * Wed Jul 09 2008 mvyskocil(a)suse.cz - The first release in SUSE (1.2.12) - fix of enhancenment request [bnc#202339] ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.H25112/_old 2008-07-25 17:05:34.000000000 +0200 +++ /var/tmp/diff_new_pack.H25112/_new 2008-07-25 17:05:34.000000000 +0200 @@ -29,7 +29,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{macro_version} -Release: 8 +Release: 9 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: The Apache Software License @@ -58,6 +58,8 @@ BuildRequires: jakarta-taglibs-standard >= 1.1 BuildRequires: fdupes PreReq: %fillup_prereq +PreReq: jpackage-utils +Recommends: libtcnative-1-0 %endif Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd @@ -133,11 +135,9 @@ Requires: %{name}-jsp-2_1-api = %{version}-%{release} Requires: %{name}-servlet-2_5-api = %{version}-%{release} Requires(post): ecj >= 3.2.2 -%if ! %defined suse_version Requires(post): jakarta-commons-collections-tomcat5 Requires(post): jakarta-commons-dbcp-tomcat5 Requires(post): jakarta-commons-pool-tomcat5 -%endif Requires(preun): %{__rm} %description lib @@ -302,6 +302,8 @@ popd %if %defined suse_version %fdupes $RPM_BUILD_ROOT /srv/%{name} +install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir} +ln -sf %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name} %endif %clean @@ -332,13 +334,15 @@ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100 %post lib +# HACK! The commons-dbcp-tomcat5 needs the tomcat6-lib to build, but tomcat6 +# needs this only as post/un dependency to create a symlink, not for build of +# itself. This is mainly for succesfully build, in the production case it +# should not happen! build-jar-repository %{libdir} \ -%if ! %defined suse_version commons-collections-tomcat5 \ commons-dbcp-tomcat5 \ commons-pool-tomcat5 \ -%endif - ecj 2>&1 + ecj 2>&1 || exit 0 %post servlet-2_5-api %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ @@ -350,7 +354,7 @@ %preun # clean tempdir and workdir on removal or upgrade -%{__rm} -fr %{workdir}/* %{tempdir}/* +## % {__rm} -fr %{workdir}/* # %{tempdir}/* %if %defined suse_version %stop_on_removal %{name} %else @@ -363,11 +367,9 @@ %preun lib if [ "$1" = "0" ]; then %{__rm} -f \ -%if ! %defined suse_version %{libdir}/\[commons-collections-tomcat5\].jar \ %{libdir}/\[commons-dbcp-tomcat5\].jar \ %{libdir}/\[commons-pool-tomcat5\].jar \ -%endif %{libdir}/\[ecj\].jar >/dev/null 2>&1 fi %if %defined suse_version @@ -409,12 +411,11 @@ %config(noreplace) %{confdir}/server.xml %attr(660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml %config(noreplace) %{confdir}/web.xml -%if ! %defined suse_version %attr(0775,root,tomcat) %dir %{tempdir} -%endif %attr(0775,root,tomcat) %dir %{workdir} %{homedir} %dir /srv/%{name} +%{_sbindir}/rc%{name} %files admin-webapps %defattr(0644,root,root,0755) @@ -447,6 +448,27 @@ %{appdir}/examples %changelog +* Mon Jul 21 2008 mvyskocil(a)suse.cz +- fixed [bnc#394503]: tomcat6 is missing rctomcat6 link + - add a /usr/sbin/rctomcat6 symlink + - and heavy rewrite and improve of original jpackage tomcat6 init script + - add Should-Start and Should-Stop section and values for Default-Start and + Default-Stop + - removed the echo_success and echo_failure functions and usage + - include a /etc/rc.status and use a rc_XXXXX functions instead of echo and + return. Plus add a comments with error codes explanations + - merge the start/stop/status messages from previous version + - use `ps' command instead of pgrep + - changes in commands: added a try-restart|force-reload|reload|probe and + removed the version|conrestart +- fixed [bnc#394499]: add a PreReq to jpackage-utils +- fixed [bnc#408253]: tomcat6 fails because if missing commons-xxxx jars + - add a removed dependencies to the jakarta-commons-*-tomcat5 packages + - fixed a proper link creation in post/n scripts + - fixed a build cycle, jakarta-commons-dbcp-tomcat5 needs the tomcat6-lib for + build, but the tomcat6-lib has this package in Requires(post). The + %%post scripplet is non-fatal if the jars cannot be found (but this would + not happens in a production state). * Fri Jun 27 2008 mvyskocil(a)suse.cz - fixed [bnc#396962]: VUL-0: tomcat5: [SECURITY] CVE-2008-1947: Tomcat host-manager XSS vulnerability - fixed [bnc#403310]: Tomcat startup script uses wrong java.io.tmpdir ++++++ tomcat6-6.0.init ++++++ --- tomcat6/tomcat6-6.0.init 2008-05-05 15:59:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/tomcat6-6.0.init 2008-07-18 11:37:04.000000000 +0200 @@ -1,22 +1,30 @@ #!/bin/bash +# Copyright (c) 2008 SuSE Linux AG Nuernberg, Germany. # -# tomcat6 This shell script takes care of starting and stopping Tomcat +# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot +# - heavily rewritten by Deepak Bhole and Jason Corley +# - merged with previous SUSE's rctomcat55 by Petr Mladek and jpackage.org +# original by Michal Vyskocil +# +# /etc/init.d/tomcat6 # -# chkconfig: - 80 20 +# and its symbolic link +# +# /usr/sbin/rctomcat6 +# +# System startup script for the Tomcat servlet container # ### BEGIN INIT INFO -# Provides: tomcat6 +# Provides: tomcat # Required-Start: $network $syslog $remote_fs +# Should-Start: $named $syslog $time # Required-Stop: $network $syslog -# Default-Start: -# Default-Stop: -# Description: Release implementation for Servlet 2.5 and JSP 2.1 -# Short-Description: start and stop tomcat +# Should-Stop: $named $syslog $time +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Tomcat Servlet Container +# Description: Start Tomcat to allow JAVA server pages ### END INIT INFO -# -# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot -# - heavily rewritten by Deepak Bhole and Jason Corley -# # set a minimalist PATH PATH="/bin:/sbin" @@ -28,6 +36,11 @@ ISBOOT="1" fi +# remove SUSE's rc name +if [ "${NAME:0:2}" = "rc" ]; then + NAME="${NAME:2}" +fi + # For SELinux we need to use 'runuser' not 'su' if [ -x "/sbin/runuser" ]; then SU="/sbin/runuser" @@ -74,25 +87,34 @@ return 1 } -# pulled from RHEL4 /etc/rc.d/init.d/functions -function echo_failure() { - echo -en "\\033[60G" - echo -n "[ " - echo -n $"FAILED" - echo -n " ]" - echo -ne "\r" - return 1 -} - -# pulled from RHEL4 /etc/rc.d/init.d/functions -function echo_success() { - echo -en "\\033[60G" - echo -n "[ " - echo -n $"OK" - echo -n " ]" - echo -ne "\r" - return 0 -} +# Shell functions sourced from /etc/rc.status: +# rc_check check and set local and overall rc status +# rc_status check and set local and overall rc status +# rc_status -v ditto but be verbose in local rc status +# rc_status -v -r ditto and clear the local rc status +# rc_failed set local and overall rc status to failed +# rc_failed <num> set local and overall rc status to <num><num> +# rc_reset clear local rc status (overall remains) +# rc_exit exit appropriate to overall rc status +. /etc/rc.status + +# First reset status of this service +rc_reset + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - insufficient privilege +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signalling is not supported) are +# considered a success. # Look for open ports, as the function name might imply function findFreePorts() { @@ -164,16 +186,16 @@ # See how we were called. function start() { - echo -n "Starting ${TOMCAT_PROG}: " + echo -n "Starting Tomcat ($CATALINA_BASE)" if [ -f "/var/lock/subsys/${NAME}" ] ; then if [ -f "/var/run/${NAME}.pid" ]; then read kpid < /var/run/${NAME}.pid if checkpid $kpid 2>&1; then echo "$NAME process already running" - return -1 + rc_failed 0 else - echo "lock file found but no process running for" - echo "pid $kpid, continuing" + echo -n "lock file found but no process running for pid $kpid, continuing" + rc_failed 7 fi fi fi @@ -201,39 +223,49 @@ fi RETVAL="$?" if [ "$RETVAL" -eq 0 ]; then - echo_success + rc_failed 0 touch /var/lock/subsys/${NAME} else - echo_failure + rc_failed 7 fi - echo - return $RETVAL + rc_status -v } +## Check status with checkproc(8), if process is running +## checkproc will return with exit status 0. + +# Status has a slightly different for the status command: +# 0 - service running +# 1 - service dead, but /var/run/ pid file exists +# 2 - service dead, but /var/lock/ lock file exists +# 3 - service not running + +# NOTE: checkproc returns LSB compliant status values. function status() { - RETVAL="1" + echo -n "Checking for Tomcat ($CATALINA_BASE)" if [ -f "/var/run/${NAME}.pid" ]; then read kpid < /var/run/${NAME}.pid if checkpid $kpid 2>&1; then - echo "$0 is already running (${kpid})" - RETVAL="0" + rc_failed 0 else - echo "lock file found but no process running for pid $kpid" + rc_failed 2 fi else - pid="$(/usr/bin/pgrep -u tomcat java)" + #don't be dependent on procps + #pid="$(/usr/bin/pgrep -u tomcat java)" + pid="$(ps U tomcat o pid,cmd | grep java | grep -v 'grep java')" if [ -n "$pid" ]; then echo "$0 running (${pid}) but no PID file exists" - RETVAL="0" + rc_failed 0 else - echo "$0 is stopped" + rc_failed 3 fi fi - return $RETVAL + rc_status -v } function stop() { - echo -n "Stopping $TOMCAT_PROG: " + echo -n "Shutting down Tomcat ($CATALINA_BASE)" if [ -f "/var/lock/subsys/${NAME}" ]; then $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop" >> $TOMCAT_LOG 2>&1 RETVAL="$?" @@ -257,16 +289,17 @@ fi kill -9 $kpid fi - echo_success + rc_failed 0 if [ "$count" -gt "0" ]; then echo -n -e "\n" fi fi rm -f /var/lock/subsys/${NAME} /var/run/${NAME}.pid else - echo_failure + rc_failed 1 fi fi + rc_status -v } @@ -280,28 +313,61 @@ parseOptions stop ;; + try-restart) + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) parseOptions stop sleep 2 start + rc_status ;; - condrestart) - if [ -f "/var/run/${NAME}.pid" ]; then - restart - fi - ;; + force-reload) + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload service Tomcat $($CATALINA_BASE)" + ## if it supports it: + #killproc -HUP $TOMCAT_BIN + #touch /var/run/FOO.pid + #rc_status -v + + ## Otherwise: + $0 stop && $0 start + rc_status + ;; + reload) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) + + # If it supports signalling: + #echo -n "Reload service FOO" + #killproc -HUP $TOMCAT_BIN + #touch /var/run/FOO.pid + #rc_status -v + + ## Otherwise if it does not support reload: + rc_failed 3 + rc_status -v + ;; status) status ;; - version) - $TOMCAT_SCRIPT version + probe) + ## Optional: Probe for the necessity of a reload, + ## give out the argument which is required for a reload. ;; *) - echo -n "Usage: $TOMCAT_PROG " - echo "{start|stop|restart|condrestart|status|version}" - exit 1 + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" + exit 1 + ;; esac - -exit $RETVAL - +rc_exit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 x11-input-wacom
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package x11-input-wacom checked in at Fri Jul 25 17:05:57 CEST 2008. -------- --- x11-input-wacom/x11-input-wacom.changes 2008-07-24 17:40:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2008-07-25 14:47:32.451905073 +0200 @@ -1,0 +2,12 @@ +Fri Jul 25 14:47:01 CEST 2008 - sndirsch(a)suse.de + +- linuxwacom-fix-wacomcpl-calibration.diff + * fix wacomcpl calibration (bnc #412182) + +------------------------------------------------------------------- +Fri Jul 25 09:49:06 CEST 2008 - sndirsch(a)suse.de + +- linuxwacom-fix-multitouch.diff no longer required +- specfile cleanup + +------------------------------------------------------------------- Old: ---- linuxwacom-fix-multitouch.diff s390.diff xorg-server-1.5.diff New: ---- linuxwacom-fix-wacomcpl-calibration.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.W25286/_old 2008-07-25 17:05:36.000000000 +0200 +++ /var/tmp/diff_new_pack.W25286/_new 2008-07-25 17:05:36.000000000 +0200 @@ -14,22 +14,19 @@ Name: x11-input-wacom BuildRequires: gtk2-devel ncurses ncurses-devel tk-devel update-desktop-files -%ifnarch s390 s390x BuildRequires: xorg-x11-driver-input xorg-x11-server-sdk -%endif +ExcludeArch: s390 s390x License: GPL v2 or later Url: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.8.1 -Release: 1 +Release: 2 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o Source: linuxwacom-%{version}-%{revision}.tar.bz2 Source1: 65-wacom.rules -Patch: linuxwacom-fix-multitouch.diff +Patch: linuxwacom-fix-wacomcpl-calibration.diff Patch1: linuxwacom-fix-xsetwacom_find_devices.diff -Patch2: s390.diff -Patch3: xorg-server-1.5.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,8 +38,6 @@ -------- Ping Cheng <pingc(a)wacom.com> -%ifnarch s390 s390x - %package tools License: GPL v2 or later Summary: Tools for configuration, diagnostic and libraries for Wacom tablets @@ -81,43 +76,24 @@ -------- Ping Cheng <pingc(a)wacom.com> -%endif - %prep %setup -n linuxwacom-%{version}-%{revision} -%patch +%patch -p1 %patch1 -%ifarch s390 s390x -%patch2 -%endif -%patch3 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" libtoolize --force autoreconf --force --install -%ifarch s390 s390x -%configure --prefix=/usr \ - --disable-libwacomcfg \ - --disable-xsetwacom \ - --disable-wacdump \ - --disable-xidump \ - --disable-libwacomxi -%else %configure --prefix=/usr \ -%ifarch x86_64 - --enable-xserver64 \ -%endif --enable-wacdump \ --enable-dlloader \ --with-xmoduledir=/usr/%{_lib}/xorg/modules/input \ --with-xlib=/usr/%{_lib} -%endif make %install make install DESTDIR=$RPM_BUILD_ROOT -%ifnarch s390 s390x # Script libraries for Tcl extensions should be in a package-specific # subdir of /usr/share/tcl mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/%{name}-tools @@ -130,7 +106,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d install -m 644 $RPM_SOURCE_DIR/65-wacom.rules \ $RPM_BUILD_ROOT/etc/udev/rules.d -%endif %clean rm -rf %{buildroot} @@ -142,7 +117,6 @@ %files %defattr(-,root,root) %doc AUTHORS GPL README -%ifnarch s390 s390x %dir /usr/%_lib/xorg %dir /usr/%_lib/xorg/modules/ %dir /usr/%_lib/xorg/modules/input @@ -150,9 +124,7 @@ %dir /etc/udev/rules.d /etc/udev/rules.d/65-wacom.rules %attr (644,root,root) /usr/%_lib/xorg/modules/input/wacom_drv.so -%endif %{_mandir}/man4/wacom.4x.gz -%ifnarch s390 s390x %files tools %defattr(-,root,root) @@ -177,9 +149,14 @@ /usr/%_lib/libwacomcfg.a /usr/%_lib/libwacomcfg.la /usr/%_lib/libwacomcfg.so -%endif %changelog +* Fri Jul 25 2008 sndirsch(a)suse.de +- linuxwacom-fix-wacomcpl-calibration.diff + * fix wacomcpl calibration (bnc #412182) +* Fri Jul 25 2008 sndirsch(a)suse.de +- linuxwacom-fix-multitouch.diff no longer required +- specfile cleanup * Thu Jul 24 2008 sndirsch(a)suse.de - updated to 0.8.1-1 due to rotation working again with this version ++++++ linuxwacom-fix-wacomcpl-calibration.diff ++++++ From: Danny Kukawka <dkukawka(a)suse.de> Subject: Fix wacomcpl device detection for calibration This patch fixes the detection of the wacom input devices in wacomcpl. Currently they get always detected as core devices which prevents calibration. Signed-off-by: Danny Kukawka <dkukawka(a)suse.de> --- wacomxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linuxwacom-0.8.1/src/wacomxi/wacomxi.c 2008-07-25 13:52:12.000000000 +0200 +++ linuxwacom-0.8.1/src/wacomxi/wacomxi.c 2008-07-25 13:52:27.000000000 +0200 @@ -126,7 +126,7 @@ device->xdev = NULL; device->id = device_list[i].id; device->name = Tk_GetUid(device_list[i].name); - device->core = ((device_list[i].use == IsXExtensionDevice) ? 0 : + device->core = ((device_list[i].use >= IsXExtensionDevice) ? 0 : ((device_list[i].use == IsXPointer) ? CORE_POINTER : CORE_KEYBOARD)); device->x_index = 0; device->y_index = 1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomboy
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package tomboy checked in at Fri Jul 25 17:05:26 CEST 2008. -------- --- GNOME/tomboy/tomboy.changes 2008-05-20 16:46:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomboy/tomboy.changes 2008-06-27 22:12:08.512113000 +0200 @@ -1,0 +2,16 @@ +Fri Jun 27 22:18:26 CEST 2008 - mauro(a)suse.de + +- Upgrade to version 0.11.0: + * Update printing to use Gtk.Print (#512369, John Anderson). Formatting and + styles not supported yet, patches welcome. + * Bump gtk-sharp dependency to 2.10. + * New Tasque addin, disabled by default. + * Add "New notebook..." menu item to Notebook toolbar button (#532196). + * Increase default max width of note menu to 100 characters. + * Fix check for Mono.Addins >= 0.3 (#521616, Łukasz Jernaś). + * Move to managed code for calculating color contrasts (Sebastian Dröge). + * Fix shebang lines in bash scripts (#521160, Romain Tartiere). + * Show text lables on toolbar buttons (#528844). + * Don't show sync password in log and console output (#524707). + +------------------------------------------------------------------- Old: ---- tomboy-0.10.2.tar.bz2 New: ---- tomboy-0.11.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.T21390/_old 2008-07-25 17:04:34.000000000 +0200 +++ /var/tmp/diff_new_pack.T21390/_new 2008-07-25 17:04:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tomboy (Version 0.10.2) +# spec file for package tomboy (Version 0.11.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: LGPL v2.1 or later Group: Productivity/Office/Other Requires: mono -Version: 0.10.2 +Version: 0.11.0 Release: 1 Summary: GNOME Note Taking Application Url: http://www.beatniksoftware.com/tomboy/ @@ -127,6 +127,19 @@ %define __find_provides env sh -c 'filelist=($(grep -v -E "%{_libdir}/%{name}/addins|Mono.Addins")) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %changelog +* Sat Jun 28 2008 mauro(a)suse.de +- Upgrade to version 0.11.0: + * Update printing to use Gtk.Print (#512369, John Anderson). Formatting and + styles not supported yet, patches welcome. + * Bump gtk-sharp dependency to 2.10. + * New Tasque addin, disabled by default. + * Add "New notebook..." menu item to Notebook toolbar button (#532196). + * Increase default max width of note menu to 100 characters. + * Fix check for Mono.Addins >= 0.3 (#521616, Łukasz Jernaś). + * Move to managed code for calculating color contrasts (Sebastian Dröge). + * Fix shebang lines in bash scripts (#521160, Romain Tartiere). + * Show text lables on toolbar buttons (#528844). + * Don't show sync password in log and console output (#524707). * Tue May 20 2008 btimothy(a)suse.de - Upgrade to version 0.10.2: * Fix improper printing of password during webdav sync (bgo#524707). ++++++ tomboy-0.10.2.tar.bz2 -> tomboy-0.11.0.tar.bz2 ++++++ ++++ 14155 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 sysconfig
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package sysconfig checked in at Fri Jul 25 17:05:18 CEST 2008. -------- --- sysconfig/sysconfig.changes 2008-05-23 12:02:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2008-07-24 10:52:15.000000000 +0200 @@ -1,0 +2,40 @@ +Thu Jul 24 09:59:24 CEST 2008 - mt(a)suse.de + +- new version 0.71.1 +- Improved ifcfg-tunnel.5 manual page, added tun/tap examples, + changed TUNNEL_SET_PERSISTENT default to 'yes'; non-persistent + tunnels are not supported yet (fate#302184). + +------------------------------------------------------------------- +Mon Jul 21 11:31:35 CEST 2008 - hare(a)suse.de + +- Update hwcfg2rules script to cover all S/390 devices + (fate#304939) +- Fix RPM build errors + +------------------------------------------------------------------- +Mon Jul 14 13:59:32 CEST 2008 - mt(a)suse.de + +- Fixed typo in ethtool retcode check in ifup (bnc#405434). + +------------------------------------------------------------------- +Wed Jun 25 10:55:42 CEST 2008 - mt(a)suse.de + +- Removed sentence about writing of udev rules (bnc#399224), + added info about module options in /etc/modprobe.conf.local +- Added check if the dhcpcd client is still running in the + DHCLIENT_WAIT_AT_BOOT wait loop. +- Added fix adding -p dhcpcd option to avoid deconfiguration + of the interface at startup in nfsroot case (bnc#397484) +- Fixed typo in ifup-tunnel while applying TUNNEL_SET_GROUP + +------------------------------------------------------------------- +Thu May 29 17:57:36 CEST 2008 - mt(a)suse.de + +- new version 0.71.0 +- Moved static ip tunnel support to scripts/ifup-tunnel, added + basic tun/tap support, updated ifcfg-tunnel(5) manual page. +- Fixes to avoid usage of utilities from /usr, because /usr may + be mounted via nfs (bnc#285472). + +------------------------------------------------------------------- Old: ---- sysconfig-0.70.8.tar.bz2 New: ---- sysconfig-0.71.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.U21470/_old 2008-07-25 17:04:34.000000000 +0200 +++ /var/tmp/diff_new_pack.U21470/_new 2008-07-25 17:04:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.70.8) +# spec file for package sysconfig (Version 0.71.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: sysconfig -Version: 0.70.8 +Version: 0.71.1 Release: 1 Summary: The sysconfig scheme Group: System/Base @@ -209,15 +209,44 @@ %{fillup_and_insserv -fY network} %{fillup_only -dns dhcp network network} %{fillup_only -dns config network network} -%run_ldconfig +/sbin/ldconfig echo "Removing old autogenerated device configuration files:" rm -vf $(grep -sl "HOTPLUG-FLAG: *autocreated" /etc/sysconfig/hardware/hwcfg-*) rm -vf /etc/sysconfig/storage %postun %{insserv_cleanup} +/sbin/ldconfig + +%preun +%{stop_on_removal network} %changelog +* Thu Jul 24 2008 mt(a)suse.de +- new version 0.71.1 +- Improved ifcfg-tunnel.5 manual page, added tun/tap examples, + changed TUNNEL_SET_PERSISTENT default to 'yes'; non-persistent + tunnels are not supported yet (fate#302184). +* Mon Jul 21 2008 hare(a)suse.de +- Update hwcfg2rules script to cover all S/390 devices + (fate#304939) +- Fix RPM build errors +* Mon Jul 14 2008 mt(a)suse.de +- Fixed typo in ethtool retcode check in ifup (bnc#405434). +* Wed Jun 25 2008 mt(a)suse.de +- Removed sentence about writing of udev rules (bnc#399224), + added info about module options in /etc/modprobe.conf.local +- Added check if the dhcpcd client is still running in the + DHCLIENT_WAIT_AT_BOOT wait loop. +- Added fix adding -p dhcpcd option to avoid deconfiguration + of the interface at startup in nfsroot case (bnc#397484) +- Fixed typo in ifup-tunnel while applying TUNNEL_SET_GROUP +* Thu May 29 2008 mt(a)suse.de +- new version 0.71.0 +- Moved static ip tunnel support to scripts/ifup-tunnel, added + basic tun/tap support, updated ifcfg-tunnel(5) manual page. +- Fixes to avoid usage of utilities from /usr, because /usr may + be mounted via nfs (bnc#285472). * Fri May 23 2008 mt(a)suse.de - new version 0.70.8 - Improved ifup-bridge script reliability and allow that the ++++++ sysconfig-0.70.8.tar.bz2 -> sysconfig-0.71.1.tar.bz2 ++++++ ++++ 1830 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/ChangeLog new/sysconfig-0.71.1/ChangeLog --- old/sysconfig-0.70.8/ChangeLog 2008-05-23 12:01:49.000000000 +0200 +++ new/sysconfig-0.71.1/ChangeLog 2008-07-24 10:51:34.000000000 +0200 @@ -1,55 +1,164 @@ ------------------------------------------------------------------------ -r1665 | mt | 2008-05-23 11:59:05 +0200 (Fri, 23 May 2008) | 2 lines +r1677 | mt | 2008-07-14 14:06:54 +0200 (Mon, 14 Jul 2008) | 2 lines Changed paths: - M /branches/opensuse-11.0 - M /branches/opensuse-11.0/VERSION - M /branches/opensuse-11.0/package/sysconfig.changes + M /trunk/package/sysconfig.changes + M /trunk/scripts/ifup + +- Fixed typo in ethtool retcode check in ifup (bnc#405434). + +------------------------------------------------------------------------ +r1675 | mt | 2008-06-25 10:57:07 +0200 (Wed, 25 Jun 2008) | 2 lines +Changed paths: + M /trunk/package/sysconfig.changes + +- updated sysconfig.changes + +------------------------------------------------------------------------ +r1674 | mt | 2008-06-24 13:40:06 +0200 (Tue, 24 Jun 2008) | 3 lines +Changed paths: + M /trunk/doc/README.hwcfg_and_device_initialisation + +- Removed sentence about writing of udev rules (bnc#399224), + added info about module options in /etc/modprobe.conf.local + +------------------------------------------------------------------------ +r1673 | mt | 2008-06-24 13:35:58 +0200 (Tue, 24 Jun 2008) | 5 lines +Changed paths: + M /trunk/scripts/ifup-dhcp -- new version 0.70.8, updated sysconfig.changes +- Added fix adding -p dhcpcd option to avoid deconfiguration + of the interface at startup in nfsroot case (bnc#397484) +- Added check if the dhcpcd client is still running in the + DHCLIENT_WAIT_AT_BOOT wait loop. ------------------------------------------------------------------------ -r1664 | mt | 2008-05-23 11:51:35 +0200 (Fri, 23 May 2008) | 4 lines +r1672 | mt | 2008-06-24 13:31:30 +0200 (Tue, 24 Jun 2008) | 2 lines Changed paths: - M /branches/opensuse-11.0/scripts/ifup-bridge + M /trunk/scripts/ifup-tunnel + +- Fixed typo while applying TUNNEL_SET_GROUP + +------------------------------------------------------------------------ +r1671 | mt | 2008-05-29 23:21:56 +0200 (Thu, 29 May 2008) | 2 lines +Changed paths: + M /trunk/package/sysconfig.changes -- Merged ifup-bridge script from trunk, that improves its - reliability and allow that the bridge exists, e.g. because - created by xen (bnc#378595). +- updated sysconfig.changes -- version 0.71.0 ------------------------------------------------------------------------ -r1662 | mt | 2008-05-22 08:43:17 +0200 (Thu, 22 May 2008) | 6 lines +r1670 | mt | 2008-05-29 17:53:27 +0200 (Thu, 29 May 2008) | 3 lines Changed paths: - M /branches/opensuse-11.0/config/sysconfig.dhcp-network + M /trunk/doc/ifcfg-tunnel.5 + M /trunk/scripts/Makefile.am + M /trunk/scripts/functions + M /trunk/scripts/ifup + A /trunk/scripts/ifup-tunnel + M /trunk/scripts/network + +- Moved tunnel support to scripts/ifup-tunnel, + added basic tun/tap support + +------------------------------------------------------------------------ +r1669 | mt | 2008-05-29 17:52:26 +0200 (Thu, 29 May 2008) | 2 lines +Changed paths: + M /trunk/scripts/extradebug + +- Improved scripts/extradebug + +------------------------------------------------------------------------ +r1668 | mt | 2008-05-28 09:36:05 +0200 (Wed, 28 May 2008) | 3 lines +Changed paths: + M /trunk/doc/ifcfg-tunnel.5 + +- Replaced obsolete TUNNEL_LOCAL_INTERFACE usage in the + ifcfg-sit1 example as well (bnc#384073). + +------------------------------------------------------------------------ +r1667 | mt | 2008-05-28 09:20:28 +0200 (Wed, 28 May 2008) | 2 lines +Changed paths: + M /trunk/package/sysconfig.changes + +- Merged in changes from branches/opensuse-11.0 -- Merged from trunk: - Increased DHCLIENT_WAIT_AT_BOOT to 15 and added comment note, +------------------------------------------------------------------------ +r1663 | mt | 2008-05-23 11:46:33 +0200 (Fri, 23 May 2008) | 2 lines +Changed paths: + M /trunk/scripts/ifup-bridge + +- Improved error message printing in ifup-bridge + +------------------------------------------------------------------------ +r1660 | mt | 2008-05-20 10:47:15 +0200 (Tue, 20 May 2008) | 2 lines +Changed paths: + M /trunk/VERSION + +- bumped version to 0.71.0 + +------------------------------------------------------------------------ +r1659 | mt | 2008-05-19 17:20:15 +0200 (Mon, 19 May 2008) | 2 lines +Changed paths: + M /trunk/scripts/network + +- Improved slave skip comment in mandatory collect loop. + +------------------------------------------------------------------------ +r1658 | mt | 2008-05-19 17:17:07 +0200 (Mon, 19 May 2008) | 3 lines +Changed paths: + M /trunk/scripts/ifup-bridge + +- Improved ifup-bridge script to allow that the bridge + already exists (bnc#378595). + +------------------------------------------------------------------------ +r1657 | mt | 2008-05-19 17:11:50 +0200 (Mon, 19 May 2008) | 3 lines +Changed paths: + M /trunk/scripts/functions + M /trunk/scripts/ifup-bridge + M /trunk/scripts/ifup-wireless + +- Fixes to avoid usage of utilities from /usr, because + /usr may be mounted via nfs (bnc#285472). + +------------------------------------------------------------------------ +r1656 | mt | 2008-05-19 17:08:49 +0200 (Mon, 19 May 2008) | 5 lines +Changed paths: + M /trunk/config/sysconfig.dhcp-network + +- Increased DHCLIENT_WAIT_AT_BOOT to 15 and added comment note, that RFC 2131 specifies, that the dhcp client should wait a random time between one and ten seconds to desynchronize the use of DHCP at startup (bnc#390676). ------------------------------------------------------------------------ -r1661 | mt | 2008-05-22 08:42:23 +0200 (Thu, 22 May 2008) | 4 lines +r1655 | mt | 2008-05-19 16:49:20 +0200 (Mon, 19 May 2008) | 4 lines Changed paths: - M /branches/opensuse-11.0/scripts/ifup - M /branches/opensuse-11.0/scripts/network + M /trunk/scripts/ifup + M /trunk/scripts/network -- Merged rcnetwork reload fix from trunk to delete [vlan] interfaces - when the ifcfg file got deleted and honor the -o skip option for - the non-physical interfaces (bnc#346566). +- Fixed rcnetwork reload to delete vlan interfaces when + the ifcfg file got deleted and honor -o skip for non- + physical interfaces (bnc#346566). ------------------------------------------------------------------------ -r1652 | mt | 2008-05-16 12:32:47 +0200 (Fri, 16 May 2008) | 2 lines +r1654 | mt | 2008-05-19 16:41:50 +0200 (Mon, 19 May 2008) | 2 lines Changed paths: - A /branches/opensuse-11.0 (from /tags/version-0.70.7:1651) + M /trunk/scripts/netcontrol_global_hooks -- Created 11.0 branch +- Removed obsolete get_config_name function call ------------------------------------------------------------------------ -r1650 | mt | 2008-05-14 13:50:24 +0200 (Wed, 14 May 2008) | 2 lines +r1651 | mt | 2008-05-14 15:52:34 +0200 (Wed, 14 May 2008) | 2 lines Changed paths: - A /tags/version-0.70.7 (from /trunk:1649) + M /trunk/Makefile.am + M /trunk/config/Makefile.am + M /trunk/config/hardware/Makefile.am + M /trunk/doc/Makefile.am + M /trunk/package/Makefile.am + M /trunk/scripts/Makefile.am + M /trunk/scripts/hardware/Makefile.am + M /trunk/tools/Makefile.am -- Tagged version 0.70.7 +- Added MAINTAINERCLEANFILES ------------------------------------------------------------------------ r1649 | mt | 2008-05-14 13:49:35 +0200 (Wed, 14 May 2008) | 2 lines diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/config/hardware/Makefile.am new/sysconfig-0.71.1/config/hardware/Makefile.am --- old/sysconfig-0.70.8/config/hardware/Makefile.am 2008-05-20 13:08:22.000000000 +0200 +++ new/sysconfig-0.71.1/config/hardware/Makefile.am 2008-07-24 09:21:31.000000000 +0200 @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + modprobe_DATA = blacklist EXTRA_DIST = $(modprobe_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/config/Makefile.am new/sysconfig-0.71.1/config/Makefile.am --- old/sysconfig-0.70.8/config/Makefile.am 2008-05-20 13:08:22.000000000 +0200 +++ new/sysconfig-0.71.1/config/Makefile.am 2008-07-24 09:21:31.000000000 +0200 @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + SUBDIRS = hardware sysconfig_network_DATA = ifcfg.template \ @@ -37,3 +40,4 @@ ln -s ../../../init.d/ypbind $(DESTDIR)$(prefix)@sysconfig_networkdir@/ifservices.template/S30ypbind ln -s ../../../init.d/autofs $(DESTDIR)$(prefix)@sysconfig_networkdir@/ifservices.template/S40autofs chmod 644 $(DESTDIR)$(prefix)@omc_svcinfodir@/network.xml + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/doc/ifcfg-tunnel.5 new/sysconfig-0.71.1/doc/ifcfg-tunnel.5 --- old/sysconfig-0.70.8/doc/ifcfg-tunnel.5 2008-05-20 13:08:22.000000000 +0200 +++ new/sysconfig-0.71.1/doc/ifcfg-tunnel.5 2008-07-24 09:58:16.000000000 +0200 @@ -12,28 +12,57 @@ .B /etc/sysconfig/network/ifcfg-ipip* .br .B /etc/sysconfig/network/ifcfg-sit* +.br + +.B /etc/sysconfig/network/ifcfg-tun* +.br +.B /etc/sysconfig/network/ifcfg-tap* .SH Tunnel interfaces -It is -possible to create tunnel interfaces for three different protocols: +It is possible to create static IP tunnel interfaces for three different +protocols: +.RS +.PD 0 +.TP .I SIT -(IPv6 over IPv4 tunnel), +IPv6 over IPv4 tunnel +.TP .I GRE -(universal IPv4 tunnel) and +universal IPv4 tunnel +.TP .I IPIP -(IPv4 over IPv4 tunnel). Since there is not yet a YaST2 support for creating -tunnels one must write appropriate config files by hand for now. +IPv4 over IPv4 tunnel +.PD +.RE + +Additionally, also creation of user space program driven tunnels using +the universal TUN/TAP device driver is supported: +.RS +.PD 0 +.TP +.I TAP +Ethernet tunnel interface +.TP +.I TUN +Point-to-Point IP tunnel interface +.PD +.RE + +Since there is not yet a YaST2 support for creating tunnels one must +write appropriate config files by hand for now. -These new variables are to be used in tunnel config files: +.SH VARIABLES +These variables can used in ip tunnel config files: .TP .B TUNNEL Here you have to set the tunnel protocol. This may be "sit" for IPv6 over IPv4 -tunnel, "gre" for universal IPv4 tunnel and "ipip" for IPv4 over IPv4 tunnel. +tunnel, "gre" for universal IPv4 tunnel, "ipip" for IPv4 over IPv4 tunnel and +"tap" or "tun" for the user space program driven tunnels. .TP .BR TUNNEL_LOCAL_IPADDR \ or \ TUNNEL_DEVICE The address of the local tunnel's end could be directly specified in .B TUNNEL_LOCAL_IPADDR -variable. The address must be present on another interface of this host +variable. The address must be present on an existing interface of this host (the TUNNEL_DEVICE). If .B TUNNEL_LOCAL_IPADDR is empty the first ipv4 address from the interface given in the variable @@ -54,7 +83,14 @@ .B TUNNEL_OPTIONS Here you may set additional options for the command .B ip tunnel add - +.TP +.B TUNNEL_SET_PERSISTENT +Create a persistent tun or tap interface. Default is "yes". +Non-persistent tunnels are not supported yet. +.TP +.BR TUNNEL_SET_OWNER \ and \ TUNNEL_SET_GROUP +Allows to set the owner and group (by name or UID/GID) for persistent +tun/tap interfaces. .SH Examples for tunnel configurations This are some generic examples for different tunnel types. Replace the shown addresses and interface names by your individual ones. As configuration names @@ -102,7 +138,7 @@ STARTMODE='onboot' BOOTPROTO='6to4' TUNNEL='sit' - TUNNEL_LOCAL_INTERFACE='eth0' + TUNNEL_DEVICE='eth0' TUNNEL_TTL='64' .fi Additionally you need to set some routes. Do that in a file called @@ -129,6 +165,52 @@ TUNNEL_TTL='64' .fi +.TP +.B Universal TUN/TAP tunnels +The universal TUN/TAP kernel driver provides an interface for user +space programs to operate a tunnel. There are two modes in which +the interface can be created: +.nf + TUN (a Point-to-Point interface using local and remote IP) or + TAP (like normal ethernet interface, e.g. for use in bridges). +.fi + +The following configuration allows to create the interfaces +persistently: + +.I ifcfg-tap0 +.nf + STARTMODE='onboot' + BOOTPROTO='static' + TUNNEL='tap' + # optionally: + TUNNEL_SET_PERSISTENT='yes' + TUNNEL_SET_OWNER='username' + TUNNEL_SET_GROUP='groupname' +.fi + +.I ifcfg-tun0 +.nf + STARTMODE='onboot' + BOOTPROTO='static' + TUNNEL='tun' + # optionally: + TUNNEL_SET_PERSISTENT='yes' + TUNNEL_SET_OWNER='username' + TUNNEL_SET_GROUP='groupname' +.fi + +The user space program can be started later, e.g. by the +.BR ifservices (5) +mechanism. The TUNNEL_SET_OWNER and TUNNEL_SET_GROUP settings +allow to run the user space program with an different UID/GID +than 0 (root). When not specified, the user space program has +to run with UID 0. + +Non-persistent tunnels (TUNNEL_SET_PERSISTENT=no), where the +user space program (e.g. openvpn) is started directly in ifup, +are not supported yet. + .SH BUGS Please report bugs at <http://www.suse.de/feedback> .SH AUTHOR diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/doc/Makefile.am new/sysconfig-0.71.1/doc/Makefile.am --- old/sysconfig-0.70.8/doc/Makefile.am 2008-05-20 13:08:22.000000000 +0200 +++ new/sysconfig-0.71.1/doc/Makefile.am 2008-07-24 09:21:32.000000000 +0200 @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + man_MANS = ifup.8 \ ifdown.8 \ ifservices.5 \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/doc/README.hwcfg_and_device_initialisation new/sysconfig-0.71.1/doc/README.hwcfg_and_device_initialisation --- old/sysconfig-0.70.8/doc/README.hwcfg_and_device_initialisation 2008-05-20 13:08:22.000000000 +0200 +++ new/sysconfig-0.71.1/doc/README.hwcfg_and_device_initialisation 2008-07-24 09:21:32.000000000 +0200 @@ -12,9 +12,7 @@ be honest, there is still a /sbin/hwup but it changed completely. See below.) The automatic module loading did not change much. The only difference is that -udev calls 'modprobe $MODALIAS' directly and not via /bin/hwup as before. If -you want to load another driver for a device now you have to write a udev rule -instead. +udev calls 'modprobe $MODALIAS' directly and not via /bin/hwup as before. To learn more about this topic have a look at these files, man-pages and tools: - /etc/udev/rules.d/80-drivers.rules @@ -25,13 +23,19 @@ - man modprobe - modprobe -nv --show-depends `cat /sys/bus/pci/devices/..../modalias` +Module parameters can be specified in /etc/modprobe.conf.local, e.g. as: + + options <module name> <module options> About the new /sbin/hwup: Have a look at this short shell script to learn more about manual driver binding. This script may be used to manually unbind and bind drivers to devices. -For example if you want to change a network interface name, do this: + +For example if you want to change a network interface name, do this in +yast2 network or: - change the name in /etc/udev/rules.d/70-persistent-net.rules - call 'hwdown <old iface name>' - call 'hwup <old iface name>' - check result with 'ip a' + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/Makefile.am new/sysconfig-0.71.1/Makefile.am --- old/sysconfig-0.70.8/Makefile.am 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/Makefile.am 2008-07-24 09:21:33.000000000 +0200 @@ -6,6 +6,12 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 CLEANFILES = *~ +MAINTAINERCLEANFILES = aclocal.m4 config.guess config.sub \ + configure depcomp install-sh ltmain.sh Makefile.in missing \ + sysconfig-$(VERSION).tar.bz2 sysconfig-$(VERSION).tar.gz + +maintainer-clean-local: + -rm -rf autom4te.cache SUBDIRS = doc scripts tools config package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/package/Makefile.am new/sysconfig-0.71.1/package/Makefile.am --- old/sysconfig-0.70.8/package/Makefile.am 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/package/Makefile.am 2008-07-24 09:21:33.000000000 +0200 @@ -1,4 +1,7 @@ ## Process this file with automake to produce Makefile.in +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + noinst_DATA = sysconfig.spec diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/package/sysconfig.spec.in new/sysconfig-0.71.1/package/sysconfig.spec.in --- old/sysconfig-0.70.8/package/sysconfig.spec.in 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/package/sysconfig.spec.in 2008-07-24 10:42:06.000000000 +0200 @@ -208,12 +208,16 @@ %{fillup_and_insserv -fY network} %{fillup_only -dns dhcp network network} %{fillup_only -dns config network network} -%run_ldconfig +/sbin/ldconfig echo "Removing old autogenerated device configuration files:" rm -vf $(grep -sl "HOTPLUG-FLAG: *autocreated" /etc/sysconfig/hardware/hwcfg-*) rm -vf /etc/sysconfig/storage %postun %{insserv_cleanup} +/sbin/ldconfig + +%preun +%{stop_on_removal network} %changelog -n sysconfig diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/extradebug new/sysconfig-0.71.1/scripts/extradebug --- old/sysconfig-0.70.8/scripts/extradebug 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/extradebug 2008-07-24 09:21:33.000000000 +0200 @@ -6,7 +6,11 @@ # boot.udev to start cleanly when booting. SCRIPT=${0##*/} -exec 2> /tmp/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_$1.$2 + +. /etc/sysconfig/network/scripts/functions.common +test -d $RUN_FILES_BASE && dir=$RUN_FILES_BASE || dir=/ +exec 2> $dir/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_$1.$2 + date +"%F %T.%N" >&2 echo -------------------------------------------------- >&2 ps axwfu | head -1 >&2 @@ -16,7 +20,7 @@ echo -------------------------------------------------- >&2 ls -ltr --full-time /sys/class/net /dev/shm/sysconfig >&2 echo >&2 -grep -H "" /dev/shm/sysconfig/* >&2 +grep -H "" $(ls -1d /dev/shm/sysconfig/* | grep -v "[/]exdeb") >&2 echo -------------------------------------------------- >&2 ip a >&2 ip r >&2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/functions new/sysconfig-0.71.1/scripts/functions --- old/sysconfig-0.70.8/scripts/functions 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/functions 2008-07-24 09:21:33.000000000 +0200 @@ -22,7 +22,7 @@ # Authors: Michal Svec <msvec(a)suse.cz> # Mads Martin Joergensen <mmj(a)suse.de> # -# $Id: functions 1647 2008-05-14 11:46:52Z mt $ +# $Id: functions 1670 2008-05-29 15:53:27Z mt $ # . /etc/sysconfig/network/scripts/functions.common @@ -35,7 +35,7 @@ # # to test the next two functions: # -# for i in $(seq 0 32); do +# for i in {0..32}; do # echo $i: $(pfxlen2mask $i) " ---> " $(mask2pfxlen $(pfxlen2mask $i)) # done @@ -84,7 +84,7 @@ ippp*|isdn*) return 0 ;; modem*|dsl*|ppp*) return 0 ;; vlan*) return 0 ;; - sit*|gre*|ipip*) return 0 ;; + sit*|gre*|ipip*|tun*|tap*) return 0 ;; esac test "${SCRIPTNAME%%-*}" = ifdown -a "$MODE" = hotplug && return 0 test "${SCRIPTNAME%%-*}" = ifup -a "$BONDING_MASTER" = yes && return 0 @@ -101,29 +101,56 @@ esac } +get_ethtool_drv_info () { + test -n "$1" || return 1 + local ethtool="/sbin/ethtool" + if [ ! -x $ethtool ] ; then + [ -x /usr${ethtool} ] && ethtool="/usr${ethtool}" || return 1 + fi + $ethtool -i "$IF" 2>/dev/null | + while read key val ; do + case "$key" in + driver:) printf 'ETHTOOL_DRV_NAME=%q\n' "$val" ;; + version:) printf 'ETHTOOL_DRV_VERSION=%q\n' "$val" ;; + firmware-version:) printf 'ETHTOOL_DRV_FW_VERSION=%q\n' "$val" ;; + bus-info:) printf 'ETHTOOL_DRV_BUS_INFO=%q\n' "$val" ;; + esac + done 2>/dev/null # bash printf required for %q format +} + get_iface_type () { local IF=$1 TYPE test -n "$IF" || return 1 test -d /sys/class/net/$IF || return 2 case "`cat /sys/class/net/$IF/type`" in - 1) TYPE=eth # Ethernet, may also be wireless - test -d /sys/class/net/$IF/wireless && TYPE=wlan - test -d /sys/class/net/$IF/bridge && TYPE=bridge - test -f /proc/net/vlan/$IF && TYPE=vlan - test -d /sys/class/net/$IF/bonding && TYPE=bond ;; - 24) TYPE=eth ;; # firewire ;; # IEEE 1394 IPv4 - RFC 2734 - 32) TYPE=eth ;; # InfiniBand, treat it like ethernet? - 512) TYPE=ppp ;; - 768) TYPE=ipip ;; # IPIP tunnel - 769) TYPE= ;; # IP6IP6 tunnel - 772) TYPE=lo ;; - 776) TYPE=sit ;; # sit0 device - IPv6-in-IPv4 - 778) TYPE=gre ;; # GRE over IP - 783) TYPE=irda ;; # Linux-IrDA - 801) TYPE=wlan_aux ;; + 1) + TYPE=eth # Ethernet, may also be wireless + test -d /sys/class/net/$IF/wireless && TYPE=wlan + test -d /sys/class/net/$IF/bridge && TYPE=bridge + test -f /proc/net/vlan/$IF && TYPE=vlan + test -d /sys/class/net/$IF/bonding && TYPE=bond + test -d /sys/devices/virtual/net/$IF && { + eval local `get_ethtool_drv_info $IF` + test "$ETHTOOL_DRV_NAME" == "tun" && \ + TYPE="$ETHTOOL_DRV_BUS_INFO" || \ + case $IF in tap*) TYPE=tap ;; esac + # may be another virtual eth iface + } + ;; + 24) TYPE=eth ;; # firewire ;; # IEEE 1394 IPv4 - RFC 2734 + 32) TYPE=eth ;; # InfiniBand, treat it like ethernet? + 512) TYPE=ppp ;; + 768) TYPE=ipip ;; # IPIP tunnel + 769) TYPE= ;; # IP6IP6 tunnel + 772) TYPE=lo ;; + 776) TYPE=sit ;; # sit0 device - IPv6-in-IPv4 + 778) TYPE=gre ;; # GRE over IP + 783) TYPE=irda ;; # Linux-IrDA + 801) TYPE=wlan_aux ;; + 65534) TYPE=tun ;; esac - # The following case statement still has to be replaced by something which - # does not rely on the interface names. + # The following case statement still has to be replaced by something + # which does not rely on the interface names. case $IF in ippp*|isdn*) TYPE=isdn;; ip6tnl*) TYPE=ip6tnl;; # This might be type 769 ... @@ -158,6 +185,8 @@ BONDING_MASTER yes bond ETHERDEVICE _not_empty_ vlan BRIDGE yes bridge + TUNNEL tap tap + TUNNEL tun tun TUNNEL sit sit TUNNEL gre gre TUNNEL ipip ipip @@ -204,13 +233,12 @@ convert_6to4_to_ipv4address () { ADDR=$1 - PART_1=`expr $ADDR : '2002:$[^:]*$:[^:]*:'` - PART_2=`expr $ADDR : '2002:[^:]*:$[^:]*$:'` - if [ "$PART_1" = "" -o "$PART_2" = "" ]; then + LIST=($(IFS=:; echo $ADDR)) + if [ ${#LIST[@]} -ne 4 -o "${LIST[0]}" != "2002" ] ; then echo $ADDR fi - NORM_1=`printf "%04x" 0x$PART_1` - NORM_2=`printf "%04x" 0x$PART_2` + NORM_1=`printf "%04x" 0x${LIST[1]} 2>/dev/null` + NORM_2=`printf "%04x" 0x${LIST[2]} 2>/dev/null` printf "::%u.%u.%u.%u" \ 0x${NORM_1:0:2} 0x${NORM_1:2:2} \ @@ -240,7 +268,7 @@ /sbin/modprobe bonding # If we add module option max_bonds=0 in the modprobe command above then # we may skip the following lines in this if-fi block. - for a in `seq 33`; do + for a in {1..33}; do test -r /sys/class/net/bonding_masters && break usleep 300000 done @@ -252,7 +280,7 @@ if [ ! -d /sys/class/net/$IF/bonding ] ; then echo "+$IF" > /sys/class/net/bonding_masters fi - for a in `seq 33`; do + for a in {1..33}; do test -d /sys/class/net/$IF/bonding && break usleep 300000 done @@ -287,7 +315,7 @@ err_mesg "Option '$OPT_NAME': can't remove $a" fi done - for a in `echo "$OPT_VALUE" | tr ',' ' '` ; do + for a in ${OPT_VALUE//,/ } ; do if ! echo "+$a" > /sys/class/net/$IF/bonding/$OPT_NAME ; then err_mesg "Option '$OPT_NAME': can't add $a" fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/hardware/hwcfg2rules new/sysconfig-0.71.1/scripts/hardware/hwcfg2rules --- old/sysconfig-0.70.8/scripts/hardware/hwcfg2rules 2008-05-20 13:08:22.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/hardware/hwcfg2rules 2008-07-24 10:37:21.000000000 +0200 @@ -13,10 +13,60 @@ cat >> $file <<EOF ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$busid", IMPORT{program}="collect $busid %k $busid $ccwtype-$subtype" ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$ccwtype-$subtype", IMPORT{program}="collect $busid %k $busid $ccwtype-$subtype" -ACTION=="add", ENV{COLLECT_$busid}=="0", ATTR{[ccw/0.0.0150]online}="1" +ACTION=="add", ENV{COLLECT_$busid}=="0", ATTR{[ccw/$busid]online}="1" EOF } +write_zfcp_rules () { + local file=$UDEVDIR/$RULE-$type-${busid}.rules + + echo "# Rules converted from $cfgname" > $file + cat >> $file <<EOF +ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$busid", IMPORT{program}="collect $busid %k $busid zfcp" +ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="zfcp", IMPORT{program}="collect $busid %k $busid zfcp" +EOF + for lun in $ZFCP_LUNS ; do + set -- $(IFS=: ; echo $lun) + tmpwwpn=$1 + for wwpn in $wwpn_list ; do + if [ "$wwpn" == "$1" ] ; then + tmpwwpn= + fi + done + if [ -n "$tmpwwpn" ] ; then + wwpn_list="$wwpn_list $tmpwwpn" + fi + done + for wwpn in $wwpn_list ; do + cat >> $file <<EOF +ACTION=="add", ENV{COLLECT_$busid}=="0", ATTR{[ccw/$busid]port_add}="$wwpn" +EOF + done + cat >> $file <<EOF +ACTION=="add", ENV{COLLECT_$busid}=="0", ATTR{[ccw/$busid]online}="1" +EOF + for lunid in $ZFCP_LUNS ; do + set -- $(IFS=: ; echo $lunid) + wwpn=$1 + lun=$2 + cat >> $file <<EOF +ACTION=="add", SUBSYSTEMS=="ccw", KERNELS=="$busid", TEST=="[ccw/$busid]$wwpn", ATTR{[ccw/$busid]$wwpn/unit_add}="$lun" +EOF + done + +} + +write_iucv_rules () { + local file=$UDEVDIR/$RULE-$type-${id}.rules + local attr + + echo "# Rules converted from $cfgname" > $file + cat >> $file <<EOF +ACTION=="add", SUBSYSTEM=="bus", KERNEL=="iucv", RUN+="modprobe netiucv" +ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="netiucv", ATTR{connection}="$id" +EOF +} + write_ctc_rules () { local file=$UDEVDIR/$RULE-$type-${busid}.rules local attr @@ -155,6 +205,9 @@ bus=$1 busid=$2 ;; + id) + id=$1; + ;; *) echo "Unhandled configuration type \"$devtype\"" exit 1 @@ -162,6 +215,7 @@ esac [ "$bus" ] && [ -z "$busid" ] && echo "No bus ID given" && exit 1 +[ "$devtype" = "id" ] && [ -z "$id" ] && echo "No ID given" && exit 1 if [ "$bus" = "ccw" ] ; then if [ -z "$ccwtype" ] ; then @@ -248,6 +302,9 @@ dasd) write_dasd_rules ;; + zfcp) + write_zfcp_rules + ;; ctc|lcs) write_ctc_rules ;; @@ -259,5 +316,13 @@ ;; esac else - echo "Unknown bus type $bus" + if [ -z "$bus" ] ; then + if [ "$type" = "iucv" ] ; then + write_iucv_rules + else + echo "Unknown type $type" + fi + else + echo "Unknown bus type $bus" + fi fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/hardware/Makefile.am new/sysconfig-0.71.1/scripts/hardware/Makefile.am --- old/sysconfig-0.70.8/scripts/hardware/Makefile.am 2008-05-20 13:08:22.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/hardware/Makefile.am 2008-07-24 09:21:33.000000000 +0200 @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + sbin_SCRIPTS = hwup sysconfig_hardware_SCRIPTS = hwcfg2rules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/ifup new/sysconfig-0.71.1/scripts/ifup --- old/sysconfig-0.70.8/scripts/ifup 2008-05-22 08:42:24.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/ifup 2008-07-24 10:02:13.000000000 +0200 @@ -25,7 +25,7 @@ # Bjoern Jacke # Michal Ludvig <mludvig(a)suse.cz> # -# $Id: ifup 1661 2008-05-22 06:42:23Z mt $ +# $Id: ifup 1678 2008-07-24 08:02:12Z mt $ # usage () { @@ -75,7 +75,7 @@ test -f ./config && . ./config test -f scripts/functions && . scripts/functions || exit $R_INTERNAL -# . scripts/extradebug +test "$DEBUG" = "EXTRA" && . scripts/extradebug ###################################################################### # Commandline parsing @@ -499,6 +499,8 @@ fi if [ -n "$DEVNAME" ] ; then message "`printf " %-9s device: %s" $INTERFACE "$DEVNAME"`" +elif [ -n "$NAME" -a -z "$MESS_NO_IFACE" ] ; then + message "`printf " %-9s name: %s" "$INTERFACE" "$NAME"`" else message "`printf " %-9s %s" "$INTERFACE" "$MESS_NO_IFACE"`" fi @@ -670,24 +672,35 @@ scripts/${SCRIPTNAME}-connection $CONFIG $INTERFACE \ ${OPTIONS:+-o $OPTIONS} fi - - # before setting up interfaces we have to configure wireless NICs + + # FIXME: uff, cleanup cleanup cleanup + if [ "$SCRIPTNAME" = ifup ] ; then + # before setting up interfaces we have to configure + # wireless NICs + # FIXME: really without $INTERFACETYPE check ? scripts/${SCRIPTNAME}-wireless $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} test "$?" -ne 0 && exit - fi - - # Frob vlan interface - if [ "$SCRIPTNAME" = ifup -a "$INTERFACETYPE" = vlan ]; then - scripts/${SCRIPTNAME}-802.1q $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} - fi - # Frob bridge interface - if [ "$INTERFACETYPE" == bridge -a "$SCRIPTNAME" = ifup ]; then - scripts/${SCRIPTNAME}-bridge $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} - test "$?" -ne 0 && exit + case "$INTERFACETYPE" in + vlan) + # Frob vlan interface + scripts/${SCRIPTNAME}-802.1q $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + test "$?" -ne 0 && exit + ;; + bridge) + # Frob bridge interface + scripts/${SCRIPTNAME}-bridge $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + test "$?" -ne 0 && exit + ;; + ipip|sit|gre|tun|tap) + # Frob tunnel interface + scripts/${SCRIPTNAME}-tunnel $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + test "$?" -ne 0 && exit + ;; + esac fi - + # exec if*-ppp for modem and dsl case $INTERFACETYPE in modem|dsl|ppp) @@ -729,6 +742,8 @@ services) : ;; skel) : ;; wireless) : ;; + tun|tap) : ;; + ipip|sit|gre) : ;; *) if [ -x "$INTERFACESCRIPT" ] ; then $INTERFACESCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} @@ -769,7 +784,7 @@ MESSAGE="`$ETHTOOL $ETHTOOL_OPTIONS 2>&1`" RETCODE=$? fi - test $retcode != 0 \ + test $RETCODE != 0 \ && err_mesg "Error while executing: $ethtool $ETHTOOL_OPTIONS" \ || info_mesg "$ethtool $ETHTOOL_OPTIONS" test -n "$MESSAGE" && err_mesg "$MESSAGE" @@ -777,79 +792,10 @@ ###################################################################### -# Tunnel setup +# obsolete 6to4 tunnel hack ? # -if [ "$INTERFACETYPE" = "sit" \ - -o "$INTERFACETYPE" = "gre" \ - -o "$INTERFACETYPE" = "ipip" ]; then - - # Backwards compliance hack: - # TUNNEL_DEVICE is new since SL9.1/SLES9. Up to then TUNNEL_LOCAL_INTERFACE - # was used in configuration files - if [ -z "$TUNNEL_DEVICE" ] ; then - TUNNEL_DEVICE=$TUNNEL_LOCAL_INTERFACE - fi - # Get current interface name of tunnel device - TUNNEL_LOCAL_INTERFACE=$TUNNEL_DEVICE - - # Get IPv4 address of local tunnel endpoint - # in the case it wasn't set in the config file. - if [ -z "$TUNNEL_LOCAL_IPADDR" -a -n "$TUNNEL_LOCAL_INTERFACE" ]; then - TUNNEL_LOCAL_IPADDR=`is_iface_up $TUNNEL_LOCAL_INTERFACE && \ - get_ipv4address $TUNNEL_LOCAL_INTERFACE` - if [ "$?" != 0 ] ; then - logerror "failed to get IPv4 address of $TUNNEL_LOCAL_INTERFACE" \ - "($TUNNEL_DEVICE)" - exit $R_ERROR - fi - fi - - TUNNEL_LOCAL_IPADDR_V6=`printf "%s/16" $(convert_ipv4address_to_6to4 $TUNNEL_LOCAL_IPADDR)` - - case "$SCRIPTNAME" in - ifup) - # Create a new tunnel - MESSAGE=`ip tunnel add $INTERFACE mode "$TUNNEL" \ - ${TUNNEL_LOCAL_IPADDR:+local "$TUNNEL_LOCAL_IPADDR"} \ - ${TUNNEL_REMOTE_IPADDR:+remote "$TUNNEL_REMOTE_IPADDR"} \ - ${TUNNEL_TTL:+ttl "$TUNNEL_TTL"} $TUNNEL_OPTIONS 2>&1` - if [ $? = 0 ] ; then - : - else - logerror "failed to add tunnel $INTERFACE" - logerror "$MESSAGE" - exit $R_ERROR - fi - - MESSAGE=`ip link show $INTERFACE 2>&1` - if [ $? = 0 ] ; then - # This message shuold be printed at the very end - message_if_not_run_from_rc "tunnel $INTERFACE is configured" - else - logerror "failed to add tunnel $INTERFACE" - logerror "$MESSAGE" - logerror "(does it already exist with a different name?)" - exit $R_ERROR - fi - ;; - ifdown) - MESSAGE=`ip tunnel del $INTERFACE 2>&1` - if [ $? = 0 ] ; then - message_if_not_run_from_rc "tunnel $INTERFACE is removed" - else - logerror "failed to delete tunnel $INTERFACE" - logerror "$MESSAGE" - exit $R_ERROR - fi - ;; - esac - - # We only handle bringing up the 6to4 tunnel in a special way. - # Shutting down and querying for it's status is the same - # as for 'static' tunnels. - if [ "$BOOTPROTO" = "6to4" -a "$SCRIPTNAME" != "ifup" ]; then - BOOTPROTO="static" - fi +if [ "$BOOTPROTO" = "6to4" -a "$SCRIPTNAME" != "ifup" ]; then + BOOTPROTO="static" fi @@ -992,33 +938,8 @@ *skip) : ;; - # Configure IPv6 6to4 tunnels. 6to4) - - MESSAGE=`ip link set up dev $INTERFACE $LINK_OPTIONS 2>&1` - if [ $? != 0 ] ; then - logerror "failed to set up interface $INTERFACE" - logerror "$MESSAGE" - exit $R_ERROR - fi - - if [ -n "$MTU" ] ; then - MESSAGE=`ip link set $INTERFACE mtu $MTU 2>&1` - if [ $? !=0 ] ; then - logerror "failed to set MTU for interface $INTERFACE" - logerror "$MESSAGE" - exit $R_ERROR - fi - fi - - MESSAGE=`ip -6 addr add $TUNNEL_LOCAL_IPADDR_V6 dev $INTERFACE 2>&1` - if [ $? != 0 ] ; then - logerror "failed to add address $TUNNEL_LOCAL_IPADDR_V6 to" \ - "interface $INTERFACE" - logerror "$MESSAGE" - exit $R_ERROR - fi - + # just route, configuration handled in $SCRIPTNAME-tunnel ifup-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} retcode=$? ;; @@ -1237,22 +1158,31 @@ fi fi - # after shutting down interfaces ifup-wireless has to kill the wpa daemon if [ "$SCRIPTNAME" = ifdown ] ; then + # after shutting down interfaces ifup-wireless + # has to kill the wpa daemon + # FIXME: again without INTERFACETYPE check? scripts/${SCRIPTNAME}-wireless $CONFIG $INTERFACE \ ${OPTIONS:+-o $OPTIONS} - fi - - # Frob vlan interface, part II - if [ "$SCRIPTNAME" = ifdown -a "$INTERFACETYPE" = vlan ]; then - scripts/${SCRIPTNAME}-802.1q $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} - fi - # Frob bridge interface, part II - if [ "$INTERFACETYPE" == bridge -a "$SCRIPTNAME" != ifup ]; then - scripts/${SCRIPTNAME}-bridge $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + case "$INTERFACETYPE" in + vlan) + # Frob vlan interface, part II + scripts/${SCRIPTNAME}-802.1q $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + test "$?" -ne 0 && exit + ;; + bridge) + # Frob bridge interface, part II + scripts/${SCRIPTNAME}-bridge $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + test "$?" -ne 0 && exit + ;; + ipip|sit|gre|tun|tap) + # Frob tunnel interface, part II + scripts/${SCRIPTNAME}-tunnel $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + test "$?" -ne 0 && exit + ;; + esac fi - fi ###################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/ifup-dhcp new/sysconfig-0.71.1/scripts/ifup-dhcp --- old/sysconfig-0.70.8/scripts/ifup-dhcp 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/ifup-dhcp 2008-07-24 09:21:33.000000000 +0200 @@ -18,7 +18,7 @@ # Author: Christian Zoz <zoz(a)suse.de>, 2002-2006 # Peter Poeml <poeml(a)suse.de>, 2002-2006 # -# $Id: ifup-dhcp 1648 2008-05-14 11:48:31Z mt $ +# $Id: ifup-dhcp 1673 2008-06-24 11:35:58Z mt $ # usage () { @@ -295,6 +295,10 @@ # dhcpcd-hook/ifup machinery [#85849] args="$args -c ${DHCLIENT_SCRIPT_EXE:-/etc/sysconfig/network/scripts/dhcpcd-hook}" + + # avoid deconfiguration of the interface at startup in nfsroot case (bnc#397484) + test "$STARTMODE" == "nfsroot" && args="-p $args" + DHCLIENT_ARGS=$args # just in case /var is not mounted @@ -310,13 +314,20 @@ fi # now start dhcpcd - $DHCLIENT_BIN $DHCLIENT_ARGS $INTERFACE </dev/null &>/dev/null & + ( $DHCLIENT_BIN $DHCLIENT_ARGS $INTERFACE </dev/null ) 2>&1 | $LOGGER -p debug -t "$SCRIPTNAME" & # wait some more time until dhcpcd has done its job. # it would be easier to wait for the pidfile, but it is written later for ((i=0; i<${DHCLIENT_WAIT_AT_BOOT:-15}; i++)); do - if [ -e $info -a ! $info -ot $timestamp ]; then continue - else message_n .\ ; sleep 1 + if [ -e $info -a ! $info -ot $timestamp ]; then + continue + else + message_n .\ ; sleep 1 + fi + if ! dhcpc_on_iface -q ; then + [ $i -lt 2 ] && message_n .\ .\ + message "client NOT running" + exit $R_NOTRUNNING fi done if [ -e $info -a ! $info -ot $timestamp ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/ifup-tunnel new/sysconfig-0.71.1/scripts/ifup-tunnel --- old/sysconfig-0.70.8/scripts/ifup-tunnel 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.71.1/scripts/ifup-tunnel 2008-07-24 09:26:09.000000000 +0200 @@ -0,0 +1,300 @@ +#! /bin/bash +# +# Copyright (c) 2007 SUSE LINUX Products GmbH, Germany. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA +# +# Authors: Marius Tomaschewski <mt(a)suse.de> +# Michal Ludvig <mludvig(a)suse.cz> +# +# The static ipip,gre,sit tunnel code extracted from main ifup script. +# +# $Id: $ +# + +usage () { + echo $@ + echo "Usage: if{up,down,status}-tunnel [<config>] <interface> [-o <options>]" + echo "" + echo "Options are:" + echo " [on]boot : we are currently booting (or shutting down)" + echo " hotplug : we are handling a hotplug event" + echo " auto : alias for onboot" + echo " debug : be verbose" + echo "" + exit $R_USAGE +} + +###################################################################### +# change the working direcory and source some common files +# +R_INTERNAL=1 # internal error, e.g. no config or missing scripts +cd /etc/sysconfig/network || exit $R_INTERNAL +test -f ./config && . ./config +test -f scripts/functions && . scripts/functions || exit $R_INTERNAL + +###################################################################### +# check arguments and how we are called (in case of links) +# +SCRIPTNAME=${0##*/} +debug $* +ACTION=${SCRIPTNAME#if} +ACTION=${ACTION%%-*} +case "${ACTION}" in + up|status|down|check) ;; + *) usage +esac +case "$1" in ""|-h|*help*) usage; esac +CONFIG=$1 +shift +if [ -n "$1" -a "$1" != "-o" ] ; then + INTERFACE=$1 +else + INTERFACE=$CONFIG +fi +shift +test "$1" = "-o" && shift +OPTIONS="$@" +MODE=manual +while [ $# -gt 0 ]; do + case $1 in + boot|onboot) MODE=auto ;; + hotplug) MODE=auto ;; + auto) MODE=auto ;; + quiet) be_quiet_has_gone ;; + debug) DEBUG=yes ;; + *) debug unknown option $1 ;; + esac + shift +done + +###################################################################### +# check presence of configuration file and source it +# +if [ -f ifcfg-$CONFIG ] ; then + . ifcfg-$CONFIG +else + message "could not find configuration file ifcfg-$CONFIG" +fi + + +###################################################################### +# function adding a static ip tunnel +# +iptunnel_add () +{ + # Backwards compliance hack: + # TUNNEL_DEVICE is new since SL9.1/SLES9. Up to then, + # TUNNEL_LOCAL_INTERFACE was used in configurations. + if [ -z "$TUNNEL_DEVICE" ] ; then + TUNNEL_DEVICE=$TUNNEL_LOCAL_INTERFACE + fi + + # Get IPv4 address of local tunnel endpoint + # in the case it wasn't set in the config file. + if [ -z "$TUNNEL_LOCAL_IPADDR" ] ; then + if [ -z "$TUNNEL_DEVICE" ]; then + logerror "set TUNNEL_LOCAL_IPADDR or TUNNEL_DEVICE" + return $R_USAGE + fi + + TUNNEL_LOCAL_IPADDR=`is_iface_up $TUNNEL_DEVICE && \ + get_ipv4address $TUNNEL_DEVICE` + if [ "$?" != 0 ] ; then + logerror "failed to get IPv4 address of $TUNNEL_DEVICE" + return $R_ERROR + fi + fi + + # Create a new tunnel + MESSAGE=`ip tunnel add $INTERFACE mode "$TUNNEL" \ + ${TUNNEL_LOCAL_IPADDR:+local "$TUNNEL_LOCAL_IPADDR"} \ + ${TUNNEL_REMOTE_IPADDR:+remote "$TUNNEL_REMOTE_IPADDR"} \ + ${TUNNEL_TTL:+ttl "$TUNNEL_TTL"} $TUNNEL_OPTIONS 2>&1` + if [ $? != 0 ] ; then + logerror "failed to add tunnel $INTERFACE" + logerror "$MESSAGE" + return $R_ERROR + fi + + # Check if tunnel link exists (needed?) + MESSAGE=`ip link show $INTERFACE 2>&1` + if [ $? != 0 ] ; then + logerror "failed to add tunnel $INTERFACE" + logerror "$MESSAGE" + logerror "(does it already exist with a different name?)" + return $R_ERROR + fi + + case "$BOOTPROTO" in + 6to4) + # convert IPv4 to IPv6 + test -n "$TUNNEL_LOCAL_IPADDR_V6" || + TUNNEL_LOCAL_IPADDR_V6=`printf "%s/16" $(convert_ipv4address_to_6to4 $TUNNEL_LOCAL_IPADDR)` + + MESSAGE=`ip link set up dev $INTERFACE $LINK_OPTIONS 2>&1` + if [ $? != 0 ] ; then + logerror "failed to set up interface $INTERFACE" + logerror "$MESSAGE" + return $R_ERROR + fi + + if [ -n "$MTU" ] ; then + MESSAGE=`ip link set $INTERFACE mtu $MTU 2>&1` + if [ $? !=0 ] ; then + logerror "failed to set MTU for interface $INTERFACE" + logerror "$MESSAGE" + return $R_ERROR + fi + fi + + MESSAGE=`ip -6 addr add $TUNNEL_LOCAL_IPADDR_V6 dev $INTERFACE 2>&1` + if [ $? != 0 ] ; then + logerror "failed to add address $TUNNEL_LOCAL_IPADDR_V6 to" \ + " interface $INTERFACE" + logerror "$MESSAGE" + return $R_ERROR + fi + ;; + esac + + # This message shuold be printed at the very end + message_if_not_run_from_rc "$BOOTPROTO tunnel $INTERFACE is configured" + return $R_SUCCESS +} + +###################################################################### +# function deleting a static ip tunnel +# +iptunnel_del () +{ + MESSAGE=`ip tunnel del $INTERFACE 2>&1` + if [ $? = 0 ] ; then + message_if_not_run_from_rc "tunnel $INTERFACE is removed" + return $R_SUCCESS + else + logerror "failed to delete tunnel $INTERFACE" + logerror "$MESSAGE" + return $R_ERROR + fi +} +###################################################################### +# function returning the path of tunctl utility (in /usr on 10.3) +tunctl_bin () +{ + for tunctl in /bin/tunctl /usr/bin/tunctl ; do + test -x "$tunctl" && echo "$tunctl" + done + echo "" +} + +###################################################################### +# now do what has to be done +# +RETVAL=$R_SUCCESS +case $ACTION in +up) + printf " %-9s " "$INTERFACE" + + case "$INTERFACETYPE" in + sit) + case "$BOOTPROTO" in + static|6to4) + iptunnel_add + RETVAL=$? + ;; + *) + logerror "unsupported tunnel boot protocol $BOOTPROTO" + RETVAL=$R_USAGE + ;; + esac + ;; + gre|ipip) + case "$BOOTPROTO" in + static) + iptunnel_add + RETVAL=$? + ;; + *) + logerror "unsupported tunnel boot protocol $BOOTPROTO" + RETVAL=$R_USAGE + ;; + esac + ;; + tun|tap) + # we use a persistent tunnel by default + if [ "$TUNNEL_SET_PERSISTENT" != no ] ; then + case "$INTERFACETYPE" in + tap) TUNCTL_TYPE_ARG="-p" ;; + tun) TUNCTL_TYPE_ARG="-n" ;; + esac + + tunctl=$(tunctl_bin) + if [ -z "$tunctl" ] ; then + logerror "tunctl not available -- install tunctl package" + exit $R_ERROR + fi + + $tunctl -t $INTERFACE ${TUNCTL_TYPE_ARG} \ + ${TUNNEL_SET_OWNER:+-u "$TUNNEL_SET_OWNER"} \ + ${TUNNEL_SET_GROUP:+-g "$TUNNEL_SET_GROUP"} \ + 2>&1 || exit $R_NODEV + + else + logerror "non-persistent tunnels not supported yet" + exit $R_NODEV + fi + ;; + esac +;; +down) + if is_iface_up $INTERFACE ; then + ip link set dev $INTERFACE down + fi + + case "$INTERFACETYPE" in + tun|tap) + printf " %-9s " "$INTERFACE" + + if [ -d /sys/class/net/$INTERFACE ] ; then + tunctl=$(tunctl_bin) + if [ -z "$tunctl" ] ; then + logerror "tunctl not available -- install tunctl or uml-utilities" + exit $R_ERROR + fi + + $tunctl -d $INTERFACE 2>&1 || RETVAL=$R_ERROR + fi + ;; + sit|gre|ipip) + iptunnel_del + RETVAL=$? + ;; + esac +;; +status) + if is_iface_up $INTERFACE ; then + : ip addr show $INTERFACE + else + RETVAL=$R_NOTRUNNING + fi +;; +check) + : check action not implemented for $INTERFACE +;; +esac + +exit $RETVAL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/ifup-wireless new/sysconfig-0.71.1/scripts/ifup-wireless --- old/sysconfig-0.70.8/scripts/ifup-wireless 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/ifup-wireless 2008-07-24 09:21:33.000000000 +0200 @@ -19,7 +19,7 @@ # # Author: Joachim Gleissner <jg(a)suse.de>, 2005 # -# $Id: ifup-wireless 1648 2008-05-14 11:48:31Z mt $ +# $Id: ifup-wireless 1657 2008-05-19 15:11:50Z mt $ # usage () { @@ -114,7 +114,7 @@ get_network_count() { count=0 - for i in `seq 1 9` ; do + for i in {1..9} ; do W="`eval echo \\$WIRELESS_AUTH_MODE_$i`" if [ -n "`eval echo $\"$W\"`" ]; then count=$((count+1)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/Makefile.am new/sysconfig-0.71.1/scripts/Makefile.am --- old/sysconfig-0.70.8/scripts/Makefile.am 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/Makefile.am 2008-07-24 09:21:33.000000000 +0200 @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + SUBDIRS = hardware sysconfig_network_scripts_SCRIPTS = functions \ @@ -16,6 +19,7 @@ ifup-services \ ifup-skel \ ifup-wireless \ + ifup-tunnel \ dhcpcd-hook \ drop-hotplug-symlink.sh \ ifplugd-selectif \ @@ -55,6 +59,8 @@ ln -sf ifdown-connection $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifstatus-connection ln -sf ifup-wireless $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifstatus-wireless ln -sf ifup-wireless $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifdown-wireless + ln -sf ifup-tunnel $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifstatus-tunnel + ln -sf ifup-tunnel $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifdown-tunnel ln -sf ifup-ppp $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifdown-ppp ln -sf ifup-ppp $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifstatus-ppp ln -sf ifup-802.1q $(DESTDIR)/$(sysconfig_network_scriptsdir)/ifdown-802.1q diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/netcontrol_global_hooks new/sysconfig-0.71.1/scripts/netcontrol_global_hooks --- old/sysconfig-0.70.8/scripts/netcontrol_global_hooks 2008-05-20 13:08:23.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/netcontrol_global_hooks 2008-07-24 09:21:33.000000000 +0200 @@ -40,7 +40,6 @@ shopt -s nullglob for a in if-${ACTION}.d/*; do test -x "$a" || continue - get_config_name info_mesg "calling '`pwd`/$a '${INTERFACE}' ${INTERFACE} -o nm'" $a "${INTERFACE}" ${INTERFACE} -o nm done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/scripts/network new/sysconfig-0.71.1/scripts/network --- old/sysconfig-0.70.8/scripts/network 2008-05-22 08:42:24.000000000 +0200 +++ new/sysconfig-0.71.1/scripts/network 2008-07-24 09:21:33.000000000 +0200 @@ -21,7 +21,7 @@ # Christian Zoz <zoz(a)suse.de> # Mads Martin J�rgensen <mmj(a)suse.de> # -# $Id: network 1661 2008-05-22 06:42:23Z mt $ +# $Id: network 1670 2008-05-29 15:53:27Z mt $ # # /etc/init.d/network # @@ -49,7 +49,7 @@ rc_exit fi -# . scripts/extradebug +test "$DEBUG" = "EXTRA" && . scripts/extradebug # Only use ifup option 'onboot' if booting or changing runlevel # Therefore we check if we were called from init @@ -378,7 +378,7 @@ *ppp|dsl|modem|isdn) DIALUP_IFACES="$DIALUP_IFACES $b" ;; - ipip|sit|gre) + ipip|sit|gre|tun|tap) TUNNEL_IFACES="$TUNNEL_IFACES $b" ;; bridge) @@ -436,8 +436,9 @@ # take all configurations except these # - which seem to be backup files # - which have STARTMODE != onboot/auto - # - which are dialup or tunnel interfaces - # - which serve as slave interfaces for bonding, vlan or tunnels + # - which are virtual, dialup or tunnel interfaces + # - which serve as slave interfaces for bonding, vlan + # or tunnels, except the slave interfaces are physical while IFS=- read a b; do case "$b" in ""|*~|*.old|*.rpmnew|*.rpmsave|*.scpmbackup|lo) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/tools/Makefile.am new/sysconfig-0.71.1/tools/Makefile.am --- old/sysconfig-0.70.8/tools/Makefile.am 2008-05-20 13:08:21.000000000 +0200 +++ new/sysconfig-0.71.1/tools/Makefile.am 2008-07-24 09:21:31.000000000 +0200 @@ -1,7 +1,7 @@ # vim: ai CLEANFILES = *~ - +MAINTAINERCLEANFILES = Makefile.in sbin_PROGRAMS = ifuser \ autoip diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.70.8/VERSION new/sysconfig-0.71.1/VERSION --- old/sysconfig-0.70.8/VERSION 2008-05-20 13:08:10.000000000 +0200 +++ new/sysconfig-0.71.1/VERSION 2008-07-24 10:02:53.000000000 +0200 @@ -1 +1 @@ -0.70.8 +0.71.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0