May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit sysconfig
by root＠suse.de 19 May '06

19 May '06

Hello community, here is the log from the commit of package sysconfig checked in at Fri May 19 02:00:02 CEST 2006. -------- --- sysconfig/sysconfig.changes 2006-04-28 15:33:39.000000000 +0200 +++ sysconfig/sysconfig.changes 2006-05-18 20:52:16.000000000 +0200 @@ -1,0 +2,15 @@ +Thu May 18 16:19:48 CEST 2006 - zoz(a)suse.de + +- rcnetwork: quoted two occurrences $OLDPWD to allow spaces in + directory names. (Bug 174029) +- added sysconfig variable NM_ONLINE_TIMEOUT. If not set to 0, then + rcnetwork will wait at least this time until a network connection + has established. (Bug 169632) +- start NMdispatcher before and stop it after NM itself (Bug 169632) + +------------------------------------------------------------------- +Tue May 9 09:38:58 CEST 2006 - poeml(a)suse.de + +- fixed a debug message in update script. Show the right sysfs path. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.wIFXUS/_old 2006-05-19 01:59:41.000000000 +0200 +++ /var/tmp/diff_new_pack.wIFXUS/_new 2006-05-19 01:59:41.000000000 +0200 @@ -13,7 +13,7 @@ Name: sysconfig BuildRequires: autofs portmap sysfsutils ypbind Version: 0.50.9 -Release: 10 +Release: 13 Summary: The sysconfig scheme Group: System/Base License: GPL @@ -206,6 +206,15 @@ %{insserv_cleanup} %changelog -n sysconfig +* Thu May 18 2006 - zoz(a)suse.de +- rcnetwork: quoted two occurrences $OLDPWD to allow spaces in + directory names. (Bug 174029) +- added sysconfig variable NM_ONLINE_TIMEOUT. If not set to 0, then + rcnetwork will wait at least this time until a network connection + has established. (Bug 169632) +- start NMdispatcher before and stop it after NM itself (Bug 169632) +* Tue May 09 2006 - poeml(a)suse.de +- fixed a debug message in update script. Show the right sysfs path. * Fri Apr 28 2006 - jg(a)suse.de - using wrapper script to kill ipw3945d (Bug 170099) * Thu Apr 13 2006 - zoz(a)suse.de ++++++ sysconfig-0.50.9.tar.bz2 ++++++ ++++ 14573 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit src_vipa
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package src_vipa checked in at Fri May 19 01:59:30 CEST 2006. -------- --- src_vipa/src_vipa.changes 2006-01-25 21:41:48.000000000 +0100 +++ src_vipa/src_vipa.changes 2006-05-18 18:45:29.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 18 18:45:01 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Fix building of shared library. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ src_vipa.spec ++++++ --- /var/tmp/diff_new_pack.0QlwY4/_old 2006-05-19 01:58:26.000000000 +0200 +++ /var/tmp/diff_new_pack.0QlwY4/_new 2006-05-19 01:58:26.000000000 +0200 @@ -5,14 +5,14 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: src_vipa URL: http://www10.software.ibm.com/developerworks/opensource/linux390/useful_add… Version: 2.0.3 -Release: 1 +Release: 12 Summary: Virtual Source IP address support for HA solutions License: Other License(s), see package Group: Productivity/Clustering/HA @@ -55,6 +55,9 @@ %attr(555,root,root) %_libdir/src_vipa* %changelog -n src_vipa +* Thu May 18 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Fix building of shared library. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Apr 12 2005 - ihno(a)suse.de ++++++ src_vipa.makefile.patch ++++++ --- /var/tmp/diff_new_pack.0QlwY4/_old 2006-05-19 01:58:27.000000000 +0200 +++ /var/tmp/diff_new_pack.0QlwY4/_new 2006-05-19 01:58:27.000000000 +0200 @@ -1,15 +1,17 @@ --- Makefile +++ Makefile -@@ -13,7 +13,8 @@ +@@ -13,8 +13,9 @@ # CC=gcc -CC_FLAGS=-fPIC -Wall +-LD=ld +LIBC=$(shell ldd `which bash`|grep 'libc.so.6'| sed 's/^.*=> *//g;s/ .*$$//g') -+CC_FLAGS=-fPIC -Wall -DLIBC_PATH=\"$(LIBC)\" - LD=ld ++CC_FLAGS=-fPIC $(RPM_OPT_FLAGS) -DLIBC_PATH=\"$(LIBC)\" ++LD=$(CC) LD_FLAGS=-shared INSTALL=install + --- src_vipa.c +++ src_vipa.c @@ -42,7 +42,7 @@ @@ -21,3 +23,21 @@ #define DLOPEN_FLAG RTLD_LAZY +@@ -1255,7 +1255,7 @@ + } + + #ifndef LC_TEST +-void _init(void) ++static void __attribute__((constructor)) _init(void) + { + leader_pid = getpid(); + init_mutexes(); +@@ -1265,7 +1265,7 @@ + read_config_file(); + } + +-void _fini(void) ++static void __attribute__((destructor)) _fini(void) + { + if (dl_handle) dlclose(dl_handle); + destroy_shm(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit procps
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package procps checked in at Fri May 19 01:58:21 CEST 2006. -------- --- procps/procps.changes 2006-03-21 12:30:04.000000000 +0100 +++ procps/procps.changes 2006-05-18 19:05:50.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 18:37:56 CEST 2006 - werner(a)suse.de + +- Add stealtime patch (bug #86394) + +------------------------------------------------------------------- New: ---- procps-3.2.6-stealtime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.HrHNf4/_old 2006-05-19 01:57:05.000000000 +0200 +++ /var/tmp/diff_new_pack.HrHNf4/_new 2006-05-19 01:57:05.000000000 +0200 @@ -17,7 +17,7 @@ PreReq: %fillup_prereq %insserv_prereq Autoreqprov: on Version: 3.2.6 -Release: 11 +Release: 18 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -42,6 +42,7 @@ Patch16: procps-3.2.5-cpu_hotplug.patch Patch17: procps-3.2.5-CPU-states.patch Patch18: procps-3.2.6-cpu-field-width.patch +Patch19: procps-3.2.6-stealtime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -88,6 +89,7 @@ %patch16 -p1 %patch17 %patch18 +%patch19 -p1 %build make CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ @@ -153,6 +155,8 @@ %_mandir/man8/sysctl.8.gz %changelog -n procps +* Thu May 18 2006 - werner(a)suse.de +- Add stealtime patch (bug #86394) * Mon Mar 20 2006 - hvogel(a)suse.de - fix %%CPU column format [#159480] * Thu Mar 16 2006 - hvogel(a)suse.de ++++++ procps-3.2.6-stealtime.patch ++++++ From: Martin Schwidefsky <schwidefsky(a)de.ibm.com> [patch] procps: add cpu steal time fields vmstat and top. Make use of the cpu steal time field in /proc/stat that has been introduced by the cputime patch with kernel version 2.6.11. The new output of top looks like this: top - 09:50:20 up 11 min, 3 users, load average: 8.94, 7.17, 3.82 Tasks: 78 total, 8 running, 70 sleeping, 0 stopped, 0 zombie Cpu0 : 38.7%us, 4.2%sy, 0.0%ni, 0.0%id, 2.4%wa, 1.8%hi, 0.0%si, 53.0%st Cpu1 : 38.5%us, 0.6%sy, 0.0%ni, 5.1%id, 1.3%wa, 1.9%hi, 0.0%si, 52.6%st Cpu2 : 54.0%us, 0.6%sy, 0.0%ni, 0.6%id, 4.9%wa, 1.2%hi, 0.0%si, 38.7%st Cpu3 : 49.1%us, 0.6%sy, 0.0%ni, 1.2%id, 0.0%wa, 0.0%hi, 0.0%si, 49.1%st Cpu4 : 35.9%us, 1.2%sy, 0.0%ni, 15.0%id, 0.6%wa, 1.8%hi, 0.0%si, 45.5%st Cpu5 : 43.0%us, 2.1%sy, 0.7%ni, 0.0%id, 4.2%wa, 1.4%hi, 0.0%si, 48.6%st Mem: 251832k total, 155448k used, 96384k free, 1212k buffers Swap: 524248k total, 17716k used, 506532k free, 18096k cached PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 20629 root 25 0 30572 27m 7076 R 55.2 11.1 0:02.14 cc1 20617 root 25 0 40600 37m 7076 R 47.0 15.1 0:03.04 cc1 20635 root 24 0 26356 20m 7076 R 42.3 8.4 0:00.75 cc1 20638 root 25 0 23196 17m 7076 R 27.0 7.2 0:00.46 cc1 20642 root 25 0 15028 9824 7076 R 18.2 3.9 0:00.31 cc1 20644 root 20 0 14852 9648 7076 R 17.0 3.8 0:00.29 cc1 26 root 5 -10 0 0 0 S 0.6 0.0 0:00.03 kblockd/5 915 root 16 0 3012 884 2788 R 0.6 0.4 0:02.33 top 1 root 16 0 2020 284 1844 S 0.0 0.1 0:00.06 init and the output of vmstat looks like this: procs -----------memory---------- ---swap-- -----io---- -system-- -----cpu------ r b swpd free buff cache si so bi bo in cs us sy id wa st 6 0 0 47416 22024 103296 0 0 0 0 564 195 63 7 8 0 22 6 0 0 46128 22060 104300 0 0 0 308 598 181 65 6 8 0 21 7 0 0 34096 22088 104012 0 0 0 0 608 103 68 6 1 0 25 6 0 0 12336 22108 104512 0 0 0 2628 628 160 68 3 3 3 23 6 0 0 26544 22124 105016 0 0 0 0 588 99 69 4 3 0 23 6 0 0 19744 22148 105252 0 0 0 0 600 192 64 6 5 0 25 6 0 0 27768 22192 105468 0 0 0 548 619 174 67 5 3 0 25 7 0 0 37168 22216 106484 0 0 0 0 561 117 67 6 8 0 19 The patch has been created against the CVS version of procps dated 05/03/2006. Signed-off-by: Martin Schwidefsky <schwidefsky(a)de.ibm.com> --- proc/sysinfo.c | 27 +++++++++++++++++---------- proc/sysinfo.h | 4 ++-- top.c | 22 +++++++++++++++------- top.h | 6 ++++-- vmstat.8 | 1 + vmstat.c | 39 +++++++++++++++++++++++---------------- 6 files changed, 62 insertions(+), 37 deletions(-) diff -urpN procps/proc/sysinfo.c procps-cputime/proc/sysinfo.c --- procps/proc/sysinfo.c 2006-03-05 19:29:10.000000000 +0100 +++ procps-cputime/proc/sysinfo.c 2006-03-05 19:41:10.000000000 +0100 @@ -238,11 +238,11 @@ static void init_libproc(void){ #define NAN (-0.0) #endif #define JT unsigned long long -void seven_cpu_numbers(double *restrict uret, double *restrict nret, double *restrict sret, double *restrict iret, double *restrict wret, double *restrict xret, double *restrict yret){ - double tmp_u, tmp_n, tmp_s, tmp_i, tmp_w, tmp_x, tmp_y; +void eight_cpu_numbers(double *restrict uret, double *restrict nret, double *restrict sret, double *restrict iret, double *restrict wret, double *restrict xret, double *restrict yret, double *restrict zret){ + double tmp_u, tmp_n, tmp_s, tmp_i, tmp_w, tmp_x, tmp_y, tmp_z; double scale; /* scale values to % */ - static JT old_u, old_n, old_s, old_i, old_w, old_x, old_y; - JT new_u, new_n, new_s, new_i, new_w, new_x, new_y; + static JT old_u, old_n, old_s, old_i, old_w, old_x, old_y, old_z; + JT new_u, new_n, new_s, new_i, new_w, new_x, new_y, new_z; JT ticks_past; /* avoid div-by-0 by not calling too often :-( */ tmp_w = 0.0; @@ -251,10 +251,12 @@ void seven_cpu_numbers(double *restrict new_x = 0; tmp_y = 0.0; new_y = 0; + tmp_z = 0.0; + new_z = 0; FILE_TO_BUF(STAT_FILE,stat_fd); - sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &new_u, &new_n, &new_s, &new_i, &new_w, &new_x, &new_y); - ticks_past = (new_u+new_n+new_s+new_i+new_w+new_x+new_y)-(old_u+old_n+old_s+old_i+old_w+old_x+old_y); + sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &new_u, &new_n, &new_s, &new_i, &new_w, &new_x, &new_y, &new_z); + ticks_past = (new_u+new_n+new_s+new_i+new_w+new_x+new_y+new_z)-(old_u+old_n+old_s+old_i+old_w+old_x+old_y+old_z); if(ticks_past){ scale = 100.0 / (double)ticks_past; tmp_u = ( (double)new_u - (double)old_u ) * scale; @@ -264,6 +266,7 @@ void seven_cpu_numbers(double *restrict tmp_w = ( (double)new_w - (double)old_w ) * scale; tmp_x = ( (double)new_x - (double)old_x ) * scale; tmp_y = ( (double)new_y - (double)old_y ) * scale; + tmp_z = ( (double)new_z - (double)old_z ) * scale; }else{ tmp_u = NAN; tmp_n = NAN; @@ -272,14 +275,16 @@ void seven_cpu_numbers(double *restrict tmp_w = NAN; tmp_x = NAN; tmp_y = NAN; + tmp_z = NAN; } SET_IF_DESIRED(uret, tmp_u); SET_IF_DESIRED(nret, tmp_n); SET_IF_DESIRED(sret, tmp_s); SET_IF_DESIRED(iret, tmp_i); SET_IF_DESIRED(wret, tmp_w); - SET_IF_DESIRED(iret, tmp_x); - SET_IF_DESIRED(wret, tmp_y); + SET_IF_DESIRED(xret, tmp_x); + SET_IF_DESIRED(yret, tmp_y); + SET_IF_DESIRED(zret, tmp_z); old_u=new_u; old_n=new_n; old_s=new_s; @@ -287,6 +292,7 @@ void seven_cpu_numbers(double *restrict old_w=new_w; old_i=new_x; old_w=new_y; + old_z=new_z; } #undef JT #endif @@ -361,7 +367,7 @@ static void getrunners(unsigned int *res /***********************************************************************/ -void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, +void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz, unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout, unsigned *restrict intr, unsigned *restrict ctxt, unsigned int *restrict running, unsigned int *restrict blocked, @@ -384,9 +390,10 @@ void getstat(jiff *restrict cuse, jiff * *ciow = 0; /* not separated out until the 2.5.41 kernel */ *cxxx = 0; /* not separated out until the 2.6.0-test4 kernel */ *cyyy = 0; /* not separated out until the 2.6.0-test4 kernel */ + *czzz = 0; /* not separated out until the 2.6.11 kernel */ b = strstr(buff, "cpu "); - if(b) sscanf(b, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", cuse, cice, csys, cide, ciow, cxxx, cyyy); + if(b) sscanf(b, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", cuse, cice, csys, cide, ciow, cxxx, cyyy, czzz); b = strstr(buff, "page "); if(b) sscanf(b, "page %lu %lu", pin, pout); diff -urpN procps/proc/sysinfo.h procps-cputime/proc/sysinfo.h --- procps/proc/sysinfo.h 2006-03-05 19:29:10.000000000 +0100 +++ procps-cputime/proc/sysinfo.h 2006-03-05 19:41:49.000000000 +0100 @@ -12,7 +12,7 @@ extern int have_privs; /* boolean, t #if 0 #define JT double -extern void seven_cpu_numbers(JT *uret, JT *nret, JT *sret, JT *iret, JT *wret, JT *xret, JT *yret); +extern void eight_cpu_numbers(JT *uret, JT *nret, JT *sret, JT *iret, JT *wret, JT *xret, JT *yret); #undef JT #endif @@ -56,7 +56,7 @@ extern unsigned long kb_pagetables; #define BUFFSIZE (64*1024) typedef unsigned long long jiff; -extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, +extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz, unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout, unsigned *restrict intr, unsigned *restrict ctxt, unsigned int *restrict running, unsigned int *restrict blocked, diff -urpN procps/top.c procps-cputime/top.c --- procps/top.c 2006-03-05 19:29:10.000000000 +0100 +++ procps-cputime/top.c 2006-03-05 19:44:55.000000000 +0100 @@ -932,14 +932,16 @@ static CPU_t *cpus_refresh (CPU_t *cpus) if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); cpus[cpu_max].x = 0; // FIXME: can't tell by kernel version number cpus[cpu_max].y = 0; // FIXME: can't tell by kernel version number - num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", + cpus[cpu_max].z = 0; // FIXME: can't tell by kernel version number + num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &cpus[cpu_max].u, &cpus[cpu_max].n, &cpus[cpu_max].s, &cpus[cpu_max].i, &cpus[cpu_max].w, &cpus[cpu_max].x, - &cpus[cpu_max].y + &cpus[cpu_max].y, + &cpus[cpu_max].z ); if (num < 4) std_err("failed /proc/stat read"); @@ -955,9 +957,10 @@ static CPU_t *cpus_refresh (CPU_t *cpus) if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); cpus[i].x = 0; // FIXME: can't tell by kernel version number cpus[i].y = 0; // FIXME: can't tell by kernel version number - num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu", + cpus[i].z = 0; // FIXME: can't tell by kernel version number + num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &cpus[i].id, - &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y + &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z ); if (num < 4) std_err("failed /proc/stat read"); @@ -1599,6 +1602,8 @@ static void before (char *me) States_fmts = STATES_line2x5; if (linux_version_code >= LINUX_VERSION(2, 6, 0)) // grrr... only some 2.6.0-testX :-( States_fmts = STATES_line2x6; + if (linux_version_code >= LINUX_VERSION(2, 6, 11)) + States_fmts = STATES_line2x7; /* get virtual page size -- nearing huge! */ Page_size = getpagesize(); @@ -2861,7 +2866,7 @@ static void summaryhlp (CPU_t *cpu, cons // we'll trim to zero if we get negative time ticks, // which has happened with some SMP kernels (pre-2.4?) #define TRIMz(x) ((tz = (SIC_t)(x)) < 0 ? 0 : tz) - SIC_t u_frme, s_frme, n_frme, i_frme, w_frme, x_frme, y_frme, tot_frme, tz; + SIC_t u_frme, s_frme, n_frme, i_frme, w_frme, x_frme, y_frme, z_frme, tot_frme, tz; float scale; u_frme = cpu->u - cpu->u_sav; @@ -2871,7 +2876,8 @@ static void summaryhlp (CPU_t *cpu, cons w_frme = cpu->w - cpu->w_sav; x_frme = cpu->x - cpu->x_sav; y_frme = cpu->y - cpu->y_sav; - tot_frme = u_frme + s_frme + n_frme + i_frme + w_frme + x_frme + y_frme; + z_frme = cpu->z - cpu->z_sav; + tot_frme = u_frme + s_frme + n_frme + i_frme + w_frme + x_frme + y_frme + z_frme; if (tot_frme < 1) tot_frme = 1; scale = 100.0 / (float)tot_frme; @@ -2888,7 +2894,8 @@ static void summaryhlp (CPU_t *cpu, cons (float)i_frme * scale, (float)w_frme * scale, (float)x_frme * scale, - (float)y_frme * scale + (float)y_frme * scale, + (float)z_frme * scale ) ); Msg_row += 1; @@ -2901,6 +2908,7 @@ static void summaryhlp (CPU_t *cpu, cons cpu->w_sav = cpu->w; cpu->x_sav = cpu->x; cpu->y_sav = cpu->y; + cpu->z_sav = cpu->z; #undef TRIMz } diff -urpN procps/top.h procps-cputime/top.h --- procps/top.h 2006-03-05 19:29:10.000000000 +0100 +++ procps-cputime/top.h 2006-03-05 19:44:19.000000000 +0100 @@ -211,8 +211,8 @@ typedef struct HST_t { // calculations. It exists primarily for SMP support but serves // all environments. typedef struct CPU_t { - TIC_t u, n, s, i, w, x, y; // as represented in /proc/stat - TIC_t u_sav, s_sav, n_sav, i_sav, w_sav, x_sav, y_sav; // in the order of our display + TIC_t u, n, s, i, w, x, y, z; // as represented in /proc/stat + TIC_t u_sav, s_sav, n_sav, i_sav, w_sav, x_sav, y_sav, z_sav; // in the order of our display unsigned id; // the CPU ID number } CPU_t; @@ -389,6 +389,8 @@ typedef struct WIN_t { " %#5.1f%% \02user,\03 %#5.1f%% \02system,\03 %#5.1f%% \02nice,\03 %#5.1f%% \02idle,\03 %#5.1f%% \02IO-wait\03\n" #define STATES_line2x6 "%s\03" \ " %#4.1f%% \02us,\03 %#4.1f%% \02sy,\03 %#4.1f%% \02ni,\03 %#4.1f%% \02id,\03 %#4.1f%% \02wa,\03 %#4.1f%% \02hi,\03 %#4.1f%% \02si\03\n" +#define STATES_line2x7 "%s\03" \ + "%#5.1f%%\02us,\03%#5.1f%%\02sy,\03%#5.1f%%\02ni,\03%#5.1f%%\02id,\03%#5.1f%%\02wa,\03%#5.1f%%\02hi,\03%#5.1f%%\02si,\03%#5.1f%%\02st\03\n" #ifdef CASEUP_SUMMK #define MEMORY_line1 "Mem: \03" \ " %8uK \02total,\03 %8uK \02used,\03 %8uK \02free,\03 %8uK \02buffers\03\n" diff -urpN procps/vmstat.8 procps-cputime/vmstat.8 --- procps/vmstat.8 2003-08-11 01:40:41.000000000 +0200 +++ procps-cputime/vmstat.8 2006-03-05 19:30:14.000000000 +0100 @@ -114,6 +114,7 @@ us: Time spent running non-kernel code. sy: Time spent running kernel code. (system time) id: Time spent idle. Prior to Linux 2.5.41, this includes IO-wait time. wa: Time spent waiting for IO. Prior to Linux 2.5.41, shown as zero. +st: Time spent in involuntary wait. Prior to Linux 2.6.11, shown as zero. .PP .SH FIELD DESCRIPTION FOR DISK MODE diff -urpN procps/vmstat.c procps-cputime/vmstat.c --- procps/vmstat.c 2006-03-05 19:29:10.000000000 +0100 +++ procps-cputime/vmstat.c 2006-03-05 19:30:14.000000000 +0100 @@ -150,15 +150,15 @@ static int format_1000(unsigned long lon //////////////////////////////////////////////////////////////////////////// static void new_header(void){ - printf("procs -----------memory---------- ---swap-- -----io---- --system-- ----cpu----\n"); + printf("procs -----------memory---------- ---swap-- -----io---- -system-- -----cpu------\n"); printf( - "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %5s %2s %2s %2s %2s\n", + "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %4s %2s %2s %2s %2s %2s\n", "r","b", "swpd", "free", a_option?"inact":"buff", a_option?"active":"cache", "si","so", "bi","bo", "in","cs", - "us","sy","id","wa" + "us","sy","id","wa", "st" ); } @@ -173,13 +173,13 @@ static unsigned long unitConvert(unsigne //////////////////////////////////////////////////////////////////////////// static void new_format(void) { - const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %5u %2u %2u %2u %2u\n"; + const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %4u %2u %2u %2u %2u %2u\n"; unsigned int tog=0; /* toggle switch for cleaner code */ unsigned int i; unsigned int hz = Hertz; unsigned int running,blocked,dummy_1,dummy_2; - jiff cpu_use[2], cpu_nic[2], cpu_sys[2], cpu_idl[2], cpu_iow[2], cpu_xxx[2], cpu_yyy[2]; - jiff duse, dsys, didl, diow, Div, divo2; + jiff cpu_use[2], cpu_nic[2], cpu_sys[2], cpu_idl[2], cpu_iow[2], cpu_xxx[2], cpu_yyy[2], cpu_zzz[2]; + jiff duse, dsys, didl, diow, dstl, Div, divo2; unsigned long pgpgin[2], pgpgout[2], pswpin[2], pswpout[2]; unsigned int intr[2], ctxt[2]; unsigned int sleep_half; @@ -190,7 +190,7 @@ static void new_format(void) { new_header(); meminfo(); - getstat(cpu_use,cpu_nic,cpu_sys,cpu_idl,cpu_iow,cpu_xxx,cpu_yyy, + getstat(cpu_use,cpu_nic,cpu_sys,cpu_idl,cpu_iow,cpu_xxx,cpu_yyy,cpu_zzz, pgpgin,pgpgout,pswpin,pswpout, intr,ctxt, &running,&blocked, @@ -200,7 +200,8 @@ static void new_format(void) { dsys= *cpu_sys + *cpu_xxx + *cpu_yyy; didl= *cpu_idl; diow= *cpu_iow; - Div= duse+dsys+didl+diow; + dstl= *cpu_zzz; + Div= duse+dsys+didl+diow+dstl; divo2= Div/2UL; printf(format, running, blocked, @@ -216,7 +217,8 @@ static void new_format(void) { (unsigned)( (100*duse + divo2) / Div ), (unsigned)( (100*dsys + divo2) / Div ), (unsigned)( (100*didl + divo2) / Div ), - (unsigned)( (100*diow + divo2) / Div ) + (unsigned)( (100*diow + divo2) / Div ), + (unsigned)( (100*dstl + divo2) / Div ) ); for(i=1;i<num_updates;i++) { /* \\\\\\\\\\\\\\\\\\\\ main loop ////////////////// */ @@ -226,7 +228,7 @@ static void new_format(void) { meminfo(); - getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,cpu_iow+tog,cpu_xxx+tog,cpu_yyy+tog, + getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,cpu_iow+tog,cpu_xxx+tog,cpu_yyy+tog,cpu_zzz+tog, pgpgin+tog,pgpgout+tog,pswpin+tog,pswpout+tog, intr+tog,ctxt+tog, &running,&blocked, @@ -236,6 +238,7 @@ static void new_format(void) { dsys= cpu_sys[tog]-cpu_sys[!tog] + cpu_xxx[tog]-cpu_xxx[!tog] + cpu_yyy[tog]-cpu_yyy[!tog]; didl= cpu_idl[tog]-cpu_idl[!tog]; diow= cpu_iow[tog]-cpu_iow[!tog]; + dstl= cpu_zzz[tog]-cpu_zzz[!tog]; /* idle can run backwards for a moment -- kernel "feature" */ if(debt){ @@ -247,7 +250,7 @@ static void new_format(void) { didl = 0; } - Div= duse+dsys+didl+diow; + Div= duse+dsys+didl+diow+dstl; divo2= Div/2UL; printf(format, running, blocked, @@ -263,7 +266,8 @@ static void new_format(void) { (unsigned)( (100*duse+divo2)/Div ), /*us*/ (unsigned)( (100*dsys+divo2)/Div ), /*sy*/ (unsigned)( (100*didl+divo2)/Div ), /*id*/ - (unsigned)( (100*diow+divo2)/Div ) /*wa*/ + (unsigned)( (100*diow+divo2)/Div ), /*wa*/ + (unsigned)( (100*dstl+divo2)/Div ) /*st*/ ); } } @@ -504,13 +508,14 @@ static void disksum_format(void) { static void sum_format(void) { unsigned int running, blocked, btime, processes; - jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy; + jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy, cpu_zzz; unsigned long pgpgin, pgpgout, pswpin, pswpout; unsigned int intr, ctxt; meminfo(); - getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy, + getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, + &cpu_iow, &cpu_xxx, &cpu_yyy, &cpu_zzz, &pgpgin, &pgpgout, &pswpin, &pswpout, &intr, &ctxt, &running, &blocked, @@ -533,6 +538,7 @@ static void sum_format(void) { printf("%13Lu IO-wait cpu ticks\n", cpu_iow); printf("%13Lu IRQ cpu ticks\n", cpu_xxx); printf("%13Lu softirq cpu ticks\n", cpu_yyy); + printf("%13Lu steal cpu ticks\n", cpu_zzz); printf("%13lu pages paged in\n", pgpgin); printf("%13lu pages paged out\n", pgpgout); printf("%13lu pages swapped in\n", pswpin); @@ -547,11 +553,12 @@ static void sum_format(void) { static void fork_format(void) { unsigned int running, blocked, btime, processes; - jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy; + jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy, cpu_zzz; unsigned long pgpgin, pgpgout, pswpin, pswpout; unsigned int intr, ctxt; - getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy, + getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, + &cpu_iow, &cpu_xxx, &cpu_yyy, &cpu_zzz, &pgpgin, &pgpgout, &pswpin, &pswpout, &intr, &ctxt, &running, &blocked, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Fri May 19 01:50:41 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-05-18 16:46:53.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-05-18 19:26:42.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 18 19:25:05 CEST 2006 - hmueller(a)suse.de + +- changes id strings from + 1 to 7 and 21 to 27 ( #173920) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.NiuklT/_old 2006-05-19 01:48:01.000000000 +0200 +++ /var/tmp/diff_new_pack.NiuklT/_new 2006-05-19 01:48:01.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1.0 -Release: 45 +Release: 46 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Thu May 18 2006 - hmueller(a)suse.de +- changes id strings from + 1 to 7 and 21 to 27 ( #173920) * Thu May 18 2006 - kkaempf(a)suse.de - dont keep sources list in query-system, its unused. (#176301) - rev 3409 ++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h --- old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-05-18 12:07:07.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-05-18 19:14:45.000000000 +0200 @@ -51,26 +51,26 @@ { virtual bool askUserToAcceptUnsignedFile( const std::string &file ) { - DBG << "1|" << file << std::endl; - std::cout << "1|" << file << std::endl; + DBG << "21|" << file << std::endl; + std::cout << "21|" << file << std::endl; return readCallbackAnswer(); } virtual bool askUserToAcceptUnknownKey( const std::string &file, const std::string &keyid, const std::string &keyname, const std::string &fingerprint ) { - DBG << "2|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; - std::cout << "2|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; + DBG << "22|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; + std::cout << "22|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; return readCallbackAnswer(); } virtual bool askUserToTrustKey( const std::string &keyid, const std::string &keyname, const std::string &fingerprint ) { - DBG << "3|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; - std::cout << "3|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; + DBG << "23|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; + std::cout << "23|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; return readCallbackAnswer(); } virtual bool askUserToAcceptVerificationFailed( const std::string &file, const std::string &keyid, const std::string &keyname, const std::string &fingerprint ) { - DBG << "4|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; - std::cout << "4|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; + DBG << "24|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; + std::cout << "24|" << file << "|" << keyid << "|" << keyname << "|" << fingerprint << std::endl; return readCallbackAnswer(); } }; @@ -80,20 +80,20 @@ { virtual bool askUserToAcceptNoDigest( const zypp::Pathname &file ) { - DBG << "5|" << file << std::endl; - std::cout << "5|" << file << std::endl; + DBG << "25|" << file << std::endl; + std::cout << "25|" << file << std::endl; return readCallbackAnswer(); } virtual bool askUserToAccepUnknownDigest( const Pathname &file, const std::string &name ) { - DBG << "6|" << file << "|" << name << std::endl; - std::cout << "6|" << file << "|" << name << std::endl; + DBG << "26|" << file << "|" << name << std::endl; + std::cout << "26|" << file << "|" << name << std::endl; return readCallbackAnswer(); } virtual bool askUserToAcceptWrongDigest( const Pathname &file, const std::string &requested, const std::string &found ) { - DBG << "7|" << file << "|" << requested << "|" << found << std::endl; - std::cout << "7|" << file << "|" << requested << "|" << found << std::endl; + DBG << "27|" << file << "|" << requested << "|" << found << std::endl; + std::cout << "27|" << file << "|" << requested << "|" << found << std::endl; return readCallbackAnswer(); } }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/testsuite/tests/sources.cc new/zmd-backend-7.1.1.0/testsuite/tests/sources.cc --- old/zmd-backend-7.1.1.0/testsuite/tests/sources.cc 2006-05-12 12:13:26.000000000 +0200 +++ new/zmd-backend-7.1.1.0/testsuite/tests/sources.cc 2006-03-15 17:07:35.000000000 +0100 @@ -40,7 +40,12 @@ MIL << "Source '" << it->alias() << "' provides " << store.size() << " resolvables" << endl; int num = 0; for (zypp::ResStore::const_iterator it = store.begin(); it != store.end(); ++it) + { MIL << ++num << ": " << **it << endl; + MIL << "BEGIN ----------------------------" << std::endl; + MIL << (*it)->deps() << std::endl; + MIL << "END ----------------------------" << std::endl; + } } return 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package libzypp checked in at Fri May 19 01:47:52 CEST 2006. -------- --- libzypp/libzypp.changes 2006-05-16 23:12:27.000000000 +0200 +++ libzypp/libzypp.changes 2006-05-18 19:59:17.000000000 +0200 @@ -1,0 +2,32 @@ +Thu May 18 19:08:52 CEST 2006 - ma(a)suse.de + +- Prevent against daemons launched in rpm %post, that do not close + their filedescriptors. (#174548) +- Version 1.0.1; rev 3413 + +------------------------------------------------------------------- +Thu May 18 16:51:41 CEST 2006 - jsrain(a)suse.cz + +- fixed media number of package retrieved as a part of a patch + (#174841) +- rev 3409 + +------------------------------------------------------------------- +Thu May 18 16:16:21 CEST 2006 - dmacvicar(a)suse.de + +- fix missing package descriptions due to filtered packages + by incompatible architectures. (#159109) +- rev 3404 + +------------------------------------------------------------------- +Thu May 18 16:08:42 CEST 2006 - kkaempf(a)suse.de + +- decrease logging in DiskUsageCounter and Modalias (#163186) +- rev 3406 + +------------------------------------------------------------------- +Thu May 18 10:43:47 CEST 2006 - ma(a)suse.de + +- Stay backward comapatible. + +------------------------------------------------------------------- @@ -7,0 +40,7 @@ +- rev 3390 + +------------------------------------------------------------------- +Tue May 16 15:11:35 CEST 2006 - kkaempf(a)suse.de + +- reduce logging verbosity (#163186) +- rev 3381 Old: ---- zypp-1.0.0.tar.bz2 New: ---- zypp-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.xzr2Nt/_old 2006-05-19 01:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.xzr2Nt/_new 2006-05-19 01:46:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 1.0.0) +# spec file for package libzypp (Version 1.0.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management -Version: 1.0.0 +Version: 1.0.1 Release: 1 -Source: zypp-1.0.0.tar.bz2 +Source: zypp-1.0.1.tar.bz2 Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -62,7 +62,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -q -n zypp-1.0.0 +%setup -q -n zypp-1.0.1 %build mv configure.ac x @@ -103,11 +103,32 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Thu May 18 2006 - ma(a)suse.de +- Prevent against daemons launched in rpm %%post, that do not close + their filedescriptors. (#174548) +- Version 1.0.1; rev 3413 +* Thu May 18 2006 - jsrain(a)suse.cz +- fixed media number of package retrieved as a part of a patch + (#174841) +- rev 3409 +* Thu May 18 2006 - dmacvicar(a)suse.de +- fix missing package descriptions due to filtered packages + by incompatible architectures. (#159109) +- rev 3404 +* Thu May 18 2006 - kkaempf(a)suse.de +- decrease logging in DiskUsageCounter and Modalias (#163186) +- rev 3406 +* Thu May 18 2006 - ma(a)suse.de +- Stay backward comapatible. * Tue May 16 2006 - ma(a)suse.de - Make basic attributes available through ResObject. - Let ResObjects which do not require media access during commit return ZERO sourceMediaNr (required for #173690) - Version 1.0.0 +- rev 3390 +* Tue May 16 2006 - kkaempf(a)suse.de +- reduce logging verbosity (#163186) +- rev 3381 * Tue May 16 2006 - schubi(a)suse.de - setCandidate accept candidates with compatible architectures too. Not only with the same architecture. Bug 172594 - If update package has ++++++ zypp-1.0.0.tar.bz2 -> zypp-1.0.1.tar.bz2 ++++++ libzypp/zypp-1.0.0.tar.bz2 libzypp/zypp-1.0.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libgnomeprint
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package libgnomeprint checked in at Fri May 19 01:46:07 CEST 2006. -------- --- GNOME/libgnomeprint/libgnomeprint.changes 2006-05-10 12:21:20.000000000 +0200 +++ libgnomeprint/libgnomeprint.changes 2006-05-18 21:25:48.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 18 21:25:15 CEST 2006 - joeshaw(a)suse.de + +- Add a patch to fix a crash when trying to save to a PDF file + that you can't write to. (bnc #176712) + +------------------------------------------------------------------- New: ---- libgnomeprint-pdf-invalid-path-176712.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomeprint.spec ++++++ --- /var/tmp/diff_new_pack.7GfXCT/_old 2006-05-19 01:45:20.000000000 +0200 +++ /var/tmp/diff_new_pack.7GfXCT/_new 2006-05-19 01:45:20.000000000 +0200 @@ -22,7 +22,7 @@ Group: Development/Libraries/GNOME Autoreqprov: on Version: 2.12.1 -Release: 20 +Release: 21 Summary: The GNOME 2.x Printing Library Source: libgnomeprint-%{version}.tar.bz2 Source1: libgnomeprint-icons.tar.gz @@ -30,6 +30,7 @@ Patch: libgnomeprint-suseconfig.dif Patch1: libgnomeprint.patch Patch2: bnc-8691.patch +Patch3: libgnomeprint-pdf-invalid-path-176712.patch %description This package contains the GNOME 2.x printing library, which provides a @@ -90,6 +91,7 @@ %patch -p1 %patch1 %patch2 +%patch3 %build rename no nb po/no.* @@ -164,6 +166,9 @@ %doc %{prefix}/share/gtk-doc/html/* %changelog -n libgnomeprint +* Thu May 18 2006 - joeshaw(a)suse.de +- Add a patch to fix a crash when trying to save to a PDF file + that you can't write to. (bnc #176712) * Tue May 09 2006 - fejj(a)suse.de - fix unlocalised text on two tabs of print dialog (bnc#8691) * Sun Feb 05 2006 - aj(a)suse.de ++++++ libgnomeprint-pdf-invalid-path-176712.patch ++++++ ? libgnomeprint-pdf-invalid-path-176712.patch Index: libgnomeprint/gnome-print-job.c =================================================================== RCS file: /cvs/gnome/libgnomeprint/libgnomeprint/gnome-print-job.c,v retrieving revision 1.78 diff -u -p -u -r1.78 gnome-print-job.c --- libgnomeprint/gnome-print-job.c 22 Sep 2005 18:43:18 -0000 1.78 +++ libgnomeprint/gnome-print-job.c 18 May 2006 19:21:27 -0000 @@ -609,6 +609,11 @@ gnome_print_job_print (GnomePrintJob *jo /* Create the "real" context and set it up. */ ctx = gnome_print_context_new (job->config); + + /* Oh honestly */ + if (ctx == NULL) + return GNOME_PRINT_ERROR_UNKNOWN; + gnome_print_job_setup_context (job, ctx); g_object_get (G_OBJECT (ctx), "filter", &filter, NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libextractor
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package libextractor checked in at Fri May 19 01:45:10 CEST 2006. -------- --- libextractor/libextractor.changes 2006-02-20 13:36:06.000000000 +0100 +++ libextractor/libextractor.changes 2006-05-18 14:23:55.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 18 12:29:10 CEST 2006 - ke(a)suse.de + +- Version 0.5.14: Fix security problem in the ASF and qt extractor (by + re-writing it from scratch) and improve support for various Quicktime + attributes. The mpeg extractor now uses libmpeg2 fixing a problem with + occasionally wrong image dimensions. +- Enable pdf and exiv2 support explicitly. + +------------------------------------------------------------------- Old: ---- libextractor-0.5.10.tar.gz New: ---- libextractor-0.5.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libextractor.spec ++++++ --- /var/tmp/diff_new_pack.BZ2RCh/_old 2006-05-19 01:42:15.000000000 +0200 +++ /var/tmp/diff_new_pack.BZ2RCh/_new 2006-05-19 01:42:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libextractor (Version 0.5.10) +# spec file for package libextractor (Version 0.5.14) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,11 +11,11 @@ # norootforbuild Name: libextractor -BuildRequires: ImageMagick gcc-c++ glib-devel libvorbis-devel pkgconfig python-devel vorbis-tools +BuildRequires: ImageMagick gcc-c++ glib-devel gtk2 gtk2-devel libgsf libgsf-devel libmpeg2 libmpeg2-devel libvorbis-devel pkgconfig python-devel vorbis-tools License: GPL Group: Productivity/Other Autoreqprov: on -Version: 0.5.10 +Version: 0.5.14 Release: 1 Summary: Library to Extract Metadata from Files Source: http://gnunet.org/libextractor/download/%{name}-%{version}.tar.gz @@ -78,7 +78,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \ --libdir=%{_prefix}/%_lib \ - --mandir=%{_mandir} + --mandir=%{_mandir} \ + --enable-xpdf \ + --enable-exiv2 # export LIBRARY_PATH=$RPM_BUILD_ROOT/usr/lib:$LIBRARY_PATH make # requires the installed package @@ -114,6 +116,12 @@ %{_mandir}/man3/* %changelog -n libextractor +* Thu May 18 2006 - ke(a)suse.de +- Version 0.5.14: Fix security problem in the ASF and qt extractor (by + re-writing it from scratch) and improve support for various Quicktime + attributes. The mpeg extractor now uses libmpeg2 fixing a problem with + occasionally wrong image dimensions. +- Enable pdf and exiv2 support explicitly. * Mon Feb 20 2006 - ke(a)suse.de - Update to version 0.5.10: Fix buffer overflows of the pdf plugin (xpdf derived code). ++++++ libextractor-0.5.10.tar.gz -> libextractor-0.5.14.tar.gz ++++++ libextractor/libextractor-0.5.10.tar.gz libextractor/libextractor-0.5.14.tar.gz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ipsec-tools
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package ipsec-tools checked in at Fri May 19 01:42:05 CEST 2006. -------- --- ipsec-tools/ipsec-tools.changes 2006-05-04 22:33:30.000000000 +0200 +++ ipsec-tools/ipsec-tools.changes 2006-05-18 22:11:20.000000000 +0200 @@ -3,0 +4,5 @@ +- fixed a segfault in GSSAPI initialization (#172196) + +------------------------------------------------------------------- +Thu May 4 22:08:06 CEST 2006 - jbohac(a)suse.cz + New: ---- gssapi-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.tqkwmC/_old 2006-05-19 01:39:45.000000000 +0200 +++ /var/tmp/diff_new_pack.tqkwmC/_new 2006-05-19 01:39:45.000000000 +0200 @@ -13,7 +13,7 @@ Name: ipsec-tools BuildRequires: kernel-source krb5-devel openssl-devel pam pam-devel readline-devel Version: 0.6.5 -Release: 9 +Release: 10 License: Other License(s), see package, BSD Group: Productivity/Networking/Security Provides: racoon @@ -25,6 +25,7 @@ Patch1: s390_configure_fix.patch Patch2: gssapi-strict-aliasing.patch Patch3: racoon.conf_macros.patch +Patch4: gssapi-fix.patch Source1: racoon.init Source2: sysconfig.racoon Source3: setkey.conf.sample @@ -61,6 +62,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %{suse_update_config -f . src/racoon} @@ -145,6 +147,7 @@ %changelog -n ipsec-tools * Thu May 04 2006 - jbohac(a)suse.cz +- fixed a segfault in GSSAPI initialization (#172196) - the /var/run/racoon directory was missing from the package which prevented racoon from starting (#170552) - fixed - fixed unexpanded macros in racoon.conf (#170552) ++++++ gssapi-fix.patch ++++++ diff -ur ipsec-tools-0.6.5/src/racoon/gssapi.c ipsec-tools-0.6.5-fix/src/racoon/gssapi.c --- ipsec-tools-0.6.5/src/racoon/gssapi.c 2005-02-11 07:59:01.000000000 +0100 +++ ipsec-tools-0.6.5-fix/src/racoon/gssapi.c 2006-05-17 20:53:28.000000000 +0200 @@ -211,8 +211,7 @@ } else gssapi_get_default_name(iph1, 0, &princ); - maj_stat = gss_canonicalize_name(&min_stat, princ, GSS_C_NO_OID, - &canon_princ); + maj_stat = gss_duplicate_name(&min_stat, princ, &canon_princ); if (GSS_ERROR(maj_stat)) { gssapi_error(min_stat, LOCATION, "canonicalize name\n"); maj_stat = gss_release_name(&min_stat, &princ); @@ -691,8 +690,7 @@ if (gssapi_get_default_name(iph1, 0, &defname) < 0) return NULL; - maj_stat = gss_canonicalize_name(&min_stat, defname, GSS_C_NO_OID, - &canon_name); + maj_stat = gss_duplicate_name(&min_stat, defname, &canon_name); if (GSS_ERROR(maj_stat)) { gssapi_error(min_stat, LOCATION, "canonicalize name\n"); maj_stat = gss_release_name(&min_stat, &defname); Only in ipsec-tools-0.6.5-fix/src/racoon: tags ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit i4l-base
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package i4l-base checked in at Fri May 19 01:39:39 CEST 2006. -------- --- i4l-base/i4l-base.changes 2006-04-25 17:00:27.000000000 +0200 +++ i4l-base/i4l-base.changes 2006-05-18 15:02:41.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 18 15:02:28 CEST 2006 - schwab(a)suse.de + +- Don't build as root. +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i4l-base.spec ++++++ --- /var/tmp/diff_new_pack.RQJAEw/_old 2006-05-19 01:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.RQJAEw/_new 2006-05-19 01:39:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package i4l-base (Version 2006.4.25) +# spec file for package i4l-base (Version 2006.5.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -8,6 +8,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: i4l-base BuildRequires: freetype2 gcc-c++ openssl-devel ppp sgmltool tcl-devel tk xorg-x11 xorg-x11-devel @@ -17,7 +18,7 @@ Provides: i4l Autoreqprov: on Obsoletes: i4l -Version: 2006.4.25 +Version: 2006.5.18 Release: 1 Summary: ISDN for Linux Basic Utilities Source: isdn4k-utils.v3.9.tar.bz2 @@ -58,7 +59,7 @@ and much more %package -n capi4linux -Version: 2006.4.25 +Version: 2006.5.18 Release: 1 Summary: CAPI 2.0 library and associated tools Group: Hardware/ISDN @@ -85,7 +86,7 @@ and more %package -n i4lfirm -Version: 2006.4.25 +Version: 2006.5.18 Release: 1 Summary: ISDN firmware for active ISDN cards Group: Hardware/ISDN @@ -112,7 +113,7 @@ and much more %package -n i4l-vbox -Version: 2006.4.25 +Version: 2006.5.18 Release: 1 Obsoletes: vbox Provides: vbox vbox2b4 @@ -140,7 +141,7 @@ Michael 'Ghandi' Herold %package -n i4l-isdnlog -Version: 2006.4.25 +Version: 2006.5.18 Release: 1 Summary: An ISDN line logging and control utility Group: Hardware/ISDN @@ -166,10 +167,6 @@ and more %prep -# remove old directory -if [ "X" != "${RPM_BUILD_ROOT}X" ]; then - rm -rf $RPM_BUILD_ROOT -fi %setup -q -n isdn4k-utils -b 1 -b 2 -b 3 %patch #%patch1 -p1 @@ -178,7 +175,6 @@ mv -f eicon/firmware ../divactrl_2.1/ pushd ../divactrl_2.1/ %patch31 -p1 -chown -R root:root ../i4l_suse cd ../i4l_suse #%patch10 -p1 @@ -217,7 +213,6 @@ make CFLAGS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin,share,include} mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8 mkdir -p $RPM_BUILD_ROOT/sbin @@ -242,7 +237,10 @@ esac done export PPPVERSIONS=`rpm -q --queryformat "%{VERSION}" ppp` -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install INSTALL_PROGRAM='install -m 0755' \ + INSTALL_DATA='install -m 0644' INSTALL_MAN='install -m 0644' \ + INSTALL_DIR='install -m 0755 -d' INSTALL_SBIN='install -m 0755' \ + INSTALL_BIN='install -m 0755' ls -l $RPM_BUILD_ROOT/usr/%_lib # hack for lib64 platforms #if [ "%_lib" != "lib" ] ; then @@ -718,6 +716,9 @@ /lib/firmware/isdn/te*.qm* %changelog -n i4l-base +* Thu May 18 2006 - schwab(a)suse.de +- Don't build as root. +- Don't strip binaries. * Tue Apr 25 2006 - kkeil(a)suse.de - remove acess to not longer existing /etc/hotplug (#169186) * Tue Feb 28 2006 - kkeil(a)suse.de ++++++ isdn4k-utils.dif ++++++ --- /var/tmp/diff_new_pack.RQJAEw/_old 2006-05-19 01:39:05.000000000 +0200 +++ /var/tmp/diff_new_pack.RQJAEw/_new 2006-05-19 01:39:05.000000000 +0200 @@ -1,5 +1,5 @@ --- .config -+++ .config 2001/09/14 10:47:52 ++++ .config @@ -0,0 +1,145 @@ +# +# Automatically generated by make menuconfig: don't edit @@ -146,8 +146,157 @@ +CONFIG_GENMAN=y +CONFIG_FAQ=y +CONFIG_FAQDIR='/usr/share/doc/packages/i4l-base/faq' +--- Makefile ++++ Makefile +@@ -9,6 +9,8 @@ + + all: do-it-all + ++LIBDIR:=/usr/lib ++ + # + # Make "config" the default target if there is no configuration file. + # +@@ -130,9 +132,9 @@ + exit 1; \ + fi + +-install: rootperm ++install: + set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done +- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ ++ @: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ + then \ + /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \ + else \ +@@ -202,7 +204,7 @@ + @set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \ + if [ -x $$i/configure ] ; then \ + /bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \ +- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \ ++ (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) --libdir=$(LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \ + elif [ -f $$i/Makefile.in ] ; then \ + /bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \ + $(MAKE) -C $$i -f Makefile.in config; \ +--- imontty/Makefile ++++ imontty/Makefile +@@ -52,10 +52,10 @@ + mkdir -p $(DESTDIR)$(MAN8DIR) + $(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE) + +-install: $(PROGS) rootperm install-man +- install -s -o 0 -g 0 -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR) ++install: $(PROGS) install-man ++ install -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR) + +-uninstall: rootperm ++uninstall: + for i in $(PROGS) ; do rm -f $(DESTDIR)$(CONFIG_SBINDIR)/$$i; done + + clean: +--- isdnlog/Makefile.in ++++ isdnlog/Makefile.in +@@ -1957,7 +1957,7 @@ + echo ""; echo 'Do "make (un)install" as root!' ;echo ""; false; \ + fi + +-uninstall: rootperm ++uninstall: + if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi + rm -f $(DESTDIR)$(SBINDIR)/$(ISDNLOG) \ + $(DESTDIR)$(BINDIR)/$(ISDNREP) \ +@@ -1979,7 +1979,7 @@ + $(DESTDIR)$(DATADIR)/dest.cdb + + +-installdirs: rootperm ++installdirs: + $(INSTALL_DIR) $(DESTDIR)$(I4LCONFDIR) + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +@@ -1988,7 +1988,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) + $(INSTALL_DIR) $(DESTDIR)$(DATADIR) + +-install: all rootperm installdirs install-conf install-data install-progs ++install: all installdirs install-conf install-data install-progs + + install-old-conf: + @if [ -n "$(DESTDIR)$(OLDCONFDIR)" -a "$(DESTDIR)$(OLDCONFDIR)" != '/' ] ; then \ +@@ -2069,7 +2069,7 @@ + $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \ + echo Installing $(DESTDIR)$(DATADIR)/$$f; \ + done +- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \ ++ @: || (grep isdnlog $(SERVICEFILE) >/dev/null) || \ + (echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \ + echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE)) + +--- isdnlog/tools/telrate/Makefile.in ++++ isdnlog/tools/telrate/Makefile.in +@@ -8,8 +8,8 @@ + CGIDIR = @CGIDIR@ + TELDIR = @TELDIR@ + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0755 +-INSTALL_FILE = $(INSTALL) -o 0 -g 0 -m 0644 ++INSTALL_PROGRAM = $(INSTALL) -m 0755 ++INSTALL_FILE = $(INSTALL) -m 0644 + + FILES = index.html info.html *.jpg *.gif tt.js + +--- pppdcapiplugin/Makefile ++++ pppdcapiplugin/Makefile +@@ -12,7 +12,7 @@ + export CAPIINC=$(TOPDIR)/../capi20 + export CAPILIB=$(TOPDIR)/../capi20 + export INSTALL=$(TOPDIR)/install-sh -c +-export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600 ++export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600 + export MKDIR=$(TOPDIR)/mkinstalldirs + + PPPSRCDIRS=/src/isdn/pppd --- vbox/Makefile.in -+++ vbox/Makefile.in 2001/09/14 10:47:52 ++++ vbox/Makefile.in +@@ -14,33 +14,33 @@ + # [*] Program to install binaries to the sbin directory (eg vboxgetty): # + #----------------------------------------------------------------------------# + +-INSTALL_SBIN = @INSTALL@ -m 750 -o root -g root -s ++INSTALL_SBIN = @INSTALL@ -m 750 + + #----------------------------------------------------------------------------# + # [*] Program to install binaries to the bin directory (eg vboxconvert): # + #----------------------------------------------------------------------------# + +-INSTALL_BIN = @INSTALL@ -m 755 -o root -g root -s ++INSTALL_BIN = @INSTALL@ -m 755 + + #----------------------------------------------------------------------------# + # [*] Program to install bash scripts to the bin directory (eg vboxplay): # + #----------------------------------------------------------------------------# + +-INSTALL_SHBIN = @INSTALL@ -m 755 -o root -g root ++INSTALL_SHBIN = @INSTALL@ -m 755 + + #----------------------------------------------------------------------------# + # [*] Program to install binaries to the bin directory and set the suid bit # + # (eg vboxbeep): # + #----------------------------------------------------------------------------# + +-INSTALL_UBIN = @INSTALL@ -m 4755 -o root -g root -s ++INSTALL_UBIN = @INSTALL@ -m 4755 + + #----------------------------------------------------------------------------# + # [*] Program to install configurations to sysconf directory # + # (eg vboxgetty.conf): # + #----------------------------------------------------------------------------# + +-INSTALL_SYSCONF = @INSTALL@ -m 640 -o root -g root ++INSTALL_SYSCONF = @INSTALL@ -m 640 + + #----------------------------------------------------------------------------# + # [*] Program to create missing directories: # @@ -80,8 +80,8 @@ exec_prefix = @exec_prefix@ mandir = @CONFIG_MANDIR@ @@ -159,9 +308,8 @@ LOGFILEDIR = @VBOX_LOGDIR@ PIDFILEDIR = @VBOX_PIDDIR@ -diff -ur vbox/utils/vboxplay.in vbox/utils/vboxplay.in ---- vbox/utils/vboxplay.in 2002-02-22 12:10:26.000000000 +0100 -+++ vbox/utils/vboxplay.in 2003-09-16 01:21:22.000000000 +0200 +--- vbox/utils/vboxplay.in ++++ vbox/utils/vboxplay.in @@ -44,7 +44,7 @@ # if anyone has a better suggestion, # send email to isdnutils(a)packages.debian.org! @@ -171,23 +319,14 @@ fi fi if [ ! -x $PLAY ]; then # use play (from sox) instead ---- Makefile.old 2005-08-04 15:43:14.142803741 +0200 -+++ Makefile 2005-08-04 15:43:14.145803215 +0200 -@@ -9,6 +9,8 @@ +--- xmonisdn/Imakefile ++++ xmonisdn/Imakefile +@@ -7,7 +7,7 @@ + OBJS = xmonisdn.o Net.o + HEADERS = NetP.h Net.h - all: do-it-all +- INSTPGMFLAGS = -m 0755 -s ++ INSTPGMFLAGS = -m 0755 + + ComplexProgramTarget(xmonisdn) -+LIBDIR:=/usr/lib -+ - # - # Make "config" the default target if there is no configuration file. - # -@@ -202,7 +204,7 @@ - @set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \ - if [ -x $$i/configure ] ; then \ - /bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \ -- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \ -+ (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) --libdir=$(LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \ - elif [ -f $$i/Makefile.in ] ; then \ - /bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \ - $(MAKE) -C $$i -f Makefile.in config; \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit hypermail
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package hypermail checked in at Fri May 19 01:38:46 CEST 2006. -------- --- hypermail/hypermail.changes 2006-01-25 21:36:31.000000000 +0100 +++ hypermail/hypermail.changes 2006-05-18 18:57:24.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 18:57:19 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- strip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hypermail.spec ++++++ --- /var/tmp/diff_new_pack.YHj8yR/_old 2006-05-19 01:38:15.000000000 +0200 +++ /var/tmp/diff_new_pack.YHj8yR/_new 2006-05-19 01:38:15.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package hypermail (Version 2.2.0) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,9 +17,9 @@ Obsoletes: hypemail Autoreqprov: on Version: 2.2.0 -Release: 2 +Release: 15 URL: http://www.hypermail-project.org/ -Summary: Convert mail archives in mailbox format to HTML pages +Summary: Convert Mail Archives in mailbox Format to HTML Pages Source: http://www.hypermail.org/dist/%{name}-%{version}.tar.bz2 Patch: %{name}-2.1.8-docs.patch Patch1: %{name}-2.1.8-s390.patch @@ -27,6 +27,7 @@ Patch3: %{name}-audit.patch Patch4: hypermail-gcc4.diff Patch5: nonstaticpcre.patch +Patch6: strip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX) @@ -53,6 +54,7 @@ %patch3 -p1 %patch4 %patch5 +%patch6 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -67,7 +69,6 @@ make %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/hypermail/docs make prefix=$RPM_BUILD_ROOT/usr \ mandir=$RPM_BUILD_ROOT/%{_mandir} \ @@ -92,6 +93,8 @@ %doc %{_mandir}/man4/hmrc.4.gz %changelog -n hypermail +* Thu May 18 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Aug 26 2005 - pnemec(a)suse.cz ++++++ strip.patch ++++++ --- src/Makefile.in +++ src/Makefile.in @@ -88,11 +88,11 @@ install: all @if [ ! -d $(bindir) ]; then mkdir -p $(bindir); fi - $(INSTALL_PROG) -s -c -m 0755 hypermail$(SUFFIX) $(bindir) + $(INSTALL_PROG) -c -m 0755 hypermail$(SUFFIX) $(bindir) mail.install: @if [ ! -d $(cgidir) ]; then mkdir -p $(cgidir); fi - $(INSTALL_PROG) -s -c -m 0755 mail$(SUFFIX) $(cgidir) + $(INSTALL_PROG) -c -m 0755 mail$(SUFFIX) $(cgidir) uninstall: rm -f $(bindir)/hypermail$(SUFFIX) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit genromfs
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package genromfs checked in at Fri May 19 01:37:49 CEST 2006. -------- --- genromfs/genromfs.changes 2006-01-25 21:36:08.000000000 +0100 +++ genromfs/genromfs.changes 2006-05-18 18:51:09.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 18:51:04 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ genromfs.spec ++++++ --- /var/tmp/diff_new_pack.EdXlvU/_old 2006-05-19 01:35:33.000000000 +0200 +++ /var/tmp/diff_new_pack.EdXlvU/_new 2006-05-19 01:35:33.000000000 +0200 @@ -1,33 +1,32 @@ # # spec file for package genromfs (Version 0.5.1) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-devel pam-modules patch permissions popt ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils cracklib gcc gdbm gettext libtool perl rpm Name: genromfs License: GPL Group: System/Boot Autoreqprov: on Version: 0.5.1 -Release: 286 +Release: 340 URL: http://romfs.sourceforge.net Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Utility for creating romfs filesystems +Summary: Utility for Creating romfs File Systems %description -Genromfs is a tool for creating romfs filesystems, which are -lightweight, read-only filesystems supported by the Linux kernel. Romfs -filesystems are mainly used for the initial RAM disks used during -installation. +Genromfs is a tool for creating romfs file systems, which are +lightweight, read-only file systems supported by the Linux kernel. +Romfs file systems are mainly used for the initial RAM disks used +during installation. @@ -40,11 +39,9 @@ %patch %build -make CFLAGS="$RPM_OPT_FLAGS -DVERSION=\\\"%{version}\\\"" -strip -s genromfs +make CFLAGS="$RPM_OPT_FLAGS -DVERSION=\\\"%{version}\\\"" LDFLAGS= %install -rm -fr $RPM_BUILD_ROOT make PREFIX=$RPM_BUILD_ROOT mandir=%{_mandir} install %clean @@ -57,6 +54,8 @@ /usr/bin/genromfs %changelog -n genromfs +* Thu May 18 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sun Jan 11 2004 - adrian(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit f-spot
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package f-spot checked in at Fri May 19 01:35:14 CEST 2006. -------- --- GNOME/f-spot/f-spot.changes 2006-05-17 07:52:08.000000000 +0200 +++ f-spot/f-spot.changes 2006-05-18 23:03:01.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 23:02:08 CEST 2006 - lewing(a)suse.de + +- Improve missing file handlin to fix 173606. + +------------------------------------------------------------------- New: ---- f-spot-missingfile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.K00y9q/_old 2006-05-19 01:33:50.000000000 +0200 +++ /var/tmp/diff_new_pack.K00y9q/_new 2006-05-19 01:33:50.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Suggests: dcraw Version: 0.1.11 -Release: 20 +Release: 21 Summary: GNOME Photo Management Application URL: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 @@ -40,6 +40,7 @@ Patch13: %{name}-iconselection.patch Patch14: %{name}-syncmetadata.patch Patch15: %{name}-idleimport.patch +Patch16: %{name}-missingfile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 @@ -77,6 +78,7 @@ %patch13 %patch14 %patch15 +%patch16 %build rename no nb po/no.* @@ -135,6 +137,8 @@ %endif %changelog -n f-spot +* Thu May 18 2006 - lewing(a)suse.de +- Improve missing file handlin to fix 173606. * Wed May 17 2006 - lewing(a)suse.de - Start import immediately if path is passed on the command line. Fixes 171034. * Tue May 16 2006 - lewing(a)suse.de ++++++ f-spot-missingfile.patch ++++++ Index: src/ColorDialog.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/ColorDialog.cs,v retrieving revision 1.45 diff -u -p -r1.45 ColorDialog.cs --- src/ColorDialog.cs 16 Jan 2006 15:59:32 -0000 1.45 +++ src/ColorDialog.cs 18 May 2006 21:09:36 -0000 @@ -345,32 +345,36 @@ namespace FSpot { return; } - FSpot.ImageFile img = FSpot.ImageFile.Create (((Photo)view.Item.Current).DefaultVersionPath); - - image_profile = img.GetProfile (); - - // FIXME fall back to rgb for now - if (image_profile == null) - image_profile = Cms.Profile.CreateStandardRgb (); - - AdjustedPixbuf = img.Load (256, 256); - ScaledPixbuf = AdjustedPixbuf.Copy (); - -#if false - Cms.Profile srgb = Cms.Profile.CreateSRgb (); - Cms.Profile lab = Cms.Profile.CreateLab (); - Cms.Profile [] list = new Cms.Profile [] { srgb, lab }; - - Cms.Transform t = new Cms.Transform (list, - PixbufUtils.PixbufCmsFormat (AdjustedPixbuf), - PixbufUtils.PixbufCmsFormat (AdjustedPixbuf), - Cms.Intent.Perceptual, 0x0000); - - PixbufUtils.ColorAdjust (AdjustedPixbuf, - ScaledPixbuf, - t); -#endif - RangeChanged (null, null); + try { + FSpot.ImageFile img = FSpot.ImageFile.Create (((Photo)view.Item.Current).DefaultVersionPath); + + image_profile = img.GetProfile (); + + // FIXME fall back to rgb for now + if (image_profile == null) + image_profile = Cms.Profile.CreateStandardRgb (); + + AdjustedPixbuf = img.Load (256, 256); + ScaledPixbuf = AdjustedPixbuf.Copy (); + + #if false + Cms.Profile srgb = Cms.Profile.CreateSRgb (); + Cms.Profile lab = Cms.Profile.CreateLab (); + Cms.Profile [] list = new Cms.Profile [] { srgb, lab }; + + Cms.Transform t = new Cms.Transform (list, + PixbufUtils.PixbufCmsFormat (AdjustedPixbuf), + PixbufUtils.PixbufCmsFormat (AdjustedPixbuf), + Cms.Intent.Perceptual, 0x0000); + + PixbufUtils.ColorAdjust (AdjustedPixbuf, + ScaledPixbuf, + t); + #endif + RangeChanged (null, null); + } catch (System.Exception e) { + image_profile = null; + } } private const double e = 0.0; Index: src/CDExport.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/CDExport.cs,v retrieving revision 1.7 diff -u -p -r1.7 CDExport.cs --- src/CDExport.cs 19 Oct 2005 05:30:45 -0000 1.7 +++ src/CDExport.cs 18 May 2006 21:09:36 -0000 @@ -83,6 +83,11 @@ namespace FSpot { progress_dialog.Message = e.ToString (); progress_dialog.ProgressText = Mono.Posix.Catalog.GetString ("Error Transferring"); } + Gtk.Application.Invoke (this.Destroy); + } + + private void Destroy (object sender, System.EventArgs args) + { progress_dialog.Destroy (); } Index: src/InfoDisplay.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/InfoDisplay.cs,v retrieving revision 1.29 diff -u -p -r1.29 InfoDisplay.cs --- src/InfoDisplay.cs 20 Jan 2006 07:29:59 -0000 1.29 +++ src/InfoDisplay.cs 18 May 2006 21:09:36 -0000 @@ -99,6 +99,7 @@ namespace FSpot { stream.Write ("<table width=100% cellpadding=5 cellspacing=0>"); bool empty = true; bool missing = false; + System.Exception error = null; if (exif_info != null) { foreach (Exif.ExifContent content in exif_info.GetContents ()) { @@ -149,7 +150,15 @@ namespace FSpot { } } catch (System.IO.FileNotFoundException nf) { missing = true; - } + } catch (System.Exception e){ + // Sometimes we don't get the right exception, check for the file + if (!System.IO.File.Exists (photo.DefaultVersionUri.LocalPath)) { + missing = true; + } else { + // if the file is there but we still got an exception display it. + error = e; + } + } if (store.StatementCount > 0) { #if false @@ -212,6 +221,10 @@ namespace FSpot { msg = String.Format ("<tr><td valign=top align=center bgcolor=\"{0}\">" + "{1}</td></tr>", ig, Mono.Posix.Catalog.GetString ("No metadata available")); + + if (error != null) { + String.Format ("<pre>{0}</pre>", error); + } } stream.Write (msg); } Index: src/MainWindow.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/MainWindow.cs,v retrieving revision 1.286.2.2 diff -u -p -r1.286.2.2 MainWindow.cs --- src/MainWindow.cs 18 May 2006 01:00:43 -0000 1.286.2.2 +++ src/MainWindow.cs 18 May 2006 21:09:37 -0000 @@ -485,7 +485,7 @@ public class MainWindow { public int [] SelectedIds () { int [] ids = new int [0]; - if (fsview != null) + if (fsview != null && fsview.View.Item.IsValid) ids = new int [] { fsview.View.Item.Index }; else { switch (view_mode) { Index: src/PrintDialog.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/PrintDialog.cs,v retrieving revision 1.8 diff -u -p -r1.8 PrintDialog.cs --- src/PrintDialog.cs 1 Dec 2005 23:52:59 -0000 1.8 +++ src/PrintDialog.cs 18 May 2006 21:09:37 -0000 @@ -77,10 +77,15 @@ namespace FSpot { Gnome.PrintContext ctx = print_job.Context; foreach (Photo photo in photos) { - Gnome.Print.Beginpage (ctx, "F-Spot" + photo.DefaultVersionPath); - - Gdk.Pixbuf image = FSpot.PhotoLoader.Load (photo); - + Gdk.Pixbuf image = null; + try { + image = FSpot.PhotoLoader.Load (photo); + Gnome.Print.Beginpage (ctx, "F-Spot" + photo.DefaultVersionPath); + } catch (System.Exception e) { + System.Console.WriteLine (e); + continue; + } + bool rotate = false; double width = page_width; double height = page_height; Index: src/ThreadProgressDialog.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/ThreadProgressDialog.cs,v retrieving revision 1.7 diff -u -p -r1.7 ThreadProgressDialog.cs --- src/ThreadProgressDialog.cs 12 Feb 2006 07:41:59 -0000 1.7 +++ src/ThreadProgressDialog.cs 18 May 2006 21:09:37 -0000 @@ -132,10 +132,10 @@ namespace FSpot { private void HandleDestroy (object sender, EventArgs args) { - if (thread.IsAlive) - thread.Abort (); - delay.Stop (); + if (thread.IsAlive) { + thread.Abort (); + } } public void Start () { Index: src/ImportCommand.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/ImportCommand.cs,v retrieving revision 1.59.2.1 diff -u -p -r1.59.2.1 ImportCommand.cs --- src/ImportCommand.cs 18 May 2006 00:58:52 -0000 1.59.2.1 +++ src/ImportCommand.cs 18 May 2006 21:09:37 -0000 @@ -623,8 +623,13 @@ public class ImportCommand : FSpot.Glade ResponseType response = (ResponseType) this.Dialog.Run (); while (response == ResponseType.Ok) { - if (Directory.Exists (this.ImportPath)) + try { + if (Directory.Exists (this.ImportPath)) + break; + } catch (System.Exception e){ + System.Console.WriteLine (e); break; + } HigMessageDialog md = new HigMessageDialog (this.Dialog, DialogFlags.DestroyWithParent, ++++++ f-spot-startuprace.patch ++++++ --- /var/tmp/diff_new_pack.K00y9q/_old 2006-05-19 01:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.K00y9q/_new 2006-05-19 01:33:52.000000000 +0200 @@ -87,7 +87,7 @@ + try { + service = DBus.Service.Get (Connection, ServicePath); + } catch (System.Exception e) { -+ System.Console.WriteLine (e); ++ //stem.Console.WriteLine (e); + service = new DBus.Service (Connection, ServicePath); + } + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit device-mapper
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package device-mapper checked in at Fri May 19 01:33:41 CEST 2006. -------- --- device-mapper/device-mapper.changes 2006-03-17 16:05:17.000000000 +0100 +++ device-mapper/device-mapper.changes 2006-05-18 18:39:04.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 20 12:25:08 CEST 2006 - fehr(a)suse.de + +- update to new version 1.02.05 + Separate install_include target in makefiles. + Separate out DEFS from CFLAGS. + Support pkg-config. + Check for libsepol. + +------------------------------------------------------------------- +Wed Apr 19 09:41:49 CEST 2006 - fehr(a)suse.de + +- update to new version 1.02.04 + Bring dmsetup man page up-to-date. + Use name-based device refs if kernel doesn't support device number refs. + Fix memory leak (struct dm_ioctl) when struct dm_task is reused. + If _create_and_load_v4 fails part way through, revert the creation. + dmeventd thread/fifo fixes. + Add file & line to dm_strdup_aux(). + Add setgeometry. + +------------------------------------------------------------------- Old: ---- device-mapper.1.02.03.tar.bz2 New: ---- device-mapper.1.02.05.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.jrqAlf/_old 2006-05-19 01:24:19.000000000 +0200 +++ /var/tmp/diff_new_pack.jrqAlf/_new 2006-05-19 01:24:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package device-mapper (Version 1.02.03) +# spec file for package device-mapper (Version 1.02.05) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ License: GPL, LGPL Group: System/Base Autoreqprov: on -Version: 1.02.03 +Version: 1.02.05 Release: 1 Summary: Device Mapper Tools Source: device-mapper.%{version}.tar.bz2 @@ -68,6 +68,21 @@ %{_mandir}/man8/dmsetup.8.gz %changelog -n device-mapper +* Thu Apr 20 2006 - fehr(a)suse.de +- update to new version 1.02.05 + Separate install_include target in makefiles. + Separate out DEFS from CFLAGS. + Support pkg-config. + Check for libsepol. +* Wed Apr 19 2006 - fehr(a)suse.de +- update to new version 1.02.04 + Bring dmsetup man page up-to-date. + Use name-based device refs if kernel doesn't support device number refs. + Fix memory leak (struct dm_ioctl) when struct dm_task is reused. + If _create_and_load_v4 fails part way through, revert the creation. + dmeventd thread/fifo fixes. + Add file & line to dm_strdup_aux(). + Add setgeometry. * Tue Mar 14 2006 - fehr(a)suse.de - update to new version 1.02.03 Add exported functions to set uid, gid and mode. ++++++ device-mapper.1.02.03.tar.bz2 -> device-mapper.1.02.05.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/VERSION new/device-mapper.1.02.05/VERSION --- old/device-mapper.1.02.03/VERSION 2006-02-08 15:16:18.000000000 +0100 +++ new/device-mapper.1.02.05/VERSION 2006-04-19 19:25:07.000000000 +0200 @@ -1 +1 @@ -1.02.03 (2006-02-08) +1.02.05 (2006-04-19) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/WHATS_NEW new/device-mapper.1.02.05/WHATS_NEW --- old/device-mapper.1.02.03/WHATS_NEW 2006-02-07 17:32:40.000000000 +0100 +++ new/device-mapper.1.02.05/WHATS_NEW 2006-04-19 18:41:03.000000000 +0200 @@ -1,3 +1,20 @@ +Version 1.02.05 - 19 Apr 2006 +============================= + Separate install_include target in makefiles. + Separate out DEFS from CFLAGS. + Support pkg-config. + Check for libsepol. + +Version 1.02.04 - 14 Apr 2006 +============================= + Bring dmsetup man page up-to-date. + Use name-based device refs if kernel doesn't support device number refs. + Fix memory leak (struct dm_ioctl) when struct dm_task is reused. + If _create_and_load_v4 fails part way through, revert the creation. + dmeventd thread/fifo fixes. + Add file & line to dm_strdup_aux(). + Add setgeometry. + Version 1.02.03 - 7 Feb 2006 ============================ Add exported functions to set uid, gid and mode. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/configure new/device-mapper.1.02.05/configure --- old/device-mapper.1.02.03/configure 2005-12-02 16:39:16.000000000 +0100 +++ new/device-mapper.1.02.05/configure 2006-04-19 18:38:56.000000000 +0200 @@ -310,7 +310,7 @@ #endif" ac_default_prefix=/usr -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB LIBOBJS MSGFMT JOBS STATIC_LINK OWNER GROUP interface kerneldir missingkernel kernelvsn tmpdir COPTIMISE_FLAG CLDFLAGS LDDEPS LIB_SUFFIX DEBUG DM_LIB_VERSION COMPAT DMIOCTLS LOCALEDIR INTL_PACKAGE INTL DEVICE_UID DEVICE_GID DEVICE_MODE DMEVENTD LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB LIBOBJS MSGFMT usrlibdir JOBS STATIC_LINK OWNER GROUP interface kerneldir missingkernel kernelvsn tmpdir LVM_DEFS COPTIMISE_FLAG CLDFLAGS LDDEPS LIB_SUFFIX DEBUG DM_LIB_VERSION COMPAT DMIOCTLS LOCALEDIR INTL_PACKAGE INTL DEVICE_UID DEVICE_GID DEVICE_MODE DMEVENTD PKGCONFIG LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -851,6 +851,7 @@ --enable-compat Enable support for old device-mapper versions --disable-driver Disable calls to device-mapper in the kernel --enable-dmeventd Build the new event daemon + --enable-pkgconfig Install pkgconfig support --enable-static_link Use this to link the tools to their libraries statically. Default is dynamic linking --disable-selinux Disable selinux support @@ -1450,6 +1451,9 @@ esac ################################################################################ +usrlibdir='${prefix}/lib' + +################################################################################ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -5338,6 +5342,15 @@ fi; ################################################################################ +# Check whether --enable-pkgconfig or --disable-pkgconfig was given. +if test "${enable_pkgconfig+set}" = set; then + enableval="$enable_pkgconfig" + PKGCONFIG=$enableval +else + PKGCONFIG=no +fi; + +################################################################################ # Check whether --enable-static_link or --disable-static_link was given. if test "${enable_static_link+set}" = set; then enableval="$enable_static_link" @@ -5351,7 +5364,7 @@ then exec_prefix=""; fi; -################################################################################dnl -- Disable selinux +################################################################################ echo "$as_me:$LINENO: checking whether to enable selinux support" >&5 echo $ECHO_N "checking whether to enable selinux support... $ECHO_C" >&6 # Check whether --enable-selinux or --disable-selinux was given. @@ -5364,6 +5377,87 @@ ################################################################################ if test x$SELINUX = xyes; then + echo "$as_me:$LINENO: checking for sepol_check_context function" >&5 +echo $ECHO_N "checking for sepol_check_context function... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for sepol_check_context in -lsepol" >&5 +echo $ECHO_N "checking for sepol_check_context in -lsepol... $ECHO_C" >&6 +if test "${ac_cv_lib_sepol_sepol_check_context+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsepol $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char sepol_check_context (); +int +main () +{ +sepol_check_context (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_sepol_sepol_check_context=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_sepol_sepol_check_context=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_sepol_sepol_check_context" >&5 +echo "${ECHO_T}$ac_cv_lib_sepol_sepol_check_context" >&6 +if test $ac_cv_lib_sepol_sepol_check_context = yes; then + HAVE_SEPOL=yes +else + HAVE_SEPOL=no +fi + + echo "$as_me:$LINENO: result: $HAVE_SEPOL" >&5 +echo "${ECHO_T}$HAVE_SEPOL" >&6 + + if test x$HAVE_SEPOL = xyes; then + LIBS="-lsepol $LIBS" + fi + + echo "$as_me:$LINENO: checking for is_selinux_enabled function" >&5 +echo $ECHO_N "checking for is_selinux_enabled function... $ECHO_C" >&6 echo "$as_me:$LINENO: checking for is_selinux_enabled in -lselinux" >&5 echo $ECHO_N "checking for is_selinux_enabled in -lselinux... $ECHO_C" >&6 if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then @@ -5434,9 +5528,11 @@ HAVE_SELINUX=no fi + echo "$as_me:$LINENO: result: $HAVE_SELINUX" >&5 +echo "${ECHO_T}$HAVE_SELINUX" >&6 if test x$HAVE_SELINUX = xyes; then - CFLAGS="$CFLAGS -DHAVE_SELINUX" + LVM_DEFS="$LVM_DEFS -DHAVE_SELINUX" LIBS="-lselinux $LIBS" else { echo "$as_me:$LINENO: WARNING: Disabling selinux" >&5 @@ -5590,7 +5686,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - CFLAGS="$CFLAGS -DHAVE_GETOPTLONG" + LVM_DEFS="$LVM_DEFS -DHAVE_GETOPTLONG" fi done @@ -5809,8 +5905,10 @@ + + ################################################################################ - ac_config_files="$ac_config_files Makefile make.tmpl include/Makefile dmsetup/Makefile lib/Makefile lib/libdm-common.h dmeventd/Makefile kernel/Makefile man/Makefile po/Makefile" + ac_config_files="$ac_config_files Makefile make.tmpl include/Makefile dmsetup/Makefile lib/Makefile lib/libdevmapper.pc lib/libdm-common.h dmeventd/Makefile dmeventd/libdevmapper-event.pc kernel/Makefile man/Makefile po/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -6367,8 +6465,10 @@ "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "dmsetup/Makefile" ) CONFIG_FILES="$CONFIG_FILES dmsetup/Makefile" ;; "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; + "lib/libdevmapper.pc" ) CONFIG_FILES="$CONFIG_FILES lib/libdevmapper.pc" ;; "lib/libdm-common.h" ) CONFIG_FILES="$CONFIG_FILES lib/libdm-common.h" ;; "dmeventd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dmeventd/Makefile" ;; + "dmeventd/libdevmapper-event.pc" ) CONFIG_FILES="$CONFIG_FILES dmeventd/libdevmapper-event.pc" ;; "kernel/Makefile" ) CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; @@ -6486,6 +6586,7 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@MSGFMT@,$MSGFMT,;t t +s,@usrlibdir@,$usrlibdir,;t t s,@JOBS@,$JOBS,;t t s,@STATIC_LINK@,$STATIC_LINK,;t t s,@OWNER@,$OWNER,;t t @@ -6495,6 +6596,7 @@ s,@missingkernel@,$missingkernel,;t t s,@kernelvsn@,$kernelvsn,;t t s,@tmpdir@,$tmpdir,;t t +s,@LVM_DEFS@,$LVM_DEFS,;t t s,@COPTIMISE_FLAG@,$COPTIMISE_FLAG,;t t s,@CLDFLAGS@,$CLDFLAGS,;t t s,@LDDEPS@,$LDDEPS,;t t @@ -6510,6 +6612,7 @@ s,@DEVICE_GID@,$DEVICE_GID,;t t s,@DEVICE_MODE@,$DEVICE_MODE,;t t s,@DMEVENTD@,$DMEVENTD,;t t +s,@PKGCONFIG@,$PKGCONFIG,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/configure.in new/device-mapper.1.02.05/configure.in --- old/device-mapper.1.02.03/configure.in 2005-12-02 16:39:16.000000000 +0100 +++ new/device-mapper.1.02.05/configure.in 2006-04-19 18:38:56.000000000 +0200 @@ -47,6 +47,10 @@ esac ################################################################################ +dnl -- Additional library location +usrlibdir='${prefix}/lib' + +################################################################################ dnl -- Checks for programs. AC_PROG_AWK AC_PROG_CC @@ -181,6 +185,11 @@ DMEVENTD=$enableval, DMEVENTD=no) ################################################################################ +dnl -- Enable pkg-config +AC_ARG_ENABLE(pkgconfig, [ --enable-pkgconfig Install pkgconfig support], +PKGCONFIG=$enableval, PKGCONFIG=no) + +################################################################################ dnl -- Enables staticly-linked tools AC_ARG_ENABLE(static_link, [ --enable-static_link Use this to link the tools to their libraries statically. Default is dynamic linking], STATIC_LINK=$enableval, STATIC_LINK=no) @@ -191,19 +200,30 @@ then exec_prefix=""; fi; -################################################################################dnl -- Disable selinux +################################################################################ +dnl -- Disable selinux AC_MSG_CHECKING(whether to enable selinux support) AC_ARG_ENABLE(selinux, [ --disable-selinux Disable selinux support], SELINUX=$enableval) AC_MSG_RESULT($SELINUX) ################################################################################ -dnl -- Check for is_selinux_enabled +dnl -- Check for selinux if test x$SELINUX = xyes; then + AC_MSG_CHECKING(for sepol_check_context function) + AC_CHECK_LIB(sepol, sepol_check_context, HAVE_SEPOL=yes, HAVE_SEPOL=no) + AC_MSG_RESULT($HAVE_SEPOL) + + if test x$HAVE_SEPOL = xyes; then + LIBS="-lsepol $LIBS" + fi + + AC_MSG_CHECKING(for is_selinux_enabled function) AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no) + AC_MSG_RESULT($HAVE_SELINUX) if test x$HAVE_SELINUX = xyes; then - CFLAGS="$CFLAGS -DHAVE_SELINUX" + LVM_DEFS="$LVM_DEFS -DHAVE_SELINUX" LIBS="-lselinux $LIBS" else AC_MSG_WARN(Disabling selinux) @@ -212,7 +232,7 @@ ################################################################################ dnl -- Check for getopt -AC_CHECK_HEADERS(getopt.h, CFLAGS="$CFLAGS -DHAVE_GETOPTLONG") +AC_CHECK_HEADERS(getopt.h, LVM_DEFS="$LVM_DEFS -DHAVE_GETOPTLONG") ################################################################################ dnl -- Internationalisation stuff @@ -328,6 +348,7 @@ ################################################################################ +AC_SUBST(usrlibdir) AC_SUBST(JOBS) AC_SUBST(STATIC_LINK) AC_SUBST(OWNER) @@ -338,6 +359,7 @@ AC_SUBST(missingkernel) AC_SUBST(kernelvsn) AC_SUBST(tmpdir) +AC_SUBST(LVM_DEFS) AC_SUBST(CFLAGS) AC_SUBST(COPTIMISE_FLAG) AC_SUBST(CLDFLAGS) @@ -355,7 +377,7 @@ AC_SUBST(DEVICE_GID) AC_SUBST(DEVICE_MODE) AC_SUBST(DMEVENTD) - +AC_SUBST(PKGCONFIG) ################################################################################ dnl -- First and last lines should not contain files to generate in order to @@ -366,8 +388,10 @@ include/Makefile \ dmsetup/Makefile \ lib/Makefile \ +lib/libdevmapper.pc \ lib/libdm-common.h \ dmeventd/Makefile \ +dmeventd/libdevmapper-event.pc \ kernel/Makefile \ man/Makefile \ po/Makefile \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/dmeventd/Makefile.in new/device-mapper.1.02.05/dmeventd/Makefile.in --- old/device-mapper.1.02.03/dmeventd/Makefile.in 2005-12-05 12:16:48.000000000 +0100 +++ new/device-mapper.1.02.05/dmeventd/Makefile.in 2006-04-19 19:32:57.000000000 +0200 @@ -30,7 +30,8 @@ CLDFLAGS += -ldl -ldevmapper -lpthread -.PHONY: install_dynamic install_static +.PHONY: install_dynamic install_static install_include \ + install_pkgconfig INSTALL_TYPE = install_dynamic @@ -38,18 +39,35 @@ INSTALL_TYPE += install_static endif -install: $(INSTALL_TYPE) +ifeq ("@PKGCONFIG@", "yes") + INSTALL_TYPE += install_pkgconfig +endif + +install: $(INSTALL_TYPE) install_include + +install_include: + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \ + $(includedir)/libdevmapper-event.h install_dynamic: libdevmapper-event.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) $(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \ $(libdir)/libdevmapper-event.$(LIB_SUFFIX) - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \ - $(includedir)/libdevmapper-event.h + +install_pkgconfig: + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \ + $(usrlibdir)/pkgconfig/devmapper-event.pc install_static: libdevmapper-event.a $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper-event.a.$(LIB_VERSION) $(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a +.PHONY: distclean_lib distclean + +distclean_lib: + $(RM) libdevmapper-event.pc + +distclean: distclean_lib + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/dmeventd/dmeventd.c new/device-mapper.1.02.05/dmeventd/dmeventd.c --- old/device-mapper.1.02.03/dmeventd/dmeventd.c 2006-02-03 20:44:59.000000000 +0100 +++ new/device-mapper.1.02.05/dmeventd/dmeventd.c 2006-03-09 22:33:59.000000000 +0100 @@ -1032,21 +1032,32 @@ /* * Read message from client making sure that data is available - * and a complete message is read. + * and a complete message is read. Must not block indefinitely. */ static int client_read(struct dm_event_fifos *fifos, struct dm_event_daemon_message *msg) { + struct timeval t; unsigned bytes = 0; int ret = 0; fd_set fds; errno = 0; while (bytes < sizeof(*msg) && errno != EOF) { - do { - /* Watch client read FIFO for input. */ - FD_ZERO(&fds); - FD_SET(fifos->client, &fds); - } while (select(fifos->client+1, &fds, NULL, NULL, NULL) != 1); + /* Watch client read FIFO for input. */ + FD_ZERO(&fds); + FD_SET(fifos->client, &fds); + t.tv_sec = 1; + t.tv_usec = 0; + ret = select(fifos->client+1, &fds, NULL, NULL, &t); + + if (!ret && !bytes) /* nothing to read */ + return 0; + + if (!ret) /* trying to finish read */ + continue; + + if (ret < 0) /* error */ + return 0; ret = read(fifos->client, msg, sizeof(*msg) - bytes); bytes += ret > 0 ? ret : 0; @@ -1138,12 +1149,16 @@ /* FIXME: better error handling */ - /* Read the request from the client. */ - if (!memset(&msg, 0, sizeof(msg)) || - !client_read(fifos, &msg)) { - stack; + memset(&msg, 0, sizeof(msg)); + + /* + * Read the request from the client. + * Of course, it's tough to tell what to do when + * we use fucking retarded return codes like + * 0 for error. + */ + if (!client_read(fifos, &msg)) return; - } msg.opcode.status = do_process_request(&msg); @@ -1276,25 +1291,25 @@ /* * We exit when there are no more devices to watch. * That is, when the last unregister happens. + * + * We must be careful though. One of our threads which is + * watching a device may receive an event and: + * 1) Alter the device and unregister it + * or + * 2) Alter the device, unregister, [alter again,] and reregister + * + * We must be capable of answering a request to unregister + * that comes from the very thread that must be unregistered. + * Additionally, if that thread unregisters itself and it was the + * only thread being monitored, we must also handle the case where + * that thread may perform a register before exiting. (In other + * words, we can not simply exit if all threads have been unregistered + * unless all threads are done processing. */ do { process_request(&fifos); cleanup_unused_threads(); - } while(!list_empty(&thread_registry)); - - /* - * There may still have been some threads that were doing work, - * make sure these are cleaned up - * - * I don't necessarily like the sleep there, but otherwise, - * cleanup_unused_threads could get called many many times. - * It's worth noting that the likelyhood of it being called - * here is slim. - */ - while(!list_empty(&thread_registry_unused)) { - sleep(1); - cleanup_unused_threads(); - } + } while(!list_empty(&thread_registry) || !list_empty(&thread_registry_unused)); exit_dm_lib(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/dmeventd/libdevmapper-event.pc.in new/device-mapper.1.02.05/dmeventd/libdevmapper-event.pc.in --- old/device-mapper.1.02.03/dmeventd/libdevmapper-event.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/device-mapper.1.02.05/dmeventd/libdevmapper-event.pc.in 2006-04-19 17:23:10.000000000 +0200 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: devmapper-event +Description: device-mapper event library +Version: @DM_LIB_VERSION@ +Requires: devmapper +Cflags: -I${includedir} +Libs: -L${libdir} -ldevmapper-event +Libs.private: -lpthread -ldl diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/dmsetup/dmsetup.c new/device-mapper.1.02.05/dmsetup/dmsetup.c --- old/device-mapper.1.02.03/dmsetup/dmsetup.c 2006-02-03 15:23:22.000000000 +0100 +++ new/device-mapper.1.02.05/dmsetup/dmsetup.c 2006-04-06 18:20:40.000000000 +0200 @@ -508,6 +508,39 @@ return r; } +static int _setgeometry(int argc, char **argv, void *data) +{ + int r = 0; + struct dm_task *dmt; + + if (!(dmt = dm_task_create(DM_DEVICE_SET_GEOMETRY))) + return 0; + + if (_switches[UUID_ARG] || _switches[MAJOR_ARG]) { + if (!_set_task_device(dmt, NULL, 0)) + goto out; + } else { + if (!_set_task_device(dmt, argv[1], 0)) + goto out; + argc--; + argv++; + } + + if (!dm_task_set_geometry(dmt, argv[1], argv[2], argv[3], argv[4])) + goto out; + + /* run the task */ + if (!dm_task_run(dmt)) + goto out; + + r = 1; + + out: + dm_task_destroy(dmt); + + return r; +} + static int _version(int argc, char **argv, void *data) { char version[80]; @@ -1317,7 +1350,7 @@ {"reload", "<device> [<table_file>]", 0, 2, _load}, {"rename", "<device> <new_name>", 1, 2, _rename}, {"message", "<device> <sector> <message>", 2, -1, _message}, - {"ls", "[--target <target_type>] [--exec <command>] [--tree]", 0, 0, _ls}, + {"ls", "[--target <target_type>] [--exec <command>] [--tree [-o options]]", 0, 0, _ls}, {"info", "[<device>]", 0, 1, _info}, {"deps", "[<device>]", 0, 1, _deps}, {"status", "[<device>] [--target <target_type>]", 0, 1, _status}, @@ -1326,6 +1359,7 @@ {"mknodes", "[<device>]", 0, 1, _mknodes}, {"targets", "", 0, 0, _targets}, {"version", "", 0, 0, _version}, + {"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, _setgeometry}, {NULL, NULL, 0, 0, NULL} }; @@ -1340,7 +1374,9 @@ fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help); fprintf(out, "\n<device> may be device name or -u <uuid> or " "-j <major> -m <minor>\n"); - fprintf(out, "Table_file contents may be supplied on stdin.\n\n"); + fprintf(out, "Table_file contents may be supplied on stdin.\n"); + fprintf(out, "Tree options are: ascii, utf, vt100; compact, inverted, notrunc;\n" + " [no]device, active, open, rw and uuid.\n\n"); return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/include/.symlinks new/device-mapper.1.02.05/include/.symlinks --- old/device-mapper.1.02.03/include/.symlinks 2006-02-07 17:41:34.000000000 +0100 +++ new/device-mapper.1.02.05/include/.symlinks 2005-12-02 16:39:16.000000000 +0100 @@ -1,4 +1,5 @@ ../lib/libdevmapper.h ../lib/libdm-file.h ../dmeventd/libdevmapper-event.h +../multilog/libmultilog.h ../po/pogen.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/kernel/ioctl/dm-ioctl.h new/device-mapper.1.02.05/kernel/ioctl/dm-ioctl.h --- old/device-mapper.1.02.03/kernel/ioctl/dm-ioctl.h 2005-10-04 22:12:32.000000000 +0200 +++ new/device-mapper.1.02.05/kernel/ioctl/dm-ioctl.h 2006-02-21 00:55:57.000000000 +0100 @@ -82,6 +82,17 @@ * * DM_TARGET_MSG: * Pass a message string to the target at a specific offset of a device. + * + * DM_DEV_SET_GEOMETRY: + * Set the geometry of a device by passing in a string. The + * string should have this format: + * + * "cylinders heads sectors_per_track start_sector" + * + * Beware that CHS geometry is nearly obsolete and only provided + * for compatibility with dm devices that can be booted by a PC + * BIOS. See struct hd_geometry for range limits. Also note that + * the geometry is erased if the device size changes. */ /* @@ -220,6 +231,7 @@ /* Added later */ DM_LIST_VERSIONS_CMD, DM_TARGET_MSG_CMD, + DM_DEV_SET_GEOMETRY_CMD }; /* @@ -232,51 +244,53 @@ */ #ifdef CONFIG_COMPAT typedef char ioctl_struct[308]; -#define DM_VERSION_32 _IOWR(DM_IOCTL, DM_VERSION_CMD, ioctl_struct) -#define DM_REMOVE_ALL_32 _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, ioctl_struct) -#define DM_LIST_DEVICES_32 _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, ioctl_struct) - -#define DM_DEV_CREATE_32 _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, ioctl_struct) -#define DM_DEV_REMOVE_32 _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, ioctl_struct) -#define DM_DEV_RENAME_32 _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, ioctl_struct) -#define DM_DEV_SUSPEND_32 _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, ioctl_struct) -#define DM_DEV_STATUS_32 _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, ioctl_struct) -#define DM_DEV_WAIT_32 _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, ioctl_struct) - -#define DM_TABLE_LOAD_32 _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, ioctl_struct) -#define DM_TABLE_CLEAR_32 _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, ioctl_struct) -#define DM_TABLE_DEPS_32 _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, ioctl_struct) -#define DM_TABLE_STATUS_32 _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, ioctl_struct) -#define DM_LIST_VERSIONS_32 _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, ioctl_struct) -#define DM_TARGET_MSG_32 _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, ioctl_struct) +#define DM_VERSION_32 _IOWR(DM_IOCTL, DM_VERSION_CMD, ioctl_struct) +#define DM_REMOVE_ALL_32 _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, ioctl_struct) +#define DM_LIST_DEVICES_32 _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, ioctl_struct) + +#define DM_DEV_CREATE_32 _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, ioctl_struct) +#define DM_DEV_REMOVE_32 _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, ioctl_struct) +#define DM_DEV_RENAME_32 _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, ioctl_struct) +#define DM_DEV_SUSPEND_32 _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, ioctl_struct) +#define DM_DEV_STATUS_32 _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, ioctl_struct) +#define DM_DEV_WAIT_32 _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, ioctl_struct) + +#define DM_TABLE_LOAD_32 _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, ioctl_struct) +#define DM_TABLE_CLEAR_32 _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, ioctl_struct) +#define DM_TABLE_DEPS_32 _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, ioctl_struct) +#define DM_TABLE_STATUS_32 _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, ioctl_struct) +#define DM_LIST_VERSIONS_32 _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, ioctl_struct) +#define DM_TARGET_MSG_32 _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, ioctl_struct) +#define DM_DEV_SET_GEOMETRY_32 _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, ioctl_struct) #endif #define DM_IOCTL 0xfd -#define DM_VERSION _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl) -#define DM_REMOVE_ALL _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl) -#define DM_LIST_DEVICES _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl) - -#define DM_DEV_CREATE _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, struct dm_ioctl) -#define DM_DEV_REMOVE _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, struct dm_ioctl) -#define DM_DEV_RENAME _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, struct dm_ioctl) -#define DM_DEV_SUSPEND _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, struct dm_ioctl) -#define DM_DEV_STATUS _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, struct dm_ioctl) -#define DM_DEV_WAIT _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, struct dm_ioctl) - -#define DM_TABLE_LOAD _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, struct dm_ioctl) -#define DM_TABLE_CLEAR _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, struct dm_ioctl) -#define DM_TABLE_DEPS _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl) -#define DM_TABLE_STATUS _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, struct dm_ioctl) +#define DM_VERSION _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl) +#define DM_REMOVE_ALL _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl) +#define DM_LIST_DEVICES _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl) + +#define DM_DEV_CREATE _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, struct dm_ioctl) +#define DM_DEV_REMOVE _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, struct dm_ioctl) +#define DM_DEV_RENAME _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, struct dm_ioctl) +#define DM_DEV_SUSPEND _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, struct dm_ioctl) +#define DM_DEV_STATUS _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, struct dm_ioctl) +#define DM_DEV_WAIT _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, struct dm_ioctl) + +#define DM_TABLE_LOAD _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, struct dm_ioctl) +#define DM_TABLE_CLEAR _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, struct dm_ioctl) +#define DM_TABLE_DEPS _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl) +#define DM_TABLE_STATUS _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, struct dm_ioctl) -#define DM_LIST_VERSIONS _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, struct dm_ioctl) +#define DM_LIST_VERSIONS _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, struct dm_ioctl) -#define DM_TARGET_MSG _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl) +#define DM_TARGET_MSG _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl) +#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) #define DM_VERSION_MAJOR 4 -#define DM_VERSION_MINOR 5 +#define DM_VERSION_MINOR 6 #define DM_VERSION_PATCHLEVEL 0 -#define DM_VERSION_EXTRA "-ioctl (2005-10-04)" +#define DM_VERSION_EXTRA "-ioctl (2006-02-17)" /* Status bits */ #define DM_READONLY_FLAG (1 << 0) /* In/Out */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/.exported_symbols new/device-mapper.1.02.05/lib/.exported_symbols --- old/device-mapper.1.02.03/lib/.exported_symbols 2006-02-03 15:23:22.000000000 +0100 +++ new/device-mapper.1.02.05/lib/.exported_symbols 2006-02-21 00:55:58.000000000 +0100 @@ -108,3 +108,4 @@ dm_hash_get_first dm_hash_get_next dm_set_selinux_context +dm_task_set_geometry diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/Makefile.in new/device-mapper.1.02.05/lib/Makefile.in --- old/device-mapper.1.02.03/lib/Makefile.in 2005-12-02 16:39:16.000000000 +0100 +++ new/device-mapper.1.02.05/lib/Makefile.in 2006-04-19 19:24:00.000000000 +0200 @@ -42,8 +42,9 @@ include ../make.tmpl -.PHONY: install_dynamic install_static \ - install_fs install_ioctl install_ioctl_static +.PHONY: install_dynamic install_static install_include \ + install_fs install_ioctl install_ioctl_static \ + install_pkgconfig INSTALL_TYPE = install_dynamic @@ -51,18 +52,22 @@ INSTALL_TYPE += install_static endif -install: $(INSTALL_TYPE) +ifeq ("@PKGCONFIG@", "yes") + INSTALL_TYPE += install_pkgconfig +endif + +install: $(INSTALL_TYPE) install_include + +install_include: + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ + $(includedir)/libdevmapper.h install_dynamic: install_@interface@ $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) \ $(libdir)/libdevmapper.$(LIB_SUFFIX) - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ - $(includedir)/libdevmapper.h install_static: install_@interface@_static $(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ - $(includedir)/libdevmapper.h install_fs: fs/libdevmapper.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ @@ -72,6 +77,10 @@ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) +install_pkgconfig: + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \ + $(usrlibdir)/pkgconfig/devmapper.pc + install_ioctl_static: ioctl/libdevmapper.a $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper.a.$(LIB_VERSION) @@ -79,7 +88,7 @@ .PHONY: distclean_lib distclean distclean_lib: - $(RM) libdm-common.h + $(RM) libdm-common.h libdevmapper.pc distclean: distclean_lib diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/ioctl/libdm-compat.h new/device-mapper.1.02.05/lib/ioctl/libdm-compat.h --- old/device-mapper.1.02.03/lib/ioctl/libdm-compat.h 2004-07-01 17:14:29.000000000 +0200 +++ new/device-mapper.1.02.05/lib/ioctl/libdm-compat.h 2006-02-21 00:55:58.000000000 +0100 @@ -116,6 +116,7 @@ { "mknodes", 0, {4, 0, 0} }, { "versions", 0, {4, 1, 0} }, { "message", 0, {4, 2, 0} }, + { "setgeometry",0, {4, 6, 0} }, }; /* *INDENT-ON* */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/ioctl/libdm-iface.c new/device-mapper.1.02.05/lib/ioctl/libdm-iface.c --- old/device-mapper.1.02.03/lib/ioctl/libdm-iface.c 2006-02-03 15:23:22.000000000 +0100 +++ new/device-mapper.1.02.05/lib/ioctl/libdm-iface.c 2006-04-03 17:56:02.000000000 +0200 @@ -59,7 +59,9 @@ #define NUMBER_OF_MAJORS 4096 /* dm major version no for running kernel */ -static int _dm_version = DM_VERSION_MAJOR; +static unsigned _dm_version = DM_VERSION_MAJOR; +static unsigned _dm_version_minor = 0; +static unsigned _dm_version_patchlevel = 0; static int _log_suppress = 0; static dm_bitset_t _dm_bitset = NULL; @@ -103,6 +105,9 @@ #ifdef DM_TARGET_MSG {"message", DM_TARGET_MSG, {4, 2, 0}}, #endif +#ifdef DM_DEV_SET_GEOMETRY + {"setgeometry", DM_DEV_SET_GEOMETRY, {4, 6, 0}}, +#endif }; /* *INDENT-ON* */ @@ -236,10 +241,10 @@ } #ifdef HAVE_SELINUX - if (!dm_set_selinux_context(control, S_IFCHR)) { - stack; - return 0; - } + if (!dm_set_selinux_context(control, S_IFCHR)) { + stack; + return 0; + } #endif return 1; @@ -742,7 +747,7 @@ int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size) { - unsigned int *v; + unsigned *v; #ifdef DM_COMPAT if (_dm_version == 1) @@ -756,6 +761,9 @@ v = dmt->dmi.v4->version; snprintf(version, size, "%u.%u.%u", v[0], v[1], v[2]); + _dm_version_minor = v[1]; + _dm_version_patchlevel = v[2]; + return 1; } @@ -801,7 +809,7 @@ if (!_dm_compat) goto bad; - log_verbose("device-mapper ioctl protocol version %d failed. " + log_verbose("device-mapper ioctl protocol version %u failed. " "Trying protocol version 1.", _dm_version); _dm_version = 1; if (_check_version(dmversion, sizeof(dmversion), 0)) { @@ -1001,6 +1009,23 @@ return 1; } +int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, const char *sectors, const char *start) +{ + size_t len = strlen(cylinders) + 1 + strlen(heads) + 1 + strlen(sectors) + 1 + strlen(start) + 1; + + if (!(dmt->geometry = dm_malloc(len))) { + log_error("dm_task_set_geometry: dm_malloc failed"); + return 0; + } + + if (sprintf(dmt->geometry, "%s %s %s %s", cylinders, heads, sectors, start) < 0) { + log_error("dm_task_set_geometry: sprintf failed"); + return 0; + } + + return 1; +} + int dm_task_no_open_count(struct dm_task *dmt) { dmt->no_open_count = 1; @@ -1095,6 +1120,40 @@ return out; } +static int _lookup_dev_name(uint64_t dev, char *buf, size_t len) +{ + struct dm_names *names; + unsigned next = 0; + struct dm_task *dmt; + int r = 0; + + if (!(dmt = dm_task_create(DM_DEVICE_LIST))) + return 0; + + if (!dm_task_run(dmt)) + goto out; + + if (!(names = dm_task_get_names(dmt))) + goto out; + + if (!names->dev) + goto out; + + do { + names = (void *) names + next; + if (names->dev == dev) { + strncpy(buf, names->name, len); + r = 1; + break; + } + next = names->next; + } while (next); + + out: + dm_task_destroy(dmt); + return r; +} + static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count) { const size_t min_size = 16 * 1024; @@ -1123,11 +1182,26 @@ return NULL; } + if (count && dmt->geometry) { + log_error("targets and geometry are incompatible"); + return NULL; + } + if (dmt->newname && (dmt->sector || dmt->message)) { log_error("message and newname are incompatible"); return NULL; } + if (dmt->newname && dmt->geometry) { + log_error("geometry and newname are incompatible"); + return NULL; + } + + if (dmt->geometry && (dmt->sector || dmt->message)) { + log_error("geometry and message are incompatible"); + return NULL; + } + if (dmt->sector && !dmt->message) { log_error("message is required with sector"); return NULL; @@ -1139,6 +1213,9 @@ if (dmt->message) len += sizeof(struct dm_target_msg) + strlen(dmt->message) + 1; + if (dmt->geometry) + len += strlen(dmt->geometry) + 1; + /* * Give len a minimum size so that we have space to store * dependencies or status information. @@ -1164,16 +1241,6 @@ dmi->data_size = len; dmi->data_start = sizeof(struct dm_ioctl); - if (dmt->dev_name) - strncpy(dmi->name, dmt->dev_name, sizeof(dmi->name)); - - if (dmt->type == DM_DEVICE_SUSPEND) - dmi->flags |= DM_SUSPEND_FLAG; - if (dmt->read_only) - dmi->flags |= DM_READONLY_FLAG; - if (dmt->skip_lockfs) - dmi->flags |= DM_SKIP_LOCKFS_FLAG; - if (dmt->minor >= 0) { if (dmt->major <= 0) { log_error("Missing major number for persistent device."); @@ -1183,9 +1250,31 @@ dmi->dev = MKDEV(dmt->major, dmt->minor); } + /* Does driver support device number referencing? */ + if (_dm_version_minor < 3 && !dmt->dev_name && !dmt->uuid && dmi->dev) { + if (!_lookup_dev_name(dmi->dev, dmi->name, sizeof(dmi->name))) { + log_error("Unable to find name for device (%" PRIu32 + ":%" PRIu32 ")", dmt->major, dmt->minor); + goto bad; + } + log_verbose("device (%" PRIu32 ":%" PRIu32 ") is %s " + "for compatibility with old kernel", + dmt->major, dmt->minor, dmi->name); + } + + if (dmt->dev_name) + strncpy(dmi->name, dmt->dev_name, sizeof(dmi->name)); + if (dmt->uuid) strncpy(dmi->uuid, dmt->uuid, sizeof(dmi->uuid)); + if (dmt->type == DM_DEVICE_SUSPEND) + dmi->flags |= DM_SUSPEND_FLAG; + if (dmt->read_only) + dmi->flags |= DM_READONLY_FLAG; + if (dmt->skip_lockfs) + dmi->flags |= DM_SKIP_LOCKFS_FLAG; + dmi->target_count = count; dmi->event_nr = dmt->event_nr; @@ -1205,6 +1294,9 @@ strcpy(tmsg->message, dmt->message); } + if (dmt->geometry) + strcpy(b, dmt->geometry); + return dmi; bad: @@ -1342,7 +1434,7 @@ task->tail = NULL; dm_task_destroy(task); if (!r) - return r; + goto revert; /* Use the original structure last so the info will be correct */ dmt->type = DM_DEVICE_RESUME; @@ -1351,6 +1443,17 @@ r = dm_task_run(dmt); + if (r) + return r; + + revert: + dmt->type = DM_DEVICE_REMOVE; + dm_free(dmt->uuid); + dmt->uuid = NULL; + + if (!dm_task_run(dmt)) + log_error("Failed to revert device creation."); + return r; } @@ -1571,6 +1674,9 @@ break; } + /* Was structure reused? */ + if (dmt->dmi.v4) + dm_free(dmt->dmi.v4); dmt->dmi.v4 = dmi; return 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/ioctl/libdm-targets.h new/device-mapper.1.02.05/lib/ioctl/libdm-targets.h --- old/device-mapper.1.02.03/lib/ioctl/libdm-targets.h 2005-11-22 19:43:12.000000000 +0100 +++ new/device-mapper.1.02.05/lib/ioctl/libdm-targets.h 2006-02-21 00:55:58.000000000 +0100 @@ -50,6 +50,7 @@ } dmi; char *newname; char *message; + char *geometry; uint64_t sector; int no_open_count; int skip_lockfs; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/libdevmapper.h new/device-mapper.1.02.05/lib/libdevmapper.h --- old/device-mapper.1.02.03/lib/libdevmapper.h 2006-02-03 15:23:22.000000000 +0100 +++ new/device-mapper.1.02.05/lib/libdevmapper.h 2006-02-23 20:11:51.000000000 +0100 @@ -80,7 +80,9 @@ DM_DEVICE_LIST_VERSIONS, - DM_DEVICE_TARGET_MSG + DM_DEVICE_TARGET_MSG, + + DM_DEVICE_SET_GEOMETRY }; struct dm_task; @@ -145,6 +147,7 @@ int dm_task_set_gid(struct dm_task *dmt, gid_t gid); int dm_task_set_mode(struct dm_task *dmt, mode_t mode); int dm_task_set_event_nr(struct dm_task *dmt, uint32_t event_nr); +int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, const char *sectors, const char *start); int dm_task_set_message(struct dm_task *dmt, const char *message); int dm_task_set_sector(struct dm_task *dmt, uint64_t sector); int dm_task_no_open_count(struct dm_task *dmt); @@ -369,7 +372,7 @@ void *dm_malloc_aux(size_t s, const char *file, int line); void *dm_malloc_aux_debug(size_t s, const char *file, int line); -char *dm_strdup_aux(const char *str); +char *dm_strdup_aux(const char *str, const char *file, int line); void dm_free_aux(void *p); void *dm_realloc_aux(void *p, unsigned int s, const char *file, int line); int dm_dump_memory_debug(void); @@ -378,7 +381,7 @@ #ifdef DEBUG_MEM # define dm_malloc(s) dm_malloc_aux_debug((s), __FILE__, __LINE__) -# define dm_strdup(s) dm_strdup_aux(s) +# define dm_strdup(s) dm_strdup_aux((s), __FILE__, __LINE__) # define dm_free(p) dm_free_aux(p) # define dm_realloc(p, s) dm_realloc_aux(p, s, __FILE__, __LINE__) # define dm_dump_memory() dm_dump_memory_debug() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/libdevmapper.pc.in new/device-mapper.1.02.05/lib/libdevmapper.pc.in --- old/device-mapper.1.02.03/lib/libdevmapper.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/device-mapper.1.02.05/lib/libdevmapper.pc.in 2006-04-19 17:23:10.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: devmapper +Description: device-mapper library +Version: @DM_LIB_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -ldevmapper +Libs.private: -lselinux -lsepol diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/libdm-common.c new/device-mapper.1.02.05/lib/libdm-common.c --- old/device-mapper.1.02.03/lib/libdm-common.c 2006-02-03 15:23:22.000000000 +0100 +++ new/device-mapper.1.02.05/lib/libdm-common.c 2006-02-21 00:55:58.000000000 +0100 @@ -510,3 +510,4 @@ dm_task_destroy(dmt); return r; } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/lib/mm/dbg_malloc.c new/device-mapper.1.02.05/lib/mm/dbg_malloc.c --- old/device-mapper.1.02.03/lib/mm/dbg_malloc.c 2006-01-31 15:50:38.000000000 +0100 +++ new/device-mapper.1.02.05/lib/mm/dbg_malloc.c 2006-02-23 20:11:51.000000000 +0100 @@ -18,9 +18,9 @@ #include <assert.h> #include <stdarg.h> -char *dm_strdup_aux(const char *str) +char *dm_strdup_aux(const char *str, const char *file, int line) { - char *ret = dm_malloc(strlen(str) + 1); + char *ret = dm_malloc_aux_debug(strlen(str) + 1, file, line); if (ret) strcpy(ret, str); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/make.tmpl.in new/device-mapper.1.02.05/make.tmpl.in --- old/device-mapper.1.02.03/make.tmpl.in 2005-12-05 12:16:48.000000000 +0100 +++ new/device-mapper.1.02.05/make.tmpl.in 2006-04-19 17:23:10.000000000 +0200 @@ -24,7 +24,7 @@ MSGFMT = @MSGFMT@ LN_S = @LN_S@ LIBS = @LIBS@ -CFLAGS += @DEFS@ +DEFS += @DEFS@ @LVM_DEFS@ CFLAGS += @CFLAGS@ CLDFLAGS += @CLDFLAGS@ LDDEPS += @LDDEPS@ @@ -37,6 +37,7 @@ bindir = $(DESTDIR)@bindir@ includedir = $(DESTDIR)@includedir@ libdir = $(DESTDIR)@libdir@ +usrlibdir = $(DESTDIR)@usrlibdir@ sbindir = $(DESTDIR)@sbindir@ infodir = $(DESTDIR)@infodir@ mandir = $(DESTDIR)@mandir@ @@ -64,27 +65,28 @@ CFLAGS += @COPTIMISE_FLAG@ ifeq ("@DEBUG@", "yes") - CFLAGS += -g -fno-omit-frame-pointer -DDEBUG - CFLAGS += -DDEBUG_MEM + CFLAGS += -g -fno-omit-frame-pointer + DEFS += -DDEBUG + DEFS += -DDEBUG_MEM endif ifeq ("@INTL@", "yes") - CFLAGS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\" + DEFS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\" endif LDFLAGS += -L$(interfacedir) CLDFLAGS += -L$(interfacedir) ifeq ("@COMPAT@", "yes") - CFLAGS += -DDM_COMPAT + DEFS += -DDM_COMPAT endif ifeq ("@DMIOCTLS@", "yes") - CFLAGS += -DDM_IOCTLS + DEFS += -DDM_IOCTLS endif -#CFLAGS += -DDEBUG_POOL -#CFLAGS += -DBOUNDS_CHECK +#DEFS += -DDEBUG_POOL +#DEFS += -DBOUNDS_CHECK #CFLAGS += -pg #LDFLAGS += -pg @@ -149,14 +151,14 @@ $(TARGETS): $(OBJECTS) %.o: %.c - $(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@ + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ %.pot: %.c Makefile $(CC) -E $(INCLUDES) -include $(top_srcdir)/include/pogen.h \ - $(CFLAGS) $< > $@ + $(DEFS) $(CFLAGS) $< > $@ %.so: %.o - $(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@ + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ ifeq ("@LIB_SUFFIX@","so") $(LIB_SHARED): $(OBJECTS) $(LDDEPS) @@ -178,7 +180,7 @@ set -e; \ FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \ DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ - $(CC) -MM $(INCLUDES) $(CFLAGS) $< | \ + $(CC) -MM $(INCLUDES) $(DEFS) $(CFLAGS) $< | \ sed "s/$.*$\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" > $@; \ [ -s $@ ] || $(RM) $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.03/man/dmsetup.8 new/device-mapper.1.02.05/man/dmsetup.8 --- old/device-mapper.1.02.03/man/dmsetup.8 2005-05-16 22:46:46.000000000 +0200 +++ new/device-mapper.1.02.05/man/dmsetup.8 2006-04-06 18:20:40.000000000 +0200 @@ -1,4 +1,4 @@ -.TH DMSETUP 8 "Sep 17 2003" "Linux" "MAINTENTANCE COMMANDS" +.TH DMSETUP 8 "Apr 06 2006" "Linux" "MAINTENTANCE COMMANDS" .SH NAME dmsetup \- low level logical volume management .SH SYNOPSIS @@ -12,7 +12,7 @@ .B dmsetup remove_all .br .B dmsetup suspend -.I device_name +.I [--nolockfs] device_name .br .B dmsetup resume .I device_name @@ -29,7 +29,7 @@ .B dmsetup rename .I device_name new_name .br -.B dmsetup ls [--target target_type] [--exec command] +.B dmsetup ls [--target target_type] [--exec command] [--tree [-o options]] .br .B dmsetup info .I [device_name] @@ -147,10 +147,17 @@ .IP \fBls .I [--target target_type] .I [--exec command] +.I [--tree [-o options]] .br List device names. Optionally only list devices that have at least one target of the specified type. Optionally execute a command for each device. The device name is appended to the supplied command. +--tree displays dependencies between devices as a tree. +It accepts a comma-separate list of options. +Some specify the information displayed against each node: +device/nodevice; active, open, rw, uuid. +Others specify how the tree is displayed: +ascii, utf, vt100; compact, inverted, notrunc. .IP \fBload|reload .I device_name [table_file] .br @@ -183,11 +190,14 @@ With --target, only information relating to the specified target type is displayed. .IP \fBsuspend +.I [--nolockfs] .I device_name .br Suspends a device. Any I/O that has already been mapped by the device but has not yet completed will be flushed. Any further I/O to that device will be postponed for as long as the device is suspended. +If there's a filesystem on the device which supports the operation, +an attempt will be made to sync it first unless --nolockfs is specified. .IP \fBtable .I [--target target_type] .I [device_name] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit aeolus
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package aeolus checked in at Fri May 19 01:24:12 CEST 2006. -------- --- aeolus/aeolus.changes 2006-01-25 21:34:07.000000000 +0100 +++ aeolus/aeolus.changes 2006-05-18 18:37:45.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 18:37:36 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aeolus.spec ++++++ --- /var/tmp/diff_new_pack.1ltJkZ/_old 2006-05-19 01:24:05.000000000 +0200 +++ /var/tmp/diff_new_pack.1ltJkZ/_new 2006-05-19 01:24:05.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package aeolus (Version 0.3.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,7 +17,7 @@ Group: Productivity/Multimedia/Sound/Midi Autoreqprov: on Version: 0.3.1 -Release: 4 +Release: 16 Summary: Virtual Pipe Organ Source: aeolus-%{version}.tar.bz2 Source1: stops-0.1.1.tar.bz2 @@ -49,7 +49,7 @@ %install mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -install -D -m 755 -s aeolus $RPM_BUILD_ROOT%{_bindir}/aeolus +install -D -m 755 aeolus $RPM_BUILD_ROOT%{_bindir}/aeolus cp .aeolusrc $RPM_BUILD_ROOT%{_docdir}/%{name}/aeolusrc cp -R stops-* $RPM_BUILD_ROOT%{_docdir}/%{name} cd $RPM_BUILD_ROOT @@ -70,6 +70,8 @@ %{_datadir}/pixmaps/*.png %changelog -n aeolus +* Thu May 18 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Oct 19 2005 - pth(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager-vpnc
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package NetworkManager-vpnc checked in at Fri May 19 01:23:59 CEST 2006. -------- --- NetworkManager-vpnc/NetworkManager-vpnc.changes 2006-04-10 22:09:59.000000000 +0200 +++ NetworkManager-vpnc/NetworkManager-vpnc.changes 2006-05-18 22:49:08.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 22:48:43 CEST 2006 - rml(a)suse.de + +- Update translations (Novell bug #158997) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-vpnc.spec ++++++ --- /var/tmp/diff_new_pack.L9dB5b/_old 2006-05-19 01:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.L9dB5b/_new 2006-05-19 01:23:54.000000000 +0200 @@ -17,7 +17,7 @@ %define sysconfdir /etc Summary: NetworkManager VPN Support for vpnc Version: 0.5.0cvs20060202 -Release: 12 +Release: 19 License: GPL Group: Productivity/Networking/System URL: http://people.redhat.com/dcbw/NetworkManager/ @@ -88,6 +88,8 @@ /opt/gnome/share/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog -n NetworkManager-vpnc +* Thu May 18 2006 - rml(a)suse.de +- Update translations (Novell bug #158997) * Mon Apr 10 2006 - rml(a)suse.de - Report error if configuration export fails (Novell bug #164980) * Wed Mar 29 2006 - rml(a)suse.de ++++++ nm-vpnc-0.6-branch.patch ++++++ ++++ 6163 lines (skipped) ++++ between NetworkManager-vpnc/nm-vpnc-0.6-branch.patch ++++ and NetworkManager-vpnc/nm-vpnc-0.6-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager-openvpn
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package NetworkManager-openvpn checked in at Fri May 19 01:23:47 CEST 2006. -------- --- NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-04-17 19:10:18.000000000 +0200 +++ NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-05-18 22:50:44.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 22:50:30 CEST 2006 - rml(a)suse.de + +- Update translations (Novell bug #158997) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openvpn.spec ++++++ --- /var/tmp/diff_new_pack.wOpngA/_old 2006-05-19 01:23:39.000000000 +0200 +++ /var/tmp/diff_new_pack.wOpngA/_new 2006-05-19 01:23:39.000000000 +0200 @@ -17,7 +17,7 @@ %define sysconfdir /etc Summary: NetworkManager VPN support for OpenVPN Version: 0.3.2cvs20060202 -Release: 14 +Release: 20 License: GPL Group: Productivity/Networking/System URL: http://www.gnome.org/projects/NetworkManager @@ -88,6 +88,8 @@ /opt/gnome/share/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog -n NetworkManager-openvpn +* Thu May 18 2006 - rml(a)suse.de +- Update translations (Novell bug #158997) * Mon Apr 17 2006 - rml(a)suse.de - Property dialog: Mark the entries as non-editable, since they are in fact not user-editable (Novell bug #164989) ++++++ nm-openvpn-0.6-branch.patch ++++++ ++++ 10485 lines (skipped) ++++ between NetworkManager-openvpn/nm-openvpn-0.6-branch.patch ++++ and NetworkManager-openvpn/nm-openvpn-0.6-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package NetworkManager checked in at Fri May 19 01:23:32 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-05-17 23:13:00.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-05-18 23:53:33.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 18 22:12:54 CEST 2006 - rml(a)suse.de + +- Use "AP_SCAN 2" for ipw2200 if the network is hidden (Novell + bug #176575) +- nm-applet: Update Hungarian translation (Novell bug #158997) +- Bump package requirement on sysconfig to 0.50.9-14 or later +- Make sysconfig a PreReq, not a Requires (Novell bug #176993) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.uTUtnu/_old 2006-05-19 01:23:00.000000000 +0200 +++ /var/tmp/diff_new_pack.uTUtnu/_new 2006-05-19 01:23:00.000000000 +0200 @@ -25,13 +25,13 @@ %define libnl_version 1.0-6 %define dhcdbd_version 1.12-19 %define libnotify_version 0.3.2 -%define sysconfig_version 0.50.7 +%define sysconfig_version 0.50.9-14 License: GPL Group: Productivity/Networking/System URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 34 +Release: 35 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -48,6 +48,7 @@ Patch8: nm-fix-adhoc-icon-rml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-client +PreReq: sysconfig >= %{sysconfig_version} Requires: wireless-tools >= %{wireless_version} Requires: dbus-1 >= %{dbus_version} Requires: dbus-1-glib >= %{dbus_version} @@ -57,7 +58,6 @@ Requires: wpa_supplicant >= %{wpa_supplicant_version} Requires: dhcdbd >= %{dhcdbd_version} Requires: libnl >= %{libnl_version} -Requires: sysconfig >= %{sysconfig_version} Requires: iproute2 openssl nscd Conflicts: netapplet @@ -261,6 +261,12 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Thu May 18 2006 - rml(a)suse.de +- Use "AP_SCAN 2" for ipw2200 if the network is hidden (Novell + bug #176575) +- nm-applet: Update Hungarian translation (Novell bug #158997) +- Bump package requirement on sysconfig to 0.50.9-14 or later +- Make sysconfig a PreReq, not a Requires (Novell bug #176993) * Wed May 17 2006 - rml(a)suse.de - Add README.ypbind-autofs, describing the interaction between NetworkManager, ypbind, and autofs (Novell bug #175935) ++++++ nm-0.6-branch.patch ++++++ --- /var/tmp/diff_new_pack.uTUtnu/_old 2006-05-19 01:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.uTUtnu/_new 2006-05-19 01:23:01.000000000 +0200 @@ -29,6 +29,8 @@ initscript/Slackware/rc.networkmanager-dispatcher.in | 99 ++++++ initscript/Slackware/rc.networkmanager.in | 99 ++++++ libnm-util/dbus-helpers.c | 4 + po/ChangeLog | 4 + po/hu.po | 184 ++++-------- src/NetworkManager.c | 7 src/NetworkManagerAPList.c | 15 src/NetworkManagerAPList.h | 4 @@ -58,7 +60,7 @@ test/Makefile.am | 5 test/nm-online.c | 141 +++++++++ test/nm-tool.c | 4 - 58 files changed, 1507 insertions(+), 610 deletions(-) + 60 files changed, 1575 insertions(+), 730 deletions(-) diff -urN NetworkManager-0.6.2/ChangeLog NetworkManager/ChangeLog --- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500 @@ -2026,6 +2028,395 @@ * NetworkManager * Many, many bug fixes (Everyone) +diff -urN NetworkManager-0.6.2/po/ChangeLog NetworkManager/po/ChangeLog +--- NetworkManager-0.6.2/po/ChangeLog 2006-03-02 06:59:30.000000000 -0500 ++++ NetworkManager/po/ChangeLog 2006-05-18 16:08:19.000000000 -0400 +@@ -1,3 +1,7 @@ ++2006-05-18 Robert Love <rml(a)novell.com> ++ ++ * hu.po: Update. ++ + 2006-03-02 Kjartan Maraas <kmaraas(a)gnome.org> + + * POTFILES.in: Add two missing files. +diff -urN NetworkManager-0.6.2/po/hu.po NetworkManager/po/hu.po +--- NetworkManager-0.6.2/po/hu.po 2006-02-27 01:53:33.000000000 -0500 ++++ NetworkManager/po/hu.po 2006-05-18 16:07:57.000000000 -0400 +@@ -7,16 +7,17 @@ + "Project-Id-Version: NetworkManager.HEAD.hu\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-01-28 20:28+0100\n" +-"PO-Revision-Date: 2006-01-06 19:36+0100\n" +-"Last-Translator: Gabor Kelemen <kelemeng(a)gnome.hu>\n" ++"PO-Revision-Date: 2006-05-08 23:42+0100\n" ++"Last-Translator: Szabolcs Varga <shirokuma(a)shirokuma.hu>\n" + "Language-Team: Hungarian <gnome(a)gnome.hu>\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=1; plural=0;\n" ++"Plural-Forms: nplurals=1; plural=0;\n" + "X-Generator: KBabel 1.11.1\n" + +-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923 ++#: ../gnome/applet/applet-compat.c:171 ++#: ../gnome/applet/applet-dbus-info.c:923 + #, c-format + msgid "Passphrase for wireless network %s" + msgstr "Jelmondat a(z) %s vezeték nélküli hálózathoz" +@@ -52,21 +53,23 @@ + msgid "Wireless Ethernet (%s)" + msgstr "Vezeték nélküli Ethernet (%s)" + +-#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346 ++#: ../gnome/applet/applet.c:321 ++#: ../gnome/applet/applet.c:346 + msgid "NetworkManager Applet" + msgstr "NetworkManager kisalkalmazás" + +-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348 ++#: ../gnome/applet/applet.c:323 ++#: ../gnome/applet/applet.c:348 + msgid "Copyright © 2004-2005 Red Hat, Inc." + msgstr "Copyright (C) 2004-2005 Red Hat, Inc." + +-#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349 ++#: ../gnome/applet/applet.c:324 ++#: ../gnome/applet/applet.c:349 + msgid "Notification area applet for managing your network devices and connections." +-msgstr "" +-"Értesítésiterület-kisalkalmazás a hálózati eszközök és kapcsolatok " +-"kezelésére." ++msgstr "Értesítésiterület-kisalkalmazás a hálózati eszközök és kapcsolatok kezelésére." + +-#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354 ++#: ../gnome/applet/applet.c:327 ++#: ../gnome/applet/applet.c:354 + msgid "translator-credits" + msgstr "Kelemen Gábor <kelemeng(a)gnome.hu>" + +@@ -89,14 +92,11 @@ + + #: ../gnome/applet/applet.c:449 + #, c-format +-msgid "" +-"Could not start the VPN connection '%s' due to a failure launching the VPN " +-"program." +-msgstr "" +-"Nem sikerült elindítani \"%s\" VPN kapcsolatot a VPN program indításakor " +-"fellépett hiba miatt." ++msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program." ++msgstr "Nem sikerült elindítani \"%s\" VPN kapcsolatot a VPN program indításakor fellépett hiba miatt." + +-#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463 ++#: ../gnome/applet/applet.c:453 ++#: ../gnome/applet/applet.c:463 + msgid "VPN Connect Failure" + msgstr "VPN kapcsolódási hiba" + +@@ -116,12 +116,8 @@ + + #: ../gnome/applet/applet.c:464 + #, c-format +-msgid "" +-"Could not start the VPN connection '%s' because the VPN server did not " +-"return an adequate network configuration." +-msgstr "" +-"Nem sikerült elindítani \"%s\" VPN kapcsolatot, mivel a VPN-kiszolgáló nem " +-"adott vissza megfelelő hálózati beállításokat." ++msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration." ++msgstr "Nem sikerült elindítani \"%s\" VPN kapcsolatot, mivel a VPN-kiszolgáló nem adott vissza megfelelő hálózati beállításokat." + + #: ../gnome/applet/applet.c:472 + #, c-format +@@ -137,12 +133,11 @@ + msgid "VPN Login Message" + msgstr "VPN bejelentkezési üzenet" + +-#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514 ++#: ../gnome/applet/applet.c:760 ++#: ../gnome/applet/applet.c:2514 + #: ../gnome/applet/other-network-dialog.c:453 + #: ../gnome/applet/passphrase-dialog.c:206 +-msgid "" +-"The NetworkManager Applet could not find some required resources (the glade " +-"file was not found)." ++msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)." + msgstr "A NetworkManager kisalkalmazás nem talál néhány szükséges glade fájlt." + + #: ../gnome/applet/applet.c:772 +@@ -180,11 +175,13 @@ + msgid "Waiting for Network Key for the wireless network '%s'..." + msgstr "Várakozás \"%s\" vezeték nélküli hálózat hálózati kulcsára..." + +-#: ../gnome/applet/applet.c:955 ../gnome/applet/applet.c:965 ++#: ../gnome/applet/applet.c:955 ++#: ../gnome/applet/applet.c:965 + msgid "Requesting a network address from the wired network..." + msgstr "Hálózati cím kérése a vezetékes hálózattól..." + +-#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967 ++#: ../gnome/applet/applet.c:957 ++#: ../gnome/applet/applet.c:967 + #, c-format + msgid "Requesting a network address from the wireless network '%s'..." + msgstr "Hálózati cím kérése \"%s\" vezeték nélküli hálózattól..." +@@ -202,7 +199,8 @@ + msgid "NetworkManager is not running" + msgstr "A NetworkManager nem fut" + +-#: ../gnome/applet/applet.c:1107 ../gnome/applet/applet.c:1841 ++#: ../gnome/applet/applet.c:1107 ++#: ../gnome/applet/applet.c:1841 + msgid "Networking disabled" + msgstr "Hálózat letiltva" + +@@ -302,12 +300,8 @@ + msgstr "_Névjegy" + + #: ../gnome/applet/applet.c:2633 +-msgid "" +-"The NetworkManager applet could not find some required resources. It cannot " +-"continue.\n" +-msgstr "" +-"A NetworkManager kisalkalmazás nem talál néhány szükséges erőforrást, ezért " +-"a futása nem folytatódhat.\n" ++msgid "The NetworkManager applet could not find some required resources. It cannot continue.\n" ++msgstr "A NetworkManager kisalkalmazás nem talál néhány szükséges erőforrást, ezért a futása nem folytatódhat.\n" + + #: ../gnome/applet/wireless-security-option.c:157 + msgid "Open System" +@@ -377,9 +371,7 @@ + + #: ../gnome/applet/other-network-dialog.c:352 + #, c-format +-msgid "" +-"By default, the wireless network's name is set to your computer's name, %s, " +-"with no encryption enabled" ++msgid "By default, the wireless network's name is set to your computer's name, %s, with no encryption enabled" + msgstr "Alapértelmezésben a vezeték nélküli hálózat neve a számítógépe neve, (%s) kikapcsolt titkosítással" + + #: ../gnome/applet/other-network-dialog.c:358 +@@ -387,9 +379,7 @@ + msgstr "Új vezeték nélküli hálózat létrehozása" + + #: ../gnome/applet/other-network-dialog.c:359 +-msgid "" +-"Enter the name and security settings of the wireless network you wish to " +-"create." ++msgid "Enter the name and security settings of the wireless network you wish to create." + msgstr "Adja meg a létrehozandó vezeték nélküli hálózat nevét és biztonsági beállításait." + + #: ../gnome/applet/other-network-dialog.c:363 +@@ -416,21 +406,13 @@ + + #: ../gnome/applet/vpn-password-dialog.c:155 + #, c-format +-msgid "" +-"Could not find the authentication dialog for VPN connection type '%s'. " +-"Contact your system administrator." +-msgstr "" +-"Nem található a hitelesítési párbeszédablak a(z) \"%s\" típusú VPN " +-"kapcsolathoz. Lépjen kapcsolatba a rendszergazdával." ++msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator." ++msgstr "Nem található a hitelesítési párbeszédablak a(z) \"%s\" típusú VPN kapcsolathoz. Lépjen kapcsolatba a rendszergazdával." + + #: ../gnome/applet/vpn-password-dialog.c:192 + #, c-format +-msgid "" +-"There was a problem launching the authentication dialog for VPN connection " +-"type '%s'. Contact your system administrator." +-msgstr "" +-"Hiba lépett fel a(z) \"%s\" típusú VPN kapcsolathoz tartozó párbeszédablak " +-"elindítása közben. Lépjen kapcsolatba a rendszergazdával." ++msgid "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator." ++msgstr "Hiba lépett fel a(z) \"%s\" típusú VPN kapcsolathoz tartozó párbeszédablak elindítása közben. Lépjen kapcsolatba a rendszergazdával." + + #: ../gnome/applet/applet.glade.h:1 + msgid " " +@@ -443,17 +425,13 @@ + #: ../gnome/applet/applet.glade.h:4 + #, no-c-format + msgid "" +-"Passphrase Required by Wireless " +-"Network\n" ++"Passphrase Required by Wireless Network\n" + "\n" +-"A passphrase or encryption key is required to access the wireless network '%" +-"s'." ++"A passphrase or encryption key is required to access the wireless network '%s'." + msgstr "" +-"A vezeték nélküli hálózat jelszót " +-"igényel\n" ++"A vezeték nélküli hálózat jelszót igényel\n" + "\n" +-"A(z) %s vezeték nélküli hálózathoz való hozzáféréshez jelszó vagy " +-"titkosítási kulcs szükséges." ++"A(z) %s vezeték nélküli hálózathoz való hozzáféréshez jelszó vagy titkosítási kulcs szükséges." + + #: ../gnome/applet/applet.glade.h:8 + #, no-c-format +@@ -462,28 +440,20 @@ + "\n" + "%s It will not be completely functional." + msgstr "" +-"Csökkentett működőképességű hálózat</" +-"span>\n" ++"Csökkentett működőképességű hálózat\n" + "\n" + "%s nem lesz teljesen működőképes." + + #: ../gnome/applet/applet.glade.h:12 + #, no-c-format + msgid "" +-"Wireless Network Login Confirmation</" +-"span>\n" ++"Wireless Network Login Confirmation\n" + "\n" +-"You have chosen to log in to the wireless network '%s'. If you are sure " +-"that this wireless network is secure, click the checkbox below and " +-"NetworkManager will not require confirmation on subsequent log ins." ++"You have chosen to log in to the wireless network '%s'. If you are sure that this wireless network is secure, click the checkbox below and NetworkManager will not require confirmation on subsequent log ins." + msgstr "" +-"Vezeték nélküli hálózatba " +-"bejelentkezés megerősítése\n" ++"Vezeték nélküli hálózatba bejelentkezés megerősítése\n" + "\n" +-"A(z) \"%s\" vezeték nélküli hálózatba való bejelentkezést választotta. Ha " +-"biztos abban, hogy ez a vezeték nélküli hálózat biztonságos, kattintson az " +-"alábbi jelölőnégyzetre és a NetworkManager nem fog megerősítést kérni, ha a " +-"későbbiekben kapcsolódik hozzá." ++"A(z) \"%s\" vezeték nélküli hálózatba való bejelentkezést választotta. Ha biztos abban, hogy ez a vezeték nélküli hálózat biztonságos, kattintson az alábbi jelölőnégyzetre és a NetworkManager nem fog megerősítést kérni, ha a későbbiekben kapcsolódik hozzá." + + #: ../gnome/applet/applet.glade.h:15 + msgid "Authentication:" +@@ -607,19 +577,19 @@ + + #: ../gnome/applet/applet.glade.h:47 + msgid "leap_subwindow" +-msgstr "" ++msgstr "leap_subwindow" + + #: ../gnome/applet/applet.glade.h:48 + msgid "wep_key_subwindow" +-msgstr "" ++msgstr "wep_key_subwindow" + + #: ../gnome/applet/applet.glade.h:49 + msgid "wep_passphrase_subwindow" +-msgstr "" ++msgstr "wep_passphrase_subwindow" + + #: ../gnome/applet/applet.glade.h:50 + msgid "wpa_psk_subwindow" +-msgstr "" ++msgstr "wpa_psk_subwindow" + + #: ../gnome/applet/wso-wpa-psk.c:168 + msgid "WPA2 Personal" +@@ -634,12 +604,8 @@ + msgstr "Nem lehet VPN kapcsolatot hozzáadni" + + #: ../gnome/vpn-properties/nm-vpn-properties.c:360 +-msgid "" +-"No suitable VPN software was found on your system. Contact your system " +-"administrator." +-msgstr "" +-"Nem található megfelelő VPN szoftver a rendszerén. Lépjen kapcsolatba a " +-"rendszergazdával." ++msgid "No suitable VPN software was found on your system. Contact your system administrator." ++msgstr "Nem található megfelelő VPN szoftver a rendszerén. Lépjen kapcsolatba a rendszergazdával." + + #: ../gnome/vpn-properties/nm-vpn-properties.c:412 + msgid "Cannot import VPN connection" +@@ -647,12 +613,8 @@ + + #: ../gnome/vpn-properties/nm-vpn-properties.c:414 + #, c-format +-msgid "" +-"Cannot find suitable software for VPN connection type '%s' to import the " +-"file '%s'. Contact your system administrator." +-msgstr "" +-"Nem található a(z) \"%s\" kapcsolattípusnak megfelelő VPN szoftver a(z) \"%s" +-"\" fájl importálásához. Lépjen kapcsolatba a rendszergazdával." ++msgid "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator." ++msgstr "Nem található a(z) \"%s\" kapcsolattípusnak megfelelő VPN szoftver a(z) \"%s\" fájl importálásához. Lépjen kapcsolatba a rendszergazdával." + + #: ../gnome/vpn-properties/nm-vpn-properties.c:554 + #, c-format +@@ -661,12 +623,8 @@ + + #: ../gnome/vpn-properties/nm-vpn-properties.c:557 + #, c-format +-msgid "" +-"Could not find the UI files for VPN connection type '%s'. Contact your " +-"system administrator." +-msgstr "" +-"Nem találhatóak a(z) \"%s\" VPN kapcsolathoz tartozó felhasználóifelület-" +-"fájlok. Lépjen kapcsolatba a rendszergazdával." ++msgid "Could not find the UI files for VPN connection type '%s'. Contact your system administrator." ++msgstr "Nem találhatóak a(z) \"%s\" VPN kapcsolathoz tartozó felhasználóifelület-fájlok. Lépjen kapcsolatba a rendszergazdával." + + #: ../gnome/vpn-properties/nm-vpn-properties.c:717 + #, c-format +@@ -675,14 +633,8 @@ + + #: ../gnome/vpn-properties/nm-vpn-properties.c:720 + #, c-format +-msgid "" +-"All information about the VPN connection \"%s\" will be lost and you may " +-"need your system administrator to provide information to create a new " +-"connection." +-msgstr "" +-"Minden információ a(z) \"%s\" VPN kapcsolatról el fog veszni és egy új " +-"kapcsolat létrehozásához szükséges információkért lehetséges, hogy a " +-"rendszergazdára is szüksége lesz." ++msgid "All information about the VPN connection \"%s\" will be lost and you may need your system administrator to provide information to create a new connection." ++msgstr "Minden információ a(z) \"%s\" VPN kapcsolatról el fog veszni és egy új kapcsolat létrehozásához szükséges információkért lehetséges, hogy a rendszergazdára is szüksége lesz." + + #: ../gnome/vpn-properties/nm-vpn-properties.c:926 + msgid "Unable to load" +@@ -751,17 +703,13 @@ + + #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14 + msgid "" +-"This assistant will guide you through the creation of a connection to a " +-"Virtual Private Network (VPN).\n" ++"This assistant will guide you through the creation of a connection to a Virtual Private Network (VPN).\n" + "\n" +-"It will require some information, such as IP addresses and secrets. Please " +-"see your system administrator to obtain this information." ++"It will require some information, such as IP addresses and secrets. Please see your system administrator to obtain this information." + msgstr "" +-"Ez az asszisztens végigvezeti Önt egy magánhálózathoz tartozó új Virtuális " +-"magánhálózati (VPN) kapcsolat létrehozásán.\n" ++"Ez az asszisztens végigvezeti Önt egy magánhálózathoz tartozó új Virtuális magánhálózati (VPN) kapcsolat létrehozásán.\n" + "\n" +-"Ehhez szükség lesz néhány információra, például IP-címekre és titkokra, ezen " +-"információkért keresse fel a rendszergazdát." ++"Ehhez szükség lesz néhány információra, például IP-címekre és titkokra, ezen információkért keresse fel a rendszergazdát." + + #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17 + msgid "VPN Connections" +@@ -798,16 +746,12 @@ + #: ../src/nm-netlink-monitor.c:154 + #, c-format + msgid "unable to create netlink socket for monitoring wired ethernet devices - %s" +-msgstr "" +-"nem lehet netlink foglalatot létrehozni a vezetékes ethernet kártyák " +-"megfigyelésére - %s" ++msgstr "nem lehet netlink foglalatot létrehozni a vezetékes ethernet kártyák megfigyelésére - %s" + + #: ../src/nm-netlink-monitor.c:172 + #, c-format + msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s" +-msgstr "" +-"nem lehet kapcsolódni a netlink foglalathoz a vezetékes ethernet kártyák " +-"megfigyelésére - %s" ++msgstr "nem lehet kapcsolódni a netlink foglalathoz a vezetékes ethernet kártyák megfigyelésére - %s" + + #: ../src/nm-netlink-monitor.c:405 + msgid "operation took too long" diff -urN NetworkManager-0.6.2/src/backends/interface_parser.c NetworkManager/src/backends/interface_parser.c --- NetworkManager-0.6.2/src/backends/interface_parser.c 2005-10-24 11:04:28.000000000 -0400 +++ NetworkManager/src/backends/interface_parser.c 2006-05-11 11:39:52.000000000 -0400 ++++++ nm-wireless-driver-workarounds-rml.patch ++++++ --- /var/tmp/diff_new_pack.uTUtnu/_old 2006-05-19 01:23:02.000000000 +0200 +++ /var/tmp/diff_new_pack.uTUtnu/_new 2006-05-19 01:23:02.000000000 +0200 @@ -1,34 +1,44 @@ Index: src/nm-device-802-11-wireless.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v -retrieving revision 1.60.2.5 -diff -u -r1.60.2.5 nm-device-802-11-wireless.c ---- src/nm-device-802-11-wireless.c 27 Mar 2006 16:11:53 -0000 1.60.2.5 -+++ src/nm-device-802-11-wireless.c 20 Apr 2006 16:06:48 -0000 -@@ -214,22 +214,13 @@ +retrieving revision 1.60.2.8 +diff -u -r1.60.2.8 nm-device-802-11-wireless.c +--- src/nm-device-802-11-wireless.c 17 May 2006 14:57:05 -0000 1.60.2.8 ++++ src/nm-device-802-11-wireless.c 18 May 2006 17:17:55 -0000 +@@ -348,23 +348,15 @@ if ((data_len >= minlen) && range->we_version_compiled >= 18) { - if (range->enc_capa & IW_ENC_CAPA_WPA) - { - caps |= (NM_802_11_CAP_PROTO_WPA - | NM_802_11_CAP_KEY_MGMT_PSK - | NM_802_11_CAP_KEY_MGMT_802_1X); +- caps |= (NM_802_11_CAP_PROTO_WPA +- | NM_802_11_CAP_KEY_MGMT_PSK +- | NM_802_11_CAP_KEY_MGMT_802_1X); - } - if (range->enc_capa & IW_ENC_CAPA_WPA2) - { - caps |= (NM_802_11_CAP_PROTO_WPA2 - | NM_802_11_CAP_KEY_MGMT_PSK - | NM_802_11_CAP_KEY_MGMT_802_1X); +- caps |= (NM_802_11_CAP_PROTO_WPA2 +- | NM_802_11_CAP_KEY_MGMT_PSK +- | NM_802_11_CAP_KEY_MGMT_802_1X); - } - - if (range->enc_capa & IW_ENC_CAPA_CIPHER_TKIP) - caps |= NM_802_11_CAP_CIPHER_TKIP; +- caps |= NM_802_11_CAP_CIPHER_TKIP; - if (range->enc_capa & IW_ENC_CAPA_CIPHER_CCMP) - caps |= NM_802_11_CAP_CIPHER_CCMP; +- caps |= NM_802_11_CAP_CIPHER_CCMP; ++ /* FIXME: Until all drivers support enc_capa ... */ ++ caps |= (NM_802_11_CAP_PROTO_WPA ++ | NM_802_11_CAP_KEY_MGMT_PSK ++ | NM_802_11_CAP_KEY_MGMT_802_1X); ++ caps |= (NM_802_11_CAP_PROTO_WPA2 ++ | NM_802_11_CAP_KEY_MGMT_PSK ++ | NM_802_11_CAP_KEY_MGMT_802_1X); ++ caps |= NM_802_11_CAP_CIPHER_TKIP; ++ caps |= NM_802_11_CAP_CIPHER_CCMP; } -@@ -1829,23 +1820,21 @@ + return caps; +@@ -1890,23 +1882,21 @@ int orig_rate = 0; struct iwreq wrq; @@ -61,7 +71,7 @@ wrq.u.data.pointer = NULL; wrq.u.data.flags = 0; -@@ -2253,13 +2242,11 @@ +@@ -2314,13 +2304,11 @@ } @@ -76,7 +86,7 @@ return NM_SUPPLICANT_TIMEOUT; } -@@ -2425,13 +2412,28 @@ +@@ -2486,13 +2474,28 @@ const char * iface = nm_device_get_iface (NM_DEVICE (self)); gboolean success = FALSE; int tries = 0; @@ -106,24 +116,26 @@ goto exit; wpa_ctrl_close (ctrl); -@@ -2468,6 +2470,7 @@ +@@ -2528,7 +2531,8 @@ + struct wpa_ctrl * ctrl; gboolean user_created; const char * hex_essid; - const char * ap_scan = "AP_SCAN 1"; +- const char * ap_scan = "AP_SCAN 1"; ++ const char * ap_scan; + const char * kernel_driver; guint32 caps; gboolean supports_wpa; -@@ -2489,12 +2492,39 @@ +@@ -2550,12 +2554,37 @@ || (caps & NM_802_11_CAP_PROTO_WPA2); /* Use "AP_SCAN 2" if: - * - The wireless network is non-broadcast or user created - * - The wireless driver does not support WPA + * - The wireless driver does not support "AP_SCAN 1" -+ * (orinoco, prism54, airo, and ndiswrapper) -+ * - The wireless network is hidden and the driver -+ * does not support "AP_SCAN 1" with hidden SSIDs (ipw2100) ++ * (orinoco, prism54, airo, airo_cs, and ndiswrapper) ++ * - The wireless network is hidden and the driver does not ++ * support "AP_SCAN 1" with hidden networks (ipw2100 and ipw2200) + * - The wireless network is user created + * - The wireless driver does not support WPA + * Otherwise, we prefer "AP_SCAN 1". @@ -139,16 +151,14 @@ + ap_scan = "AP_SCAN 2"; + else if (!strcmp (kernel_driver, "ndiswrapper")) + ap_scan = "AP_SCAN 2"; -+ else if (!strcmp (kernel_driver, "ipw2100")) ++ else if (!strcmp (kernel_driver, "ipw2100") || !strcmp (kernel_driver, "ipw2200")) + { + if (nm_ap_get_broadcast (ap)) + ap_scan = "AP_SCAN 1"; + else + ap_scan = "AP_SCAN 2"; + } -+ else if (!strcmp (kernel_driver, "ath_pci")) -+ ap_scan = "AP_SCAN 1"; -+ else if ( user_created ) ++ else if (user_created) + ap_scan = "AP_SCAN 2"; + else if (!supports_wpa) + ap_scan = "AP_SCAN 2"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-pkg-bindings
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Thu May 18 19:10:29 CEST 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-05-16 23:13:19.000000000 +0200 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-05-18 16:50:44.000000000 +0200 @@ -1,0 +2,11 @@ +Thu May 18 16:49:53 CEST 2006 - hh(a)suse.cz + +- Say also the URL of a failed source in SourceStartManager (#175153). +- 2.13.76 + +------------------------------------------------------------------- +Wed May 17 08:43:28 CEST 2006 - jsrain(a)suse.cz + +- one more fix of reseting resolvable status (#175451) + +------------------------------------------------------------------- @@ -15,0 +27 @@ +>>>>>>> .r30956 Old: ---- yast2-pkg-bindings-2.13.75.tar.bz2 New: ---- yast2-pkg-bindings-2.13.76.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.G5TWjd/_old 2006-05-18 19:10:19.000000000 +0200 +++ /var/tmp/diff_new_pack.G5TWjd/_new 2006-05-18 19:10:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.75) +# spec file for package yast2-pkg-bindings (Version 2.13.76) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.13.75 +Version: 2.13.76 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.75.tar.bz2 +Source0: yast2-pkg-bindings-2.13.76.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools Summary: YaST2 Package Manager Access @@ -36,7 +36,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.75 +%setup -n yast2-pkg-bindings-2.13.76 %build %{prefix}/bin/y2tool y2autoconf @@ -67,6 +67,11 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Thu May 18 2006 - hh(a)suse.cz +- Say also the URL of a failed source in SourceStartManager (#175153). +- 2.13.76 +* Wed May 17 2006 - jsrain(a)suse.cz +- one more fix of reseting resolvable status (#175451) * Tue May 16 2006 - ma(a)suse.de - Adapt to libzypp-1.0.0 - 2.13.75 @@ -75,6 +80,7 @@ has not seen any resolvables yet. Fixes deleting corrupt sources (#174840). - 2.13.74 + >>>>>>> .r30956 * Tue May 16 2006 - jsrain(a)suse.cz - fixed resetting resolvable status (#175711, #175451) - 2.13.73 ++++++ yast2-pkg-bindings-2.13.75.tar.bz2 -> yast2-pkg-bindings-2.13.76.tar.bz2 ++++++ ++++ 12024 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.75/Makefile.am new/yast2-pkg-bindings-2.13.76/Makefile.am --- old/yast2-pkg-bindings-2.13.75/Makefile.am 2005-10-04 14:04:30.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.76/Makefile.am 2006-05-18 16:51:38.000000000 +0200 @@ -6,7 +6,9 @@ # (Edit ./SUBDIRS instead) # -PREFIX = /usr +#where devtools are +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -30,6 +32,10 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) AUTOMAKE_OPTIONS = foreign dist-bzip2 +# where devtools instal m4 snippets +# argh, executed literally +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ @@ -57,12 +63,8 @@ # info '(automake)Conditionals' if CREATE_PKGCONFIG -# pkg-config -# if a package does not have its own pc, copy the generic one -$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in - test -f $@ || cp -p $< $@ # create the file here instead of by configure -# because the prerequisite is made here +# because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' $(RPMNAME).pc: $(RPMNAME).pc.in @@ -94,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -115,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -142,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -198,10 +200,13 @@ false; \ fi +check-textdomain: + $(Y2TOOL) check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.75/VERSION new/yast2-pkg-bindings-2.13.76/VERSION --- old/yast2-pkg-bindings-2.13.75/VERSION 2006-05-16 22:18:35.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.76/VERSION 2006-05-18 16:50:25.000000000 +0200 @@ -1 +1 @@ -2.13.75 +2.13.76 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.75/configure.in new/yast2-pkg-bindings-2.13.76/configure.in --- old/yast2-pkg-bindings-2.13.75/configure.in 2005-10-04 14:04:30.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.76/configure.in 2006-05-18 16:51:37.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-pkg-bindings dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.12.7, http://www.suse.de/feedback, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.13.76, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.12.7" +VERSION="2.13.76" RPMNAME="yast2-pkg-bindings" MAINTAINER="Michael Andres <ma(a)suse.de>" @@ -110,8 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) @@ -158,6 +158,7 @@ AC_HEADER_STDC +PKG_CHECK_MODULES([ZYPP], [libzypp]) AX_CHECK_DOCBOOK AC_CONFIG_FILES(Makefile doc/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.75/src/Package.cc new/yast2-pkg-bindings-2.13.76/src/Package.cc --- old/yast2-pkg-bindings-2.13.75/src/Package.cc 2006-05-16 21:57:49.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.76/src/Package.cc 2006-05-18 16:50:06.000000000 +0200 @@ -1818,6 +1818,8 @@ ; ++it) { // reset all transaction flags + if (it->status().isByUser()) + it->status().setLock(false, zypp::ResStatus::USER); it->status().resetTransact(zypp::ResStatus::USER); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.75/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.76/src/PkgModuleFunctions.h --- old/yast2-pkg-bindings-2.13.75/src/PkgModuleFunctions.h 2006-05-02 13:30:47.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.76/src/PkgModuleFunctions.h 2006-05-18 16:50:06.000000000 +0200 @@ -42,6 +42,7 @@ #include <zypp/Pathname.h> #include <zypp/Url.h> #include <zypp/DiskUsageCounter.h> +#include <zypp/SourceManager.h> #include "PkgError.h" @@ -105,6 +106,13 @@ PkgError _last_error; + /** + * Logging helper: + * call zypp::SourceManager::sourceManager()->findSource + * and in case of exception, log error and setLastError AND RETHROW + */ + zypp::Source_Ref logFindSource (zypp::SourceManager::SourceId id); + public: // general /* TYPEINFO: void() */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.75/src/Source.cc new/yast2-pkg-bindings-2.13.76/src/Source.cc --- old/yast2-pkg-bindings-2.13.75/src/Source.cc 2006-05-16 14:03:30.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.76/src/Source.cc 2006-05-18 16:50:06.000000000 +0200 @@ -43,6 +43,28 @@ #include <stdio.h> // snprintf +/** + * Logging helper: + * call zypp::SourceManager::sourceManager()->findSource + * and in case of exception, log error and setLastError AND RETHROW + */ +zypp::Source_Ref PkgModuleFunctions::logFindSource (zypp::SourceManager::SourceId id) +{ + zypp::Source_Ref src; + + try + { + src = zypp::SourceManager::sourceManager()->findSource(id); + } + catch (const zypp::Exception& excpt) + { + y2error("Cannot find source %ld: %s",id, excpt.msg().c_str() ); + _last_error.setLastError(excpt.asUserString()); + throw; + } + return src; +} + /**************************************************************************************** * @builtin SourceSetRamCache * @short Allow/prevent InstSrces from caching package metadata on ramdisk @@ -131,15 +153,22 @@ { try { - zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource(*it); - - if( src.enabled() ) + zypp::Source_Ref src = logFindSource(*it); + try + { + if( src.enabled() ) zypp_ptr()->addResolvables (src.resolvables()); + } + catch (const zypp::Exception& excpt) + { + std::string url = src.url().asString(); + y2error ("Error for %s: %s", url.c_str(), excpt.asString().c_str()); + _last_error.setLastError(url + ": " + excpt.asUserString()); + success = false; + } } catch (const zypp::Exception& excpt) { - y2error ("Error in SourceStartManager: %s", excpt.asString().c_str()); - _last_error.setLastError(excpt.asUserString()); success = false; } } @@ -327,13 +356,10 @@ try { - src = zypp::SourceManager::sourceManager()->findSource(id->value()); + src = logFindSource(id->value()); } catch (const zypp::Exception& excpt) { - y2error("Cannot find source '%lld': %s" - ,id->value(), excpt.msg().c_str() ); - _last_error.setLastError(excpt.asUserString()); return YCPVoid (); } @@ -375,13 +401,11 @@ try { - src = zypp::SourceManager::sourceManager()->findSource(id->value()); + src = logFindSource(id->value()); } catch (const zypp::Exception& excpt) { - y2error ("Source ID %lld not found: %s", id->asInteger()->value(), excpt.msg().c_str()); - _last_error.setLastError(excpt.asUserString()); - return YCPVoid(); + return YCPVoid (); } data->add( YCPString("media_count"), YCPInteger(src.numberOfMedia())); @@ -428,13 +452,11 @@ zypp::Source_Ref src; try { - src = zypp::SourceManager::sourceManager()->findSource(id->asInteger()->value()); + src = logFindSource(id->value()); } catch (const zypp::Exception& excpt) { - y2error ("Source ID not found: %lld", id->asInteger()->value()); - _last_error.setLastError(excpt.asUserString()); - return YCPVoid(); + return YCPVoid (); } #warning product category handling??? @@ -523,13 +545,11 @@ zypp::Source_Ref src; try { - src = zypp::SourceManager::sourceManager()->findSource(id->asInteger()->value()); + src = logFindSource(id->value()); } catch (const zypp::Exception& excpt) { - _last_error.setLastError(excpt.asUserString()); - y2error ("Source ID not found: %lld", id->asInteger()->value()); - return YCPVoid(); + return YCPVoid (); } zypp::filesystem::Pathname path; @@ -577,13 +597,11 @@ zypp::Source_Ref src; try { - src = zypp::SourceManager::sourceManager()->findSource(id->asInteger()->value()); + src = logFindSource(id->value()); } catch (const zypp::Exception& excpt) { - _last_error.setLastError(excpt.asUserString()); - y2error ("Source ID not found: %lld", id->asInteger()->value()); - return YCPVoid(); + return YCPVoid (); } zypp::filesystem::Pathname path; @@ -631,13 +649,11 @@ try { - src = zypp::SourceManager::sourceManager()->findSource(id->value()); + src = logFindSource(id->value()); } catch (const zypp::Exception& excpt) { - _last_error.setLastError(excpt.asUserString()); - y2error ("Source ID %lld not found: %s", id->asInteger()->value(), excpt.msg().c_str()); - return YCPVoid(); + return YCPVoid (); } zypp::filesystem::Pathname path; @@ -671,12 +687,10 @@ { zypp::Source_Ref src; try { - src = zypp::SourceManager::sourceManager()->findSource(id->value()); + src = logFindSource(id->value()); } - catch (const zypp::Exception & excpt) + catch (const zypp::Exception& excpt) { - _last_error.setLastError(excpt.asUserString()); - y2error ("Source ID %lld not found: %s", id->asInteger()->value(), excpt.msg().c_str()); return YCPBoolean(false); } @@ -1107,12 +1121,10 @@ bool enabled = e->value(); try { - src = zypp::SourceManager::sourceManager()->findSource(id->asInteger()->value()); + src = logFindSource(id->value()); } - catch(const zypp::Exception& excpt) + catch (const zypp::Exception& excpt) { - _last_error.setLastError(excpt.asUserString()); - y2error ("Source ID not found: %lld", id->asInteger()->value()); return YCPBoolean(false); } @@ -1146,12 +1158,10 @@ try { - src = zypp::SourceManager::sourceManager()->findSource(id->value()); + src = logFindSource(id->value()); } catch (const zypp::Exception& excpt) { - y2error ("Source ID %lld not found: %s", id->asInteger()->value(), excpt.msg().c_str()); - _last_error.setLastError(excpt.asUserString()); return YCPVoid(); } @@ -1189,9 +1199,10 @@ zypp::Source_Ref src; try { - src = zypp::SourceManager::sourceManager()->findSource(id->asInteger()->value()); - } catch( const zypp::Exception & expt ) { - y2error ("Source ID not found: %lld", id->asInteger()->value()); + src = logFindSource(id->value()); + } + catch (const zypp::Exception& excpt) + { return YCPBoolean(false); } @@ -1385,9 +1396,10 @@ zypp::Source_Ref src; try { - src = zypp::SourceManager::sourceManager()->findSource(id->asInteger()->value()); - } catch(...) { - y2error ("Source ID not found: %lld", id->asInteger()->value()); + src = logFindSource(id->value()); + } + catch (const zypp::Exception& excpt) + { return YCPBoolean(false); } @@ -1412,9 +1424,10 @@ zypp::Source_Ref src; try { - src = zypp::SourceManager::sourceManager()->findSource(id->asInteger()->value()); - } catch(...) { - y2error ("Source ID not found: %lld", id->asInteger()->value()); + src = logFindSource(id->value()); + } + catch (const zypp::Exception& excpt) + { return YCPBoolean(false); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-network
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package yast2-network checked in at Thu May 18 19:10:12 CEST 2006. -------- --- yast2-network/yast2-network.changes 2006-04-25 11:11:12.000000000 +0200 +++ yast2-network/yast2-network.changes 2006-05-17 17:31:44.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 17 17:30:35 CEST 2006 - mvidner(a)suse.cz + +- For iucv, create static hwcfgs, like hwcfg-static-iucv-id-$ID + (#176330). +- 2.13.49 + +------------------------------------------------------------------- Old: ---- yast2-network-2.13.48.tar.bz2 New: ---- yast2-network-2.13.49.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.AoA5Rw/_old 2006-05-18 19:09:51.000000000 +0200 +++ /var/tmp/diff_new_pack.AoA5Rw/_new 2006-05-18 19:09:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.13.48) +# spec file for package yast2-network (Version 2.13.49) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-network -Version: 2.13.48 +Version: 2.13.49 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.13.48.tar.bz2 +Source0: yast2-network-2.13.49.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig @@ -49,7 +49,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.13.48 +%setup -n yast2-network-2.13.49 %build %{prefix}/bin/y2tool y2autoconf @@ -103,6 +103,10 @@ /usr/share/YaST2/schema/autoyast/rnc/networking.rnc %changelog -n yast2-network +* Wed May 17 2006 - mvidner(a)suse.cz +- For iucv, create static hwcfgs, like hwcfg-static-iucv-id-$ID + (#176330). +- 2.13.49 * Tue Apr 25 2006 - mvidner(a)suse.cz - Added an autoyast option to apply the network settings immediately so that suse_register or OES can use them (#128810, #168806). ++++++ yast2-network-2.13.48.tar.bz2 -> yast2-network-2.13.49.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.48/VERSION new/yast2-network-2.13.49/VERSION --- old/yast2-network-2.13.48/VERSION 2006-04-25 11:10:03.000000000 +0200 +++ new/yast2-network-2.13.49/VERSION 2006-05-17 17:31:41.000000000 +0200 @@ -1 +1 @@ -2.13.48 +2.13.49 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.48/configure new/yast2-network-2.13.49/configure --- old/yast2-network-2.13.48/configure 2006-04-25 11:14:25.000000000 +0200 +++ new/yast2-network-2.13.49/configure 2006-05-18 16:53:00.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-network 2.13.48. +# Generated by GNU Autoconf 2.59 for yast2-network 2.13.49. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -269,9 +269,9 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.13.48' -PACKAGE_STRING='yast2-network 2.13.48' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_VERSION='2.13.49' +PACKAGE_STRING='yast2-network 2.13.49' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-network 2.13.48 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.13.49 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.13.48:";; + short | recursive ) echo "Configuration of yast2-network 2.13.49:";; esac cat <<\_ACEOF @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.13.48 +yast2-network configure 2.13.49 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-network $as_me 2.13.48, which was +It was created by yast2-network $as_me 2.13.49, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.13.48' + VERSION='2.13.49' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.48" +VERSION="2.13.49" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-network $as_me 2.13.48, which was +This file was extended by yast2-network $as_me 2.13.49, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.13.48 +yast2-network config.status 2.13.49 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.48/configure.in new/yast2-network-2.13.49/configure.in --- old/yast2-network-2.13.48/configure.in 2006-04-25 11:14:13.000000000 +0200 +++ new/yast2-network-2.13.49/configure.in 2006-05-18 16:52:44.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.13.48, http://www.suse.de/feedback, yast2-network) +AC_INIT(yast2-network, 2.13.49, http://bugs.opensuse.org/, yast2-network) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.48" +VERSION="2.13.49" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.48/src/lan/hardware.ycp new/yast2-network-2.13.49/src/lan/hardware.ycp --- old/yast2-network-2.13.48/src/lan/hardware.ycp 2006-01-05 16:42:56.000000000 +0100 +++ new/yast2-network-2.13.49/src/lan/hardware.ycp 2006-05-17 17:31:53.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: hardware.ycp 26655 2005-12-19 16:38:20Z mvidner $ + * $Id: hardware.ycp 30982 2006-05-17 15:31:47Z mvidner $ */ { @@ -737,7 +737,8 @@ if(ret == `next) { if(Lan::type == "iucv") { - Lan::nm_name = "iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); + // #176330, must be static + Lan::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); Lan::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } else if (Lan::type != "hsi") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.48/src/modules/Internet.ycp new/yast2-network-2.13.49/src/modules/Internet.ycp --- old/yast2-network-2.13.48/src/modules/Internet.ycp 2006-03-09 13:22:59.000000000 +0100 +++ new/yast2-network-2.13.49/src/modules/Internet.ycp 2006-05-17 17:27:58.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec(a)suse.cz> * Arvin Schnell <arvin(a)suse.de> * - * $Id: Internet.ycp 28676 2006-03-07 21:18:58Z jdsn $ + * $Id: Internet.ycp 30981 2006-05-17 15:27:53Z mvidner $ */ { @@ -207,6 +207,7 @@ */ global define boolean Status() { integer ret = (integer) SCR::Execute(.target.bash, "/sbin/ifstatus " + device); + y2milestone ("ifstatus %1: %2", device, ret); return ret == 0 || ret == 10; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-installation
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package yast2-installation checked in at Thu May 18 19:09:41 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-05-16 13:55:20.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2006-05-18 17:08:11.000000000 +0200 @@ -1,0 +2,11 @@ +Thu May 18 17:07:13 CEST 2006 - hare(a)suse.de + +- start iscsid if root is on iSCSI (#176804) + +------------------------------------------------------------------- +Wed May 17 13:08:52 CEST 2006 - jsrain(a)suse.cz + +- set DISPLAYMANAGER_SHUTDOWN according to control file (#169639) +- 2.13.108 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.107.tar.bz2 New: ---- yast2-installation-2.13.108.tar.bz2 yast2-installation-start-iscsid.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.k0fZo4/_old 2006-05-18 19:09:34.000000000 +0200 +++ /var/tmp/diff_new_pack.k0fZo4/_new 2006-05-18 19:09:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.107) +# spec file for package yast2-installation (Version 2.13.108) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,13 @@ # norootforbuild Name: yast2-installation -Version: 2.13.107 +Version: 2.13.108 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.107.tar.bz2 +Source0: yast2-installation-2.13.108.tar.bz2 +Patch0: yast2-installation-start-iscsid.diff prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +49,8 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.107 +%setup -n yast2-installation-2.13.108 +%patch0 -p1 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +108,11 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Thu May 18 2006 - hare(a)suse.de +- start iscsid if root is on iSCSI (#176804) +* Wed May 17 2006 - jsrain(a)suse.cz +- set DISPLAYMANAGER_SHUTDOWN according to control file (#169639) +- 2.13.108 * Tue May 16 2006 - jsrain(a)suse.cz - marked missed text for translation (#175930) - 2.13.107 ++++++ yast2-installation-2.13.107.tar.bz2 -> yast2-installation-2.13.108.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.107/VERSION new/yast2-installation-2.13.108/VERSION --- old/yast2-installation-2.13.107/VERSION 2006-05-16 13:43:52.000000000 +0200 +++ new/yast2-installation-2.13.108/VERSION 2006-05-17 13:09:59.000000000 +0200 @@ -1 +1 @@ -2.13.107 +2.13.108 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.107/configure new/yast2-installation-2.13.108/configure --- old/yast2-installation-2.13.107/configure 2006-05-16 13:54:15.000000000 +0200 +++ new/yast2-installation-2.13.108/configure 2006-05-17 13:17:51.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.107. +# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.108. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.13.107' -PACKAGE_STRING='yast2-installation 2.13.107' +PACKAGE_VERSION='2.13.108' +PACKAGE_STRING='yast2-installation 2.13.108' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-installation 2.13.107 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.13.108 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.13.107:";; + short | recursive ) echo "Configuration of yast2-installation 2.13.108:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.13.107 +yast2-installation configure 2.13.108 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-installation $as_me 2.13.107, which was +It was created by yast2-installation $as_me 2.13.108, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.13.107' + VERSION='2.13.108' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.107" +VERSION="2.13.108" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2906,7 +2906,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-installation $as_me 2.13.107, which was +This file was extended by yast2-installation $as_me 2.13.108, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2961,7 +2961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.13.107 +yast2-installation config.status 2.13.108 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.107/configure.in new/yast2-installation-2.13.108/configure.in --- old/yast2-installation-2.13.107/configure.in 2006-05-16 13:54:09.000000000 +0200 +++ new/yast2-installation-2.13.108/configure.in 2006-05-17 13:17:44.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.107, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.13.108, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.107" +VERSION="2.13.108" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.107/control/control.xml new/yast2-installation-2.13.108/control/control.xml --- old/yast2-installation-2.13.107/control/control.xml 2006-05-04 13:44:25.000000000 +0200 +++ new/yast2-installation-2.13.108/control/control.xml 2006-05-17 11:11:42.000000000 +0200 @@ -18,6 +18,7 @@ <inform_about_suboptimal_distribution config:type="boolean">true</inform_about_suboptimal_distribution> <skip_language_dialog config:type="boolean">true</skip_language_dialog> <ui_mode>simple</ui_mode> + <displaymanager_shutdown>auto</displaymanager_shutdown> <enable_clone config:type="boolean">false</enable_clone> <enable_register_hwdata config:type="boolean">true</enable_register_hwdata> <enable_register_optional config:type="boolean">true</enable_register_optional> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.107/src/clients/inst_default_desktop.ycp new/yast2-installation-2.13.108/src/clients/inst_default_desktop.ycp --- old/yast2-installation-2.13.107/src/clients/inst_default_desktop.ycp 2006-04-25 21:53:15.000000000 +0200 +++ new/yast2-installation-2.13.108/src/clients/inst_default_desktop.ycp 2006-05-17 13:09:19.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configure FAM according to control file and defauls WM * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: inst_default_desktop.ycp 30413 2006-04-24 14:20:29Z jsrain $ + * $Id: inst_default_desktop.ycp 30967 2006-05-17 11:09:11Z jsrain $ * */ @@ -13,6 +13,7 @@ import "Mode"; import "Packages"; + import "ProductFeatures"; if ( !Mode::update () ) { @@ -150,6 +151,14 @@ SCR::Write (.sysconfig.windowmanager.DEFAULT_WM, default_wm); SCR::Write (.sysconfig.windowmanager.X_MOUSE_CURSOR, default_cursor); SCR::Write (.sysconfig.windowmanager, nil); + string dm_shutdown = ProductFeatures::GetStringFeature ("globals", + "displaymanager_shutdown"); + y2milestone ("Logon manager shutdown: %1", dm_shutdown); + if (dm_shutdown != nil && dm_shutdown != "") + { + SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN, + dm_shutdown); + } SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER, default_dm); SCR::Write (.sysconfig.displaymanager, nil); } ++++++ yast2-installation-start-iscsid.diff ++++++ diff -pur yast2-installation-2.13.108.orig/startup/Second-Stage/S06-services yast2-installation-2.13.108/startup/Second-Stage/S06-services --- yast2-installation-2.13.108.orig/startup/Second-Stage/S06-services 2005-12-16 15:46:44.000000000 +0100 +++ yast2-installation-2.13.108/startup/Second-Stage/S06-services 2006-05-18 17:03:23.000000000 +0200 @@ -51,4 +51,12 @@ if [ -x /usr/sbin/rchal ] ; then test -f /usr/sbin/rchal && /usr/sbin/rchal start fi +#============================================== +# 9.2) start iscsid +#---------------------------------------------- +if [ -d /sys/class/iscsi_session/session* ] ; then + log "\tStarting iscsid..." + test -x /sbin/iscsid && /sbin/iscsid -p /var/run/iscsi.pid -c /etc/iscsid.conf +fi + sleep 1 Only in yast2-installation-2.13.108/startup/Second-Stage: S06-services~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit twinkle
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package twinkle checked in at Thu May 18 19:09:23 CEST 2006. -------- --- twinkle/twinkle.changes 2006-01-27 11:56:38.000000000 +0100 +++ twinkle/twinkle.changes 2006-05-18 15:34:31.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 18 15:33:13 CEST 2006 - hvogel(a)suse.de + +- update to version 0.7.1 + * UTF-8 support to properly display non-ASCII characters + * Speex support (narrow, wide and ultra wide band) + * Support for dynamic payload numbers for audio codecs in SDP + * New SIP protocol option: allow SDP change in INVITE responses + +------------------------------------------------------------------- Old: ---- twinkle-0.5.tar.bz2 New: ---- twinkle-0.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ twinkle.spec ++++++ --- /var/tmp/diff_new_pack.QyEVMO/_old 2006-05-18 19:09:15.000000000 +0200 +++ /var/tmp/diff_new_pack.QyEVMO/_new 2006-05-18 19:09:15.000000000 +0200 @@ -1,20 +1,20 @@ # -# spec file for package twinkle (Version 0.5) +# spec file for package twinkle (Version 0.7.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: twinkle -BuildRequires: ccrtp-devel kdelibs3-devel xorg-x11 +BuildRequires: ccrtp-devel kdelibs3-devel libsndfile-devel speex-devel xorg-x11 Summary: A SIP Soft Phone -Version: 0.5 -Release: 2 +Version: 0.7.1 +Release: 1 License: GPL Group: Productivity/Telephony/SIP/Clients Source: %{name}-%{version}.tar.bz2 @@ -33,8 +33,6 @@ %prep %setup -q -#%patch0 -#%patch1 %build autoreconf -fi @@ -62,6 +60,12 @@ %{_datadir}/applications/twinkle.desktop %changelog -n twinkle +* Thu May 18 2006 - hvogel(a)suse.de +- update to version 0.7.1 + * UTF-8 support to properly display non-ASCII characters + * Speex support (narrow, wide and ultra wide band) + * Support for dynamic payload numbers for audio codecs in SDP + * New SIP protocol option: allow SDP change in INVITE responses * Fri Jan 27 2006 - hvogel(a)suse.de - export QTDIR * Wed Jan 25 2006 - mls(a)suse.de ++++++ twinkle-0.5.tar.bz2 -> twinkle-0.7.1.tar.bz2 ++++++ ++++ 36593 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit swami
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package swami checked in at Thu May 18 19:09:09 CEST 2006. -------- --- swami/swami.changes 2006-01-25 21:41:55.000000000 +0100 +++ swami/swami.changes 2006-05-18 16:43:00.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 18 16:41:34 CEST 2006 - tiwai(a)suse.de + +- updated to version 0.9.3: + * fix messages about saved files + * fix for spash screen + * fix endianness problems + +------------------------------------------------------------------- Old: ---- swami-0.9.2.tar.bz2 New: ---- swami-0.9.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swami.spec ++++++ --- /var/tmp/diff_new_pack.uWFlVW/_old 2006-05-18 19:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.uWFlVW/_new 2006-05-18 19:08:56.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package swami (Version 0.9.2) +# spec file for package swami (Version 0.9.3) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,8 +13,8 @@ Name: swami BuildRequires: alsa-devel audiofile-devel flac-devel fluidsynth-devel gtk-devel jack-devel libpng-devel libsndfile-devel popt-devel update-desktop-files Summary: A SoundFont Editor -Version: 0.9.2 -Release: 142 +Version: 0.9.3 +Release: 1 License: GPL Group: Productivity/Multimedia/Sound/Editors and Convertors Source: %{name}-%{version}.tar.bz2 @@ -87,6 +87,11 @@ %{_datadir}/locale/*/*/* %changelog -n swami +* Thu May 18 2006 - tiwai(a)suse.de +- updated to version 0.9.3: + * fix messages about saved files + * fix for spash screen + * fix endianness problems * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Oct 05 2005 - tiwai(a)suse.de ++++++ swami-0.9.2.tar.bz2 -> swami-0.9.3.tar.bz2 ++++++ ++++ 65436 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/swami-0.9.2/ChangeLog new/swami-0.9.3/ChangeLog --- old/swami-0.9.2/ChangeLog 2003-11-16 10:34:09.000000000 +0100 +++ new/swami-0.9.3/ChangeLog 2006-04-27 22:13:00.000000000 +0200 @@ -1,3 +1,27 @@ +2005-06-18 Josh Green <jgreen(a)users.sourceforge.net> + + * Removed stooopid message about not distributing saved files, + added sample export functionality (finally?), loop/instrument info + now saved/loaded with samples when using libaudiofile with AIFF + files, some bug fixes, la la la la la don't give a shit, Swami 1.0 + soon to replace you. + +2004-05-18 Josh Green <jgreen(a)users.sourceforge.net> + + * src/gui/Makefile.am: Fixed generation of empty splash_png.c when + splash is disabled. + +2004-05-16 Josh Green <jgreen(a)users.sourceforge.net> + + * configure.ac: Fixed --disable-splash so libpng isn't linked. + +2004-05-06 Josh Green <jgreen(a)users.sourceforge.net> + + * src/libinstpatch/src/sffile.c (ipfile_end_chunk): Was saving + chunk size without regard for endianness, now fixed. + * src/plugins/wavetbl_fluidsynth.c: Removed temporary hack + to change "loop till release" mode instruments to "loop". + 2003-11-16 Josh Green <jgreen(a)users.sourceforge.net> Swami 0.9.2 release 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/swami-0.9.2/README new/swami-0.9.3/README --- old/swami-0.9.2/README 2003-03-14 01:12:43.000000000 +0100 +++ new/swami-0.9.3/README 2006-04-27 22:12:06.000000000 +0200 @@ -1,6 +1,6 @@ +-------------------------------------------------------+ + Swami - README + -+ Copyright (C) 1999-2003 Josh Green + ++ Copyright (C) 1999-2005 Josh Green + + Email: jgreen(a)users.sourceforge.net + + Swami homepage: http://swami.sourceforge.net + +-------------------------------------------------------+ @@ -10,6 +10,7 @@ ******************************************************************* ===================================== +** New in Swami 0.9.3 ** ** New in Swami 0.9.1 ** 1. What is Swami? 2. What happened to the Smurf SoundFont Editor? @@ -31,6 +32,16 @@ 18. Contact ===================================== +** New in Swami 0.9.3 ** +Just a little release to satisfy some user requests. Swami 1.0 soon to be +released, I hope :) + +- Sample export now works (multiple samples saved to a selected directory) +- Loop/instrument info exported/loaded when using libaudiofile and AIFF files +- Removed useless message in regards to not distributing saved files, + go ahead have fun! + + ** New in Swami 0.9.1 ** ------------------------------------- Swami 0.9.1 is essentially an update to use the new FluidSynth @@ -115,7 +126,6 @@ Things missing (as of this README): - Undo support -- sample exporting - virtual SoundFont bank support - OSS AWE/SB Live! wavetable backend @@ -135,12 +145,13 @@ - GTK+ v1.2 - pkg-config - FluidSynth 1.0.0 (software wavetable synthesizer, was called iiwusynth) -- audiofile 0.2.0 or libsndfile 1.0.0 +- audiofile 0.2.0 or libsndfile 1.0.0 (audiofile if you want to import/export + loop and instrument info) GTK homepage: http://www.gtk.org FluidSynth homepage: http://www.fluidsynth.org -libsndfile homepage: http://www.zip.com.au/~erikd/libsndfile/ audiofile homepage: http://www.68k.org/~michael/audiofile/ +libsndfile homepage: http://www.zip.com.au/~erikd/libsndfile/ ALSA homepage: http://www.alsa-project.org OSS homepage: http://www.4front-tech.com @@ -176,7 +187,6 @@ - Undo support - Copy/Paste generator parameters - Graphical manipulation of generator parameters -- Loading of SoundFont 1.x files via conversion utility Was part of Smurf, not yet added: - Loading, saving and editing of virtual bank (*.bnk) files 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/swami-0.9.2/configure.ac new/swami-0.9.3/configure.ac --- old/swami-0.9.2/configure.ac 2003-11-16 09:31:30.000000000 +0100 +++ new/swami-0.9.3/configure.ac 2006-04-27 22:12:25.000000000 +0200 @@ -6,7 +6,7 @@ SWAMI_VERSION_MAJOR=0 SWAMI_VERSION_MINOR=9 -SWAMI_VERSION_MICRO=2 +SWAMI_VERSION_MICRO=3 SWAMI_VERSION=$SWAMI_VERSION_MAJOR.$SWAMI_VERSION_MINOR.$SWAMI_VERSION_MICRO SWAMI_VERSION=${SWAMI_VERSION} @@ -121,8 +121,6 @@ dnl libpng detection (Swami intro splash image) PKG_CHECK_MODULES(PNG, libpng, PNG_SUPPORT=1, PNG_SUPPORT=0) -AC_SUBST(PNG_CFLAGS) -AC_SUBST(PNG_LIBS) AM_CONDITIONAL(PNG_SUPPORT, test "$PNG_SUPPORT" = "1") AC_ARG_ENABLE(splash, @@ -130,14 +128,19 @@ disable_splash="yes") splash_enabled="" - if test "${disable_splash}" != "yes" -a "$PNG_SUPPORT" = "1" ; then splash_enabled="yes" AC_DEFINE(SPLASH, 1, [Define to compile splash intro image functions]) +else + PNG_CFLAGS= + PNG_LIBS= fi AM_CONDITIONAL(BUILD_SPLASH, test "x$splash_enabled" = "xyes" -a "$MINGW32" != "1") +AC_SUBST(PNG_CFLAGS) +AC_SUBST(PNG_LIBS) + dnl *** Plugin stuff *** Binary files old/swami-0.9.2/po/de.gmo and new/swami-0.9.3/po/de.gmo differ 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/swami-0.9.2/po/de.po new/swami-0.9.3/po/de.po --- old/swami-0.9.2/po/de.po 2003-11-16 11:33:33.000000000 +0100 +++ new/swami-0.9.3/po/de.po 2006-04-28 13:15:30.000000000 +0200 @@ -45,7 +45,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.9.0pre1\n" -"POT-Creation-Date: 2003-11-16 02:33-0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-04-28 13:15+0200\n" "PO-Revision-Date: 2000-09-14 18:51+0200\n" "Last-Translator: Johannes Drechsel-Burkhard <jdb(a)chello.at>\n" "Language-Team: Deutsch <de(a)li.org>\n" @@ -125,8 +126,8 @@ #: src/gui/glade_interface.c:287 src/gui/glade_interface.c:1046 #: src/gui/glade_interface.c:2653 src/gui/glade_interface.c:2819 #: src/gui/glade_interface.c:3056 src/gui/item_paste.c:397 -#: src/gui/SwamiUIMultiList.c:125 src/gui/SwamiUIObject.c:489 -#: src/gui/SwamiUIObject.c:1424 +#: src/gui/SwamiUIMultiList.c:125 src/gui/SwamiUIObject.c:503 +#: src/gui/SwamiUIObject.c:1437 msgid "Cancel" msgstr "Abbrechen" @@ -198,7 +199,7 @@ #: src/gui/glade_interface.c:722 src/gui/glade_interface.c:1950 #: src/gui/glade_interface.c:1959 src/gui/glade_interface.c:1968 -#: src/gui/SwamiUIObject.c:999 src/gui/SwamiUIObject.c:1198 +#: src/gui/SwamiUIObject.c:1013 src/gui/SwamiUIObject.c:1211 msgid "Browse" msgstr "Durchsuchen" @@ -273,7 +274,7 @@ #: src/gui/glade_interface.c:1039 src/gui/glade_interface.c:1155 #: src/gui/glade_interface.c:2639 src/gui/glade_interface.c:2812 -#: src/gui/SwamiUIMultiList.c:120 src/gui/SwamiUIObject.c:1416 +#: src/gui/SwamiUIMultiList.c:120 src/gui/SwamiUIObject.c:1429 #: src/gui/util.c:114 src/gui/util.c:497 msgid "OK" msgstr "OK" @@ -313,7 +314,7 @@ #: src/gui/glade_interface.c:1269 src/gui/item_paste.c:193 #: src/gui/item_paste.c:211 src/gui/item_paste.c:228 -#: src/gui/SwamiUIObject.c:991 src/gui/SwamiUIObject.c:1195 +#: src/gui/SwamiUIObject.c:1005 src/gui/SwamiUIObject.c:1208 msgid "File" msgstr "Datei" @@ -325,7 +326,7 @@ msgid "Open" msgstr "Öffnen" -#: src/gui/glade_interface.c:1303 src/gui/SwamiUIObject.c:991 +#: src/gui/glade_interface.c:1303 src/gui/SwamiUIObject.c:1005 #: src/gui/SwamiUITreeMenu.c:109 msgid "Save" msgstr "Speichern" @@ -334,7 +335,7 @@ msgid "Save As" msgstr "Speichern unter" -#: src/gui/glade_interface.c:1328 src/gui/SwamiUIObject.c:488 +#: src/gui/glade_interface.c:1328 src/gui/SwamiUIObject.c:502 msgid "Quit" msgstr "Beenden" @@ -1004,7 +1005,7 @@ msgstr "Globale Instrument Zone" #: src/gui/item_paste.c:189 src/gui/item_paste.c:209 src/gui/item_paste.c:226 -#: src/gui/SwamiUIObject.c:991 src/gui/SwamiUIObject.c:1195 +#: src/gui/SwamiUIObject.c:1005 src/gui/SwamiUIObject.c:1208 msgid "Name" msgstr "Name" @@ -1079,7 +1080,7 @@ msgid "Velocity mode" msgstr "Geschwindigkeits Modus" -#: src/gui/pref.c:381 src/gui/pref.c:386 +#: src/gui/pref.c:381 src/gui/pref.c:386 src/gui/SwamiUIObject.c:1792 msgid "Choose directory" msgstr "Verzeichnis wählen" @@ -1406,73 +1407,73 @@ msgid "Invalid (cc = %d, index = %d)" msgstr "Ungültig (cc = %d, index = %d)" -#: src/gui/SwamiUIObject.c:445 +#: src/gui/SwamiUIObject.c:459 #, c-format msgid "GUI init routine failed for plugin %s" msgstr "" -#: src/gui/SwamiUIObject.c:484 +#: src/gui/SwamiUIObject.c:498 msgid "Unsaved sound fonts, and you want to quit?" msgstr "Noch ungesicherte SoundFonts, und Sie wollen Beenden?" -#: src/gui/SwamiUIObject.c:486 +#: src/gui/SwamiUIObject.c:500 msgid "Are you sure you want to quit?" msgstr "Tatsächlich beenden?" -#: src/gui/SwamiUIObject.c:862 +#: src/gui/SwamiUIObject.c:876 msgid "Open Files" msgstr "Dateien Öffnen" -#: src/gui/SwamiUIObject.c:989 +#: src/gui/SwamiUIObject.c:1003 msgid "Close files" msgstr "Dateien Schließen" -#: src/gui/SwamiUIObject.c:990 +#: src/gui/SwamiUIObject.c:1004 msgid "Save changed files before closing?" msgstr "Geänderte Dateien vor dem Schließen speichern?" -#: src/gui/SwamiUIObject.c:991 +#: src/gui/SwamiUIObject.c:1005 msgid "Status" msgstr "Status" -#: src/gui/SwamiUIObject.c:993 src/gui/SwamiUIObject.c:1034 -#: src/gui/SwamiUIObject.c:1076 src/gui/SwamiUIObject.c:1131 +#: src/gui/SwamiUIObject.c:1007 src/gui/SwamiUIObject.c:1048 +#: src/gui/SwamiUIObject.c:1090 src/gui/SwamiUIObject.c:1145 msgid "Yes" msgstr "Ja" -#: src/gui/SwamiUIObject.c:996 src/gui/SwamiUIObject.c:1034 +#: src/gui/SwamiUIObject.c:1010 src/gui/SwamiUIObject.c:1048 msgid "No" msgstr "Nein" -#: src/gui/SwamiUIObject.c:1006 +#: src/gui/SwamiUIObject.c:1020 msgid "Save All" msgstr "Alle Speichern" -#: src/gui/SwamiUIObject.c:1012 +#: src/gui/SwamiUIObject.c:1026 msgid "Discard All" msgstr "Alle Verwerfen" -#: src/gui/SwamiUIObject.c:1036 +#: src/gui/SwamiUIObject.c:1050 msgid "Not changed" msgstr "Nicht geändert" -#: src/gui/SwamiUIObject.c:1037 +#: src/gui/SwamiUIObject.c:1051 msgid "First save" msgstr "Zuerst speichern" -#: src/gui/SwamiUIObject.c:1193 +#: src/gui/SwamiUIObject.c:1207 msgid "Save files" msgstr "Dateien speichern" -#: src/gui/SwamiUIObject.c:1267 +#: src/gui/SwamiUIObject.c:1280 msgid "Set file name" msgstr "Dateiname angeben" -#: src/gui/SwamiUIObject.c:1626 +#: src/gui/SwamiUIObject.c:1639 msgid "Load samples" msgstr "Samples laden" -#: src/gui/SwamiUIObject.c:1724 +#: src/gui/SwamiUIObject.c:1737 msgid "sample" msgstr "Sample" @@ -1573,8 +1574,9 @@ msgstr "Eigenschaften" #: src/gui/SwamiUITreeMenu.c:111 -msgid "Export" -msgstr "Exportieren" +#, fuzzy +msgid "Export Samples" +msgstr "Gehe zu Sample" #: src/gui/SwamiUITreeMenu.c:113 #, fuzzy @@ -1976,6 +1978,7 @@ msgstr "Konnte virtuelle Bank %s nicht öffnen" #: src/libinstpatch/src/vbank.c:120 +#, c-format msgid "## Virtual Sound Font Bank file written by:\n" msgstr "## Virtuelle Sound Font Bank Datei geschrieben von:\n" @@ -2171,7 +2174,7 @@ msgid "Error loading plugin %s, reason: %s\n" msgstr "" -#: src/libswami/SwamiSamplelib.c:353 +#: src/libswami/SwamiSamplelib.c:495 #, c-format msgid "Sample is too small (%d samples)" msgstr "Sample ist zu klein (%d Samples)" @@ -2188,22 +2191,22 @@ msgid "Sound font item property change" msgstr "SoundFont Eintrag Eigenschaften ändern" -#: src/plugins/samplelib_audiofile.c:64 +#: src/plugins/samplelib_audiofile.c:56 msgid "audiofile - audiofile library plugin" msgstr "" -#: src/plugins/samplelib_audiofile.c:65 src/plugins/samplelib_libsndfile.c:59 +#: src/plugins/samplelib_audiofile.c:57 src/plugins/samplelib_libsndfile.c:59 #: src/plugins/wavetbl_fluidsynth.c:184 msgid "Josh Green" msgstr "" -#: src/plugins/samplelib_audiofile.c:177 +#: src/plugins/samplelib_audiofile.c:195 #: src/plugins/samplelib_libsndfile.c:172 #, c-format msgid "Failed to open audio file \"%s\" for writing" msgstr "Konnte Audiodatei \"%s\" nicht zum Schreiben öffnen" -#: src/plugins/samplelib_audiofile.c:180 +#: src/plugins/samplelib_audiofile.c:198 #: src/plugins/samplelib_libsndfile.c:175 #, c-format msgid "Failed to open audio file \"%s\" for reading" @@ -2237,6 +2240,9 @@ msgid "<temporary>" msgstr "" +#~ msgid "Export" +#~ msgstr "Exportieren" + #~ msgid "iiwusynth" #~ msgstr "iiwusynth" 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/swami-0.9.2/src/gui/Makefile.am new/swami-0.9.3/src/gui/Makefile.am --- old/swami-0.9.2/src/gui/Makefile.am 2003-09-05 05:13:37.000000000 +0200 +++ new/swami-0.9.3/src/gui/Makefile.am 2006-04-26 09:29:20.000000000 +0200 @@ -89,6 +89,9 @@ else \ echo "/* Splash image disabled */" >splash_png.c; \ fi +else +splash_png.c: + echo "/* Splash image disabled */" >splash_png.c endif # Grrr! Force non-distribution of generated splash_png.c 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/swami-0.9.2/src/gui/SwamiUIObject.c new/swami-0.9.3/src/gui/SwamiUIObject.c --- old/swami-0.9.2/src/gui/SwamiUIObject.c 2003-07-26 19:45:18.000000000 +0200 +++ new/swami-0.9.3/src/gui/SwamiUIObject.c 2006-04-27 21:44:50.000000000 +0200 @@ -1,5 +1,5 @@ /*================================================================== - * SwamiUIObject.c - Swami sound font GTK tree object + * SwamiUIObject.c - Swami main user interface object * * Swami * Copyright (C) 1999-2003 Josh Green <jgreen(a)users.sourceforge.net> @@ -31,6 +31,10 @@ #include <gtk/gtk.h> #include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + #include <instpatch.h> #include <libswami/SwamiSamplelib.h> @@ -150,6 +154,13 @@ static gboolean block_spanwin_select = FALSE; +/* characters not included at the end of paired stereo sample names */ +static char *sample_stereo_skipchars = "\t _-([{"; + +/* escaped characters in exported sample names */ +static char *sample_escchars = "\t\\/|"; + + /* Local Prototypes */ static void swamiui_object_class_init (SwamiUIObjectClass *klass); @@ -183,6 +194,9 @@ GtkWidget *dialog); static void swamiui_cb_load_sample_okay (GtkWidget *multisel); static void swamiui_cb_add_samples (GtkWidget *multisel); +static void cb_sample_type_selection_done (GtkWidget *menu, gpointer data); +static void swamiui_export_samples_ok (GtkWidget *btn, GtkWidget *filesel); +static char *make_sample_filename (IPSample *sample, char *path, char *ext); guint swamiui_object_get_type (void) @@ -1190,8 +1204,7 @@ } /* item(s) have been changed, pop user interactive dialog */ - multi = swamiui_multilist_new (_("Save files"), - "*** Please don't distribute any saved sound fonts yet ***", 2, + multi = swamiui_multilist_new (_("Save files"), _("Save files"), 2, _("Name"), _("File")); gtk_signal_connect (GTK_OBJECT (SWAMIUI_MULTILIST (multi)->ok_button), "clicked", cb_save_files_ok, multi); @@ -1762,6 +1775,303 @@ } /** + * swamiui_export_samples: + * @items: List of sample items to export to files. + */ +void +swamiui_export_samples (GList *items) +{ + GtkWidget *filesel; + GtkWidget *opmenu; + GtkWidget *menu; + GtkWidget *mitem; + GtkWidget *hbox; + GtkWidget *label; + GList *newlist; + + filesel = gtk_file_selection_new (_("Choose directory")); + + /* pack a box with file type option menu */ + + hbox = gtk_hbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (GTK_FILE_SELECTION (filesel)->main_vbox), + hbox, FALSE, FALSE, 0); + + label = gtk_label_new ("File type:"); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + + opmenu = gtk_option_menu_new (); + gtk_widget_show (opmenu); + gtk_box_pack_start (GTK_BOX (hbox), opmenu, FALSE, TRUE, 0); + + gtk_object_set_data (GTK_OBJECT (filesel), "opmenu", opmenu); + + label = gtk_label_new ("Note: Loop/tuning info saved only with" + " libaudiofile and AIFF files"); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + + menu = gtk_menu_new (); + + /* hard coded file types, woo hoo! */ + + mitem = gtk_menu_item_new_with_label ("AIFF"); + gtk_object_set_data (GTK_OBJECT (mitem), "type", + GUINT_TO_POINTER (SWAMI_SAMPLELIB_TYPE_AIFF)); + gtk_widget_show (mitem); + gtk_menu_append (GTK_MENU (menu), mitem); + + mitem = gtk_menu_item_new_with_label ("WAV"); + gtk_object_set_data (GTK_OBJECT (mitem), "type", + GUINT_TO_POINTER (SWAMI_SAMPLELIB_TYPE_WAVE)); + gtk_widget_show (mitem); + gtk_menu_append (GTK_MENU (menu), mitem); + + mitem = gtk_menu_item_new_with_label ("AU"); + gtk_object_set_data (GTK_OBJECT (mitem), "type", + GUINT_TO_POINTER (SWAMI_SAMPLELIB_TYPE_AU)); + gtk_widget_show (mitem); + gtk_menu_append (GTK_MENU (menu), mitem); + + gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); + + /* ugggh, GTK 1.2 really sucked with the option menu */ + gtk_signal_connect (GTK_OBJECT (menu), "selection-done", + GTK_SIGNAL_FUNC (cb_sample_type_selection_done), + filesel); + + gtk_widget_show_all (hbox); + + newlist = g_list_copy (items); + gtk_object_set_data_full (GTK_OBJECT (filesel), "items", newlist, + (GtkDestroyNotify)g_list_free); + + /* default file type */ + gtk_object_set_data (GTK_OBJECT (filesel), "type", + GUINT_TO_POINTER (SWAMI_SAMPLELIB_TYPE_AIFF)); + + gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), + "clicked", (GtkSignalFunc) swamiui_export_samples_ok, filesel); + + gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (filesel)-> + cancel_button), "clicked", (GtkSignalFunc) gtk_widget_destroy, + GTK_OBJECT (filesel)); + + gtk_widget_show (filesel); +} + +/* much hate and death to the fucking GTK 1.2 option menu */ +static void +cb_sample_type_selection_done (GtkWidget *menu, gpointer data) +{ + GtkWidget *filesel = GTK_WIDGET (data); + GtkWidget *mitem; + int filetype; + + mitem = gtk_menu_get_active (GTK_MENU (menu)); + + filetype = GPOINTER_TO_UINT + (gtk_object_get_data (GTK_OBJECT (mitem), "type")); + + gtk_object_set_data (GTK_OBJECT (filesel), "type", + GUINT_TO_POINTER (filetype)); +} + +/* callback when user clicks OK on sample export file (directory) selector */ +static void +swamiui_export_samples_ok (GtkWidget *btn, GtkWidget *filesel) +{ + const gchar *filename; + IPSample *sample; + IPSampleData *left, *right; + SwamiSamplelibParams params; + SwamiSamplelib *samplelib; + SwamiSamplelibHandle *handle; + GHashTable *saved_links; /* prevent multiple saves of stereo pairs */ + GList *items, *p; + struct stat buf; + char *path, *filepath; + char *ext; + int filetype; + + samplelib = + SWAMI_SAMPLELIB (swami_get_object_by_type (G_OBJECT (swami_object), + "SwamiSamplelib")); + g_return_if_fail (samplelib != NULL); + + saved_links = g_hash_table_new (NULL, NULL); + + filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel)); + path = g_dirname (filename); /* !! allocated string */ + + items = gtk_object_get_data (GTK_OBJECT (filesel), "items"); + + filetype = GPOINTER_TO_UINT + (gtk_object_get_data (GTK_OBJECT (filesel), "type")); + + ext = swami_samplelib_type_ext (filetype); + + /* check for write access to the path */ + if (stat (path, &buf) != 0 || !S_ISDIR (buf.st_mode) + || access (path, W_OK) != 0) + { + g_critical ("Selected path not a directory or no write access"); + g_free (path); + } + + for (p = items; p; p = p->next) + { + /* not a sample or already saved its stereo linked sample? - skip */ + if (!INSTP_IS_SAMPLE (p->data) + || g_hash_table_lookup (saved_links, p->data)) + continue; + + sample = INSTP_SAMPLE (p->data); + + swami_samplelib_set_params_from_sample (sample, &params); + params.file_type = filetype; + + /* make a unique filename for the sample */ + filepath = make_sample_filename (sample, path, ext); + + handle = swami_samplelib_open (samplelib, filepath, 'w', &params); + if (!handle) + { + g_critical ("Failed to create sample file '%s'", filepath); + g_free (filepath); + continue; + } + + if (!sample->linked) + { + left = sample->sampledata; + right = NULL; + } + else /* stereo */ + { + if (sample->sampletype & IPSAMPLE_TYPE_RIGHT) + { + right = sample->sampledata; + left = sample->linked->sampledata; + } + else + { + left = sample->sampledata; + right = sample->linked->sampledata; + } + + g_hash_table_insert (saved_links, sample->linked, + GUINT_TO_POINTER (TRUE)); + } + + if (swami_samplelib_save_sampledata (handle, left, right) != SWAMI_OK) + { + swami_samplelib_close (handle); + g_critical ("Failed to save sample data to file '%s'", filename); + continue; + } + + swami_samplelib_close (handle); + } + + g_free (path); + g_hash_table_destroy (saved_links); + + gtk_widget_destroy (filesel); +} + +static char * +make_sample_filename (IPSample *sample, char *path, char *ext) +{ + struct stat buf; + char *filepath; + char *name; + char *s1, *s2; + char numstr[6]; + int len, i; + + if (sample->linked) /* stereo? */ + { + /* attempt to strip off any L/R postfixes by using identical portions + of sample names */ + + s1 = sample->name; + s2 = sample->linked->name; + for (; *s1 && *s1 == *s2; s1++, s2++); /* find matching portions */ + + if (s1 > sample->name) /* anything in common? */ + { + /* find last character not in skip chars */ + do + { + s1--; + if (!strchr (sample_stereo_skipchars, *s1)) + { + s1++; + break; + } + } + while (s1 > sample->name); + } + + if (s1 > sample->name) + name = g_strndup (sample->name, s1 - sample->name); + else /* nothing in common? - use this sample's name */ + name = g_strdup (sample->name); + } + else /* mono */ + name = g_strdup (sample->name); + + if (strlen (name) == 0) + { + g_free (name); + name = g_strdup ("untitled"); + } + + /* escape unwanted characters */ + for (s1 = name; *s1; s1++) + if (strchr (sample_escchars, *s1)) *s1 = '_'; + + /* construct complete path with 5 chars padding in case a unique number + needs to be appended */ + filepath = g_strconcat (path, G_DIR_SEPARATOR_S, name, ".", ext, + " ", NULL); + len = strlen (filepath); + filepath[len - 5] = '\0'; /* kill padding for now */ + + /* already exists? - find a unique number to append */ + if (stat (filepath, &buf) == 0) + { + filepath[len - 5] = ' '; /* set back to space */ + + filepath[len - strlen (ext) - 6] = '_'; + filepath[len - strlen (ext) - 1] = '.'; + strcpy (&filepath[len - strlen (ext)], ext); + + s1 = &filepath[len - strlen (ext) - 5]; + for (i = 0; i < 10000; i++) + { + sprintf (numstr, "%04u", i); + strncpy (s1, numstr, 4); + if (stat (filepath, &buf) != 0) + break; + } + + if (i == 10000) + { + g_critical ("Failed to find unique sample file name for '%s'", + name); + g_free (filepath); + g_free (name); + return (NULL); + } + } + + g_free (name); + + return (filepath); +} + +/** * swamiui_unset_gens: * @items: List of patch items * 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/swami-0.9.2/src/gui/SwamiUIObject.h new/swami-0.9.3/src/gui/SwamiUIObject.h --- old/swami-0.9.2/src/gui/SwamiUIObject.h 2003-06-22 12:36:52.000000000 +0200 +++ new/swami-0.9.3/src/gui/SwamiUIObject.h 2006-04-27 21:45:00.000000000 +0200 @@ -129,6 +129,7 @@ SWAMI_API IPItem *swamiui_new_item (IPItem *parent_hint, int type); SWAMI_API void swamiui_goto_zone_refitem (IPZone *zone, SwamiUITree *tree); SWAMI_API void swamiui_load_samples (IPItem *parent_hint); +SWAMI_API void swamiui_export_samples (GList *items); SWAMI_API void swamiui_unset_gens (GList *items); SWAMI_API void swamiui_copy_gens (IPItem *item); SWAMI_API void swamiui_paste_gens (IPItem *zone); 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/swami-0.9.2/src/gui/SwamiUITreeMenu.c new/swami-0.9.3/src/gui/SwamiUITreeMenu.c --- old/swami-0.9.2/src/gui/SwamiUITreeMenu.c 2003-03-13 22:22:36.000000000 +0100 +++ new/swami-0.9.3/src/gui/SwamiUITreeMenu.c 2006-04-27 21:45:26.000000000 +0200 @@ -43,7 +43,7 @@ RMU_Save, RMU_Save_As, - RMU_Export, + RMU_Export_Samples, RMU_Unset_Gens, RMU_Copy_Gens, @@ -90,7 +90,7 @@ static void swamiui_cb_wtbl_load_patch (GList *item_list); static void swamiui_cb_new_item (GList *item_list, gpointer data); static void swamiui_cb_goto_zone_refitem (GList *item_list); -static void swamiui_cb_load_sample (GList *item_list); +static void swamiui_cb_load_samples (GList *item_list); static void swamiui_cb_copy_gens (GList *item_list); static void swamiui_cb_paste_gens (GList *item_list); @@ -108,7 +108,7 @@ { 'M', N_("Properties"), "<control>R", NULL, swamiui_item_properties, NULL }, { 'M', N_("Save"), NULL, NULL, swamiui_save_files, GINT_TO_POINTER (FALSE) }, { 'M', N_("Save As"), NULL, NULL, swamiui_save_files, GINT_TO_POINTER(TRUE)}, - { 'M', N_("Export"), NULL, NULL, /* uisam_export_sample */ NULL, NULL }, + { 'M', N_("Export Samples"), NULL, NULL, swamiui_export_samples, NULL }, { 'M', N_("Unset Generators"), NULL, NULL, swamiui_unset_gens, NULL }, { 'S', N_("Copy Generators"), NULL, NULL, swamiui_cb_copy_gens, NULL }, @@ -129,7 +129,7 @@ { 'S', N_("New Instrument"), NULL, NULL, swamiui_cb_new_item, GINT_TO_POINTER (IPITEM_INST) }, { 'S', N_("Load Samples"), NULL, NULL, - swamiui_cb_load_sample, NULL }, + swamiui_cb_load_samples, NULL }, { 'S', N_("Global Zone"), "<control>G", NULL, swamiui_cb_new_item, GINT_TO_POINTER (IPITEM_ZONE) }, { 'S', N_("Wavetable Load"), "<control>L", NULL, @@ -219,7 +219,7 @@ }; static RMUItemType rmu_sample[] = { /* Menu for samples */ RMU_Properties, - RMU_Export, + RMU_Export_Samples, RMU_Delete, RMU_Wtbl_Load, @@ -616,9 +616,9 @@ swamiui_goto_zone_refitem (zone, klass->active_treemenu->tree); } -/* wrapper for swamiui_load_sample */ +/* wrapper for swamiui_load_samples */ static void -swamiui_cb_load_sample (GList *item_list) +swamiui_cb_load_samples (GList *item_list) { swamiui_load_samples (INSTP_ITEM (item_list->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/swami-0.9.2/src/include/config.h.in new/swami-0.9.3/src/include/config.h.in --- old/swami-0.9.2/src/include/config.h.in 2003-11-16 09:34:20.000000000 +0100 +++ new/swami-0.9.3/src/include/config.h.in 2006-04-28 13:15:27.000000000 +0200 @@ -28,25 +28,50 @@ /* Define to 1 if you have the <argz.h> header file. */ #undef HAVE_ARGZ_H +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define if the GNU dcgettext() function is already present or preinstalled. */ #undef HAVE_DCGETTEXT +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#undef HAVE_DECL_FEOF_UNLOCKED + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#undef HAVE_DECL_FGETS_UNLOCKED + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#undef HAVE_DECL_GETC_UNLOCKED + +/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you + don't. */ +#undef HAVE_DECL__SNPRINTF + +/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you + don't. */ +#undef HAVE_DECL__SNWPRINTF + /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `feof_unlocked' function. */ -#undef HAVE_FEOF_UNLOCKED - -/* Define to 1 if you have the `fgets_unlocked' function. */ -#undef HAVE_FGETS_UNLOCKED +/* Define to 1 if you have the `fwprintf' function. */ +#undef HAVE_FWPRINTF /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if you have the `getc_unlocked' function. */ -#undef HAVE_GETC_UNLOCKED - /* Define to 1 if you have the `getegid' function. */ #undef HAVE_GETEGID @@ -68,6 +93,9 @@ /* Define if you have the iconv() function. */ #undef HAVE_ICONV +/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */ +#undef HAVE_INTMAX_T + /* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */ #undef HAVE_INTTYPES_H @@ -87,6 +115,12 @@ /* Define to 1 if you have the <locale.h> header file. */ #undef HAVE_LOCALE_H +/* Define if you have the 'long double' type. */ +#undef HAVE_LONG_DOUBLE + +/* Define if you have the 'long long' type. */ +#undef HAVE_LONG_LONG + /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H @@ -105,6 +139,9 @@ /* Define to 1 if you have the <nl_types.h> header file. */ #undef HAVE_NL_TYPES_H +/* Define if your printf() function supports format strings with positions. */ +#undef HAVE_POSIX_PRINTF + /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV @@ -114,6 +151,9 @@ /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + /* Define to 1 if you have the <stddef.h> header file. */ #undef HAVE_STDDEF_H @@ -157,12 +197,24 @@ /* Define to 1 if you have the `tsearch' function. */ #undef HAVE_TSEARCH +/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */ +#undef HAVE_UINTMAX_T + /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define if you have the unsigned long long type. */ +/* Define if you have the 'unsigned long long' type. */ #undef HAVE_UNSIGNED_LONG_LONG +/* Define if you have the 'wchar_t' type. */ +#undef HAVE_WCHAR_T + +/* Define to 1 if you have the `wcslen' function. */ +#undef HAVE_WCSLEN + +/* Define if you have the 'wint_t' type. */ +#undef HAVE_WINT_T + /* Define to 1 if you have the `__argz_count' function. */ #undef HAVE___ARGZ_COUNT @@ -172,6 +224,9 @@ /* Define to 1 if you have the `__argz_stringify' function. */ #undef HAVE___ARGZ_STRINGIFY +/* Define to 1 if you have the `__fsetlocking' function. */ +#undef HAVE___FSETLOCKING + /* Define as const if the declaration of iconv() needs const. */ #undef ICONV_CONST @@ -212,15 +267,19 @@ /* Define if <inttypes.h> exists and defines unusable PRI* macros. */ #undef PRI_MACROS_BROKEN +/* Define as the maximum value of type 'size_t', if the system doesn't define + it. */ +#undef SIZE_MAX + /* Define to compile splash intro image functions */ #undef SPLASH /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if you have the ANSI C header files. */ @@ -232,16 +291,25 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus #undef inline +#endif /* Define to `long' if <sys/types.h> does not define. */ #undef off_t +/* Define as the type of the result of subtracting two pointers, if the system + doesn't define it. */ +#undef ptrdiff_t + +/* Define to empty if the C compiler doesn't support this keyword. */ +#undef signed + /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t -/* Define to unsigned long or unsigned long long if <inttypes.h> and - <stdint.h> don't define. */ +/* Define to unsigned long or unsigned long long if <stdint.h> and + <inttypes.h> don't define. */ #undef uintmax_t 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/swami-0.9.2/src/libinstpatch/src/sffile.c new/swami-0.9.3/src/libinstpatch/src/sffile.c --- old/swami-0.9.2/src/libinstpatch/src/sffile.c 2003-06-15 22:42:37.000000000 +0200 +++ new/swami-0.9.3/src/libinstpatch/src/sffile.c 2006-04-26 09:29:21.000000000 +0200 @@ -720,7 +720,7 @@ /* write chunk size without adding to chunk size counter, we use virtual chunk size to handle dummy sample block */ - size = state->vsize; + size = GUINT32_TO_LE (state->vsize); if (ipfile_write (ctx, &size, 4, FALSE) != INSTP_OK) return (INSTP_FAIL); 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/swami-0.9.2/src/libswami/SwamiSamplelib.c new/swami-0.9.3/src/libswami/SwamiSamplelib.c --- old/swami-0.9.2/src/libswami/SwamiSamplelib.c 2003-03-13 22:22:37.000000000 +0100 +++ new/swami-0.9.3/src/libswami/SwamiSamplelib.c 2006-04-27 21:48:59.000000000 +0200 @@ -239,6 +239,109 @@ } /** + * swami_samplelib_save_sampledata: + * @handle: Swami samplelib handle + * @left: Sample data object for left channel (stereo) or mono data. + * @right: Sample data object for right channel (stereo). Should be %NULL + * for mono data. + * + * Save sample data to a sample file. + * + * Returns: SWAMI_OK on success, SWAMI_FAIL otherwise + */ +int +swami_samplelib_save_sampledata (SwamiSamplelibHandle *handle, + IPSampleData *left, IPSampleData *right) +{ + gint16 *buf = NULL; + int channels, frames, samples, ofs, i; + IPSampleStore *right_store, *left_store; + + g_return_val_if_fail (handle != NULL, SWAMI_FAIL); + g_return_val_if_fail (handle->samplelib != NULL, SWAMI_FAIL); + g_return_val_if_fail (SWAMI_IS_SAMPLELIB (handle->samplelib), SWAMI_FAIL); + g_return_val_if_fail (INSTP_IS_SAMPLE_DATA (left), SWAMI_FAIL); + + channels = handle->params.channels; + g_return_val_if_fail (channels == 1 || channels == 2, SWAMI_FAIL); + g_return_val_if_fail (channels != 2 || INSTP_IS_SAMPLE_DATA (right), + SWAMI_FAIL); + + left_store = instp_sample_data_find_store (left, 0, + IPSAMPLE_STORE_FIND_FASTEST + | IPSAMPLE_STORE_FIND_READABLE); + + if (channels == 2) + right_store = instp_sample_data_find_store (right, 0, + IPSAMPLE_STORE_FIND_FASTEST + | IPSAMPLE_STORE_FIND_READABLE); + + if (!left_store || (channels == 2 && !right_store)) + { + g_critical ("Cannot save sample, missing sample store"); + return (SWAMI_FAIL); + } + + if (channels == 2 && left->size != right->size) + { + g_critical ("Stereo sample pair differ in size, cannot save"); + return (SWAMI_FAIL); + } + + /* allocate 2 times needed size for stereo data, so it can be interleaved */ + buf = g_malloc (COPY_BUFFER_SIZE * channels * 2); + + /* use the same size buffer (in bytes) for mono or stereo data */ + frames = COPY_BUFFER_SIZE / channels; + ofs = 0; + while (ofs < left->size) + { + if (left->size - ofs < frames) /* check for last partial fragment */ + frames = left->size - ofs; + + if (channels == 1) + { + if (instp_sample_store_read (left, left_store, + ofs, frames, buf) != INSTP_OK) + goto _error; + } + else /* stereo */ + { + if (instp_sample_store_read (left, left_store, ofs, frames, + &buf[frames*2]) != INSTP_OK) + goto _error; + + if (instp_sample_store_read (right, right_store, ofs, frames, + &buf[frames*3]) != INSTP_OK) + goto _error; + + samples = frames * 2; + + /* interleave the data */ + for (i = 0; i < samples; i++) + { + if (i & 1) + buf[i] = buf[frames*3 + (i >> 1)]; + else buf[i] = buf[frames*2 + (i >> 1)]; + } + } + + if (swami_samplelib_write (handle, frames, buf) < frames) + goto _error; + + ofs += frames; + } + + g_free (buf); + return (SWAMI_OK); + + _error: + + g_free (buf); + return (SWAMI_FAIL); +} + +/** * swami_samplelib_init_sample: * @handle: Handle of opened sample file in read mode. * @sample: Sample to set parameters of to match the file. @@ -262,6 +365,11 @@ sample->loopstart = 8; sample->loopend = handle->size - 8; } + else + { + sample->loopstart = params->loop_start; + sample->loopend = params->loop_end; + } if (params->rate >= IPSAMPLE_RATE_MIN && params->rate <= IPSAMPLE_RATE_MAX) sample->samplerate = params->rate; @@ -283,12 +391,46 @@ { g_return_if_fail (params != NULL); - params->file_type = SWAMI_SAMPLELIB_TYPE_WAVE; + params->file_type = SWAMI_SAMPLELIB_TYPE_AIFF; params->rate = 44100; params->channels = 1; params->loop_type = SWAMI_AUDIO_LOOP_NONE; params->root_note = 60; params->fine_tune = 0; + params->width = 16; + params->signd = TRUE; + params->lendian = TRUE; +} + +/** + * swami_samplelib_set_params_from_sample: + * @sample: Sample to initialize @params with + * @params: Sample lib param structure to initialize + * + * Sets a sample library parameter structure to the format of the @sample. + * Note that if the sample is linked the @params will be set to stereo. + */ +void +swami_samplelib_set_params_from_sample (IPSample *sample, + SwamiSamplelibParams *params) +{ + g_return_if_fail (INSTP_IS_SAMPLE (sample)); + g_return_if_fail (params != NULL); + + params->file_type = SWAMI_SAMPLELIB_TYPE_AIFF; + params->rate = sample->samplerate; + params->channels = sample->linked ? 2 : 1; + + params->loop_type = SWAMI_AUDIO_LOOP_NORMAL; + params->loop_start = sample->loopstart; + params->loop_end = sample->loopend; + + params->root_note = sample->origpitch; + params->fine_tune = sample->pitchadj; + + params->width = 16; + params->signd = TRUE; + params->lendian = TRUE; } /** @@ -453,3 +595,30 @@ return (handle->eof_flag); } + +/** + * swami_samplelib_type_ext: + * @type: Sample file type + * + * Get extension (not including '.') for a given sample type. + * + * Returns: File extension, which is static and should not be modified or + * freed. + */ +char * +swami_samplelib_type_ext (SwamiSamplelibType type) +{ + switch (type) + { + case SWAMI_SAMPLELIB_TYPE_AIFF: + return ("aiff"); + case SWAMI_SAMPLELIB_TYPE_WAVE: + return ("wav"); + case SWAMI_SAMPLELIB_TYPE_AU: + return ("au"); + case SWAMI_SAMPLELIB_TYPE_RAW: + return ("raw"); + default: + return (""); + } +} 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/swami-0.9.2/src/libswami/SwamiSamplelib.h new/swami-0.9.3/src/libswami/SwamiSamplelib.h --- old/swami-0.9.2/src/libswami/SwamiSamplelib.h 2003-06-22 12:33:15.000000000 +0200 +++ new/swami-0.9.3/src/libswami/SwamiSamplelib.h 2006-04-27 21:50:29.000000000 +0200 @@ -81,8 +81,8 @@ /* Enum for file type (WAV, AIFF, etc) */ typedef enum { + SWAMI_SAMPLELIB_TYPE_AIFF, SWAMI_SAMPLELIB_TYPE_WAVE, - SWAMI_SAMPLELIB_TYPE_AIFFC, SWAMI_SAMPLELIB_TYPE_AU, SWAMI_SAMPLELIB_TYPE_RAW } SwamiSamplelibType; @@ -132,10 +132,16 @@ SWAMI_API int swami_samplelib_load_sampledata (SwamiSamplelibHandle *handle, IPSampleData **left, IPSampleData **right); +SWAMI_API int swami_samplelib_save_sampledata (SwamiSamplelibHandle *handle, + IPSampleData *left, + IPSampleData *right); SWAMI_API void swami_samplelib_init_sample (SwamiSamplelibHandle *handle, IPSample *sample); SWAMI_API void swami_samplelib_set_params_default (SwamiSamplelibParams *params); +SWAMI_API void +swami_samplelib_set_params_from_sample (IPSample *sample, + SwamiSamplelibParams *params); SWAMI_API SwamiSamplelibHandle * swami_samplelib_open (SwamiSamplelib *samplelib, char *filename, char mode, @@ -148,4 +154,6 @@ const gint16 *buf); SWAMI_API gboolean swami_samplelib_is_eof (SwamiSamplelibHandle *handle); +SWAMI_API char *swami_samplelib_type_ext (SwamiSamplelibType type); + #endif /* __SWAMI_SAMPLELIB_H__ */ 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/swami-0.9.2/src/plugins/samplelib_audiofile.c new/swami-0.9.3/src/plugins/samplelib_audiofile.c --- old/swami-0.9.2/src/plugins/samplelib_audiofile.c 2003-03-13 22:22:37.000000000 +0100 +++ new/swami-0.9.3/src/plugins/samplelib_audiofile.c 2006-04-27 21:53:14.000000000 +0200 @@ -39,14 +39,6 @@ #include "samplelib_audiofile.h" #include "i18n.h" -/* FIXME! For audiofile < 2.0 */ - -/* using audiofile 0.2.0 or newer? define AUDIOFILE_TWO if so */ -#if defined (LIBAUDIOFILE_MAJOR_VERSION) && (LIBAUDIOFILE_MAJOR_VERSION > 0 \ - || LIBAUDIOFILE_MINOR_VERSION >= 2) -#define AUDIOFILE_TWO 1 -#endif - static int plugin_audiofile_init (GModule *module, SwamiPlugin *plugin); static GType samplelib_audiofile_get_type (void); static void samplelib_audiofile_class_init (SamplelibAudiofileClass *klass); @@ -124,6 +116,7 @@ AFfilehandle affd; AFfilesetup afsetup = NULL; char smode[2]; /* convert character mode to string */ + gboolean writeloop = FALSE, writeinst = FALSE; if (params->file_type == SWAMI_SAMPLELIB_TYPE_RAW || handle->mode == 'w') { @@ -141,26 +134,51 @@ { switch (params->file_type) { - case SWAMI_SAMPLELIB_TYPE_AIFFC: - filefmt = AF_FILE_AIFFC; + case SWAMI_SAMPLELIB_TYPE_WAVE: + filefmt = AF_FILE_WAVE; break; case SWAMI_SAMPLELIB_TYPE_AU: filefmt = AF_FILE_NEXTSND; break; default: - filefmt = AF_FILE_WAVE; + filefmt = AF_FILE_AIFF; break; } + + afInitFileFormat (afsetup, filefmt); + + // Yeah maybe someday if loop/inst support is added for other types + // if (afQueryLong (AF_QUERYTYPE_INSTPARAM, AF_QUERY_SUPPORTED, + // filefmt, 0, 0)) + + if (filefmt == AF_FILE_AIFF) + { + writeinst = TRUE; + + // && afQueryLong (AF_QUERYTYPE_LOOP, AF_QUERY_SUPPORTED, + // filefmt, 0, 0)) + + /* set loop info if supported by file type */ + if (params->loop_type != SWAMI_AUDIO_LOOP_NONE) + { + int markerIDs[4] = { 1, 2, 3, 4 }; + int loopIDs[2] = { 1, 2 }; + + afInitMarkIDs (afsetup, AF_DEFAULT_TRACK, markerIDs, 4); + afInitLoopIDs (afsetup, AF_DEFAULT_INST, loopIDs, 2); + + writeloop = TRUE; + } + } } else /** RAW file read mode */ { filefmt = AF_FILE_RAWDATA; + afInitFileFormat (afsetup, filefmt); afInitByteOrder (afsetup, AF_DEFAULT_TRACK, params->lendian ? AF_BYTEORDER_LITTLEENDIAN : AF_BYTEORDER_BIGENDIAN); } - - afInitFileFormat (afsetup, filefmt); } smode[0] = handle->mode; @@ -183,7 +201,73 @@ return (SWAMI_FAIL); } - // #ifdef AUDIOFILE_TWO + if (handle->mode == 'r') + { + int loopcount, instcount; + + loopcount = afGetLoopIDs (affd, AF_DEFAULT_INST, NULL); + if (loopcount > 0) /* any loops? (we only use 1) */ + { + int loopids[loopcount]; + int markID; + int mode; + + afGetLoopIDs (affd, AF_DEFAULT_INST, loopids); + + mode = afGetLoopMode (affd, AF_DEFAULT_INST, loopids[0]); + if (mode != AF_LOOP_MODE_NOLOOP) /* loop active? */ + { + params->loop_type = SWAMI_AUDIO_LOOP_NORMAL; + + markID = afGetLoopStart (affd, AF_DEFAULT_INST, loopids[0]); + params->loop_start = afGetMarkPosition (affd, AF_DEFAULT_TRACK, + markID); + + markID = afGetLoopEnd (affd, AF_DEFAULT_INST, loopids[0]); + params->loop_end = afGetMarkPosition (affd, AF_DEFAULT_TRACK, + markID); + } + } + + instcount = afGetInstIDs (affd, NULL); + if (instcount > 0) + { + int instids[instcount]; + + afGetInstIDs (affd, instids); + + params->root_note = afGetInstParamLong (affd, instids[0], + AF_INST_MIDI_BASENOTE); + params->fine_tune = afGetInstParamLong (affd, instids[0], + AF_INST_NUMCENTS_DETUNE); + + if (params->root_note < 0 || params->root_note > 127) + params->root_note = 60; + if (params->fine_tune < -99 || params->fine_tune > 99) + params->fine_tune = 0; + } + } + else /* write mode */ + { + if (writeloop) + { + afSetMarkPosition(affd, AF_DEFAULT_TRACK, 1, params->loop_start); + afSetMarkPosition(affd, AF_DEFAULT_TRACK, 2, params->loop_end); + + afSetLoopStart(affd, AF_DEFAULT_INST, 1, 1); + afSetLoopEnd(affd, AF_DEFAULT_INST, 1, 2); + + afSetLoopMode (affd, AF_DEFAULT_INST, 1, AF_LOOP_MODE_FORW); + } + + if (writeinst) + { + afSetInstParamLong (affd, AF_DEFAULT_INST, AF_INST_MIDI_BASENOTE, + params->root_note); + afSetInstParamLong (affd, AF_DEFAULT_INST, AF_INST_NUMCENTS_DETUNE, + params->fine_tune); + } + } /* set up the virtual sample format (audiofile will convert to this) */ afSetVirtualSampleFormat (affd, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16); @@ -193,10 +277,6 @@ afSetVirtualByteOrder (affd, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN); else afSetVirtualByteOrder (affd, AF_DEFAULT_TRACK, AF_BYTEORDER_BIGENDIAN); - //#else - // afGetSampleFormat (affd, AF_DEFAULT_TRACK, &fmt, &wdth); - //#endif - params->channels = afGetChannels (affd, AF_DEFAULT_TRACK); params->rate = afGetRate (affd, AF_DEFAULT_TRACK); handle->size = afGetFrameCount (affd, AF_DEFAULT_TRACK); 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/swami-0.9.2/src/plugins/samplelib_libsndfile.c new/swami-0.9.3/src/plugins/samplelib_libsndfile.c --- old/swami-0.9.2/src/plugins/samplelib_libsndfile.c 2003-03-13 22:22:37.000000000 +0100 +++ new/swami-0.9.3/src/plugins/samplelib_libsndfile.c 2006-04-27 21:53:29.000000000 +0200 @@ -142,7 +142,7 @@ { switch (params->file_type) { - case SWAMI_SAMPLELIB_TYPE_AIFFC: + case SWAMI_SAMPLELIB_TYPE_AIFF: major = SF_FORMAT_AIFF; break; case SWAMI_SAMPLELIB_TYPE_AU: 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/swami-0.9.2/src/plugins/wavetbl_fluidsynth.c new/swami-0.9.3/src/plugins/wavetbl_fluidsynth.c --- old/swami-0.9.2/src/plugins/wavetbl_fluidsynth.c 2003-11-16 09:09:45.000000000 +0100 +++ new/swami-0.9.3/src/plugins/wavetbl_fluidsynth.c 2006-04-26 09:29:17.000000000 +0200 @@ -927,19 +927,9 @@ gen_array[IPGEN_SAMPLE_MODES].uword = IPSAMPLE_LOOP; /* set generator parameters */ - for (i = 0; i < IPGEN_SAMPLE_MODES; i++) + for (i = 0; i < IPGEN_COUNT; i++) fluid_voice_gen_set (voice, i, (float)(gen_array[i].sword)); - /* a hack because FluidSynth can't handle "loop till release" mode */ - i = gen_array[IPGEN_SAMPLE_MODES].uword; - if (i == IPSAMPLE_LOOP_UNROLL) i = IPSAMPLE_LOOP; - fluid_voice_gen_set (voice, IPGEN_SAMPLE_MODES, (float)i); - - /* set remaining generator parameters */ - for (i = IPGEN_SAMPLE_MODES + 1; i < IPGEN_COUNT; i++) - fluid_voice_gen_set (voice, i, (float)(gen_array[i].sword)); - - while (mods) { /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sqlite
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package sqlite checked in at Thu May 18 19:08:51 CEST 2006. -------- --- sqlite/sqlite.changes 2006-03-22 15:56:40.000000000 +0100 +++ sqlite/sqlite.changes 2006-05-18 12:54:38.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 18 12:52:29 CEST 2006 - adrian(a)suse.de + +- update to version 3.3.5 + Version 3.3 adds support for CHECK constraints, DESC indices, + separate REAL and INTEGER column affinities, a new OS interface + layer design, and many other changes. + The file format for version 3.3 has changed slightly. SQLite 3.3 + will read and write legacy databases created with any prior + version of SQLite 3. But databases created by version 3.3.0 will + not be readable or writable by earlier versions of the SQLite + +------------------------------------------------------------------- Old: ---- disable-broken-threading-implementation-workaround.diff fix-64bit-2.diff sqlite-3.2.8.tar.bz2 New: ---- sqlite-3.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlite.spec ++++++ --- /var/tmp/diff_new_pack.h5uhgR/_old 2006-05-18 19:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.h5uhgR/_new 2006-05-18 19:08:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sqlite (Version 3.2.8) +# spec file for package sqlite (Version 3.3.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,21 +11,22 @@ # norootforbuild Name: sqlite -BuildRequires: readline-devel tcl-devel update-desktop-files +BuildRequires: gcc-c++ readline-devel tcl-devel +%if %{?suse_version:1}%{?!suse_version:0} +BuildRequires: update-desktop-files +%endif License: distributable, Other License(s), see package Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine URL: http://www.sqlite.org/ -Version: 3.2.8 -Release: 8 +Version: 3.3.5 +Release: 1 Source0: http://www.sqlite.org/%name-%version.tar.bz2 Source1: sqlite.desktop Source2: sqlite-check_fsync_dir.c Patch0: %name.diff -Patch1: disable-broken-threading-implementation-workaround.diff Patch2: %{name}-test-notime.diff Patch3: fix-64bit.diff -Patch4: fix-64bit-2.diff Patch5: fix-64bit-3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,14 +92,10 @@ %prep %setup -q %patch0 -# there will be a #define in 3.3, which is doing the same -# this was only a workaround for broken thread implementations -%patch1 -%patch2 -p1 +%patch2 %ifarch x86_64 ppc64 s390x ia64 mips64 %patch3 %endif -%patch4 %patch5 # does not work due to our ulimits in our build system rm test/bigfile.test @@ -138,14 +135,17 @@ tcllibdir=%_libdir install -d $RPM_BUILD_ROOT%_mandir/man1/ install ../sqlite3.1 $RPM_BUILD_ROOT%_mandir/man1/ +%if %{?suse_version:1}%{?!suse_version:0} sed -i 's,%buildroot,,' %buildroot/%tclscriptdir/sqlite*/pkgIndex.tcl +%endif # # install the susehelp meta file mkdir -p $RPM_BUILD_ROOT/usr/share/susehelp/meta/Development/Libraries/ install -m 0644 %SOURCE1 \ $RPM_BUILD_ROOT/usr/share/susehelp/meta/Development/Libraries/ +%if %{?suse_version:1}%{?!suse_version:0} %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/susehelp/meta/Development/Libraries/%name.desktop - +%endif %post -p /sbin/ldconfig @@ -177,6 +177,15 @@ %_libdir/pkgconfig/sqlite3.pc %changelog -n sqlite +* Thu May 18 2006 - adrian(a)suse.de +- update to version 3.3.5 + Version 3.3 adds support for CHECK constraints, DESC indices, + separate REAL and INTEGER column affinities, a new OS interface + layer design, and many other changes. + The file format for version 3.3 has changed slightly. SQLite 3.3 + will read and write legacy databases created with any prior + version of SQLite 3. But databases created by version 3.3.0 will + not be readable or writable by earlier versions of the SQLite * Wed Mar 22 2006 - schwab(a)suse.de - Fix another 64bit bug. * Wed Jan 25 2006 - mls(a)suse.de ++++++ fix-64bit.diff ++++++ --- /var/tmp/diff_new_pack.h5uhgR/_old 2006-05-18 19:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.h5uhgR/_new 2006-05-18 19:08:28.000000000 +0200 @@ -1,9 +1,9 @@ --- test/types3.test -+++ test/types3.test 2005/10/24 09:11:01 ++++ test/types3.test 2006/04/11 15:13:09 @@ -33,7 +33,7 @@ do_test types3-1.3 { set V [expr {1+123456789012345}] - concat [tcl_variable_type V] [execsql {SELECT typeof($::V)}] + concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}] -} {wideInt integer} +} {int integer} ++++++ sqlite-3.2.8.tar.bz2 -> sqlite-3.3.5.tar.bz2 ++++++ ++++ 48969 lines of diff (skipped) ++++++ sqlite-test-notime.diff ++++++ --- /var/tmp/diff_new_pack.h5uhgR/_old 2006-05-18 19:08:32.000000000 +0200 +++ /var/tmp/diff_new_pack.h5uhgR/_new 2006-05-18 19:08:32.000000000 +0200 @@ -1,5 +1,5 @@ ---- sqlite-3.2.2/test/select2.test.orig 2005-04-24 00:45:23.000000000 +0200 -+++ sqlite-3.2.2/test/select2.test 2005-08-30 17:02:24.497628368 +0200 +--- test/select2.test ++++ test/select2.test 2006/04/11 15:09:32 @@ -89,11 +89,16 @@ list } {} ++++++ sqlite.diff ++++++ --- /var/tmp/diff_new_pack.h5uhgR/_old 2006-05-18 19:08:32.000000000 +0200 +++ /var/tmp/diff_new_pack.h5uhgR/_new 2006-05-18 19:08:32.000000000 +0200 @@ -1,6 +1,6 @@ --- Makefile.in -+++ Makefile.in 2005/10/17 07:18:10 -@@ -233,7 +233,7 @@ ++++ Makefile.in 2006/05/18 10:29:10 +@@ -247,7 +247,7 @@ libsqlite3.la: $(LIBOBJ) $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ @@ -9,8 +9,102 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ +--- src/btree.c ++++ src/btree.c 2006/05/18 10:29:10 +@@ -2548,7 +2548,6 @@ + } + #endif + +-#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) + /* + ** Print debugging information about all cursors to standard output. + */ +@@ -2565,7 +2564,6 @@ + ); + } + } +-#endif + + /* + ** Rollback the transaction in progress. All cursors will be +@@ -5969,7 +5967,6 @@ + } + #endif + +-#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) + /* + ** Fill aResult[] with information about the entry and page that the + ** cursor is pointing to. +@@ -6037,7 +6034,6 @@ + releaseTempCursor(&tmpCur); + return SQLITE_OK; + } +-#endif + + /* + ** Return the pager associated with a BTree. This routine is used for +--- src/printf.c ++++ src/printf.c 2006/05/18 10:29:10 +@@ -843,7 +843,6 @@ + return z; + } + +-#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) + /* + ** A version of printf() that understands %lld. Used for debugging. + ** The printf() built into some versions of windows does not understand %lld +@@ -859,4 +858,3 @@ + fprintf(stdout,"%d: %s", getpid(), zBuf); + fflush(stdout); + } +-#endif +--- src/test3.c ++++ src/test3.c 2006/05/18 10:29:10 +@@ -597,7 +597,6 @@ + ** + ** Print information about all cursors to standard output for debugging. + */ +-#ifdef SQLITE_DEBUG + static int btree_cursor_list( + void *NotUsed, + Tcl_Interp *interp, /* The TCL interpreter that invoked this command */ +@@ -615,7 +614,6 @@ + sqlite3BtreeCursorList(pBt); + return SQLITE_OK; + } +-#endif + + /* + ** Usage: btree_cursor ID TABLENUM WRITEABLE +@@ -1186,7 +1184,6 @@ + ** aResult[8] = Local payload size + ** aResult[9] = Parent page number + */ +-#ifdef SQLITE_DEBUG + static int btree_cursor_info( + void *NotUsed, + Tcl_Interp *interp, /* The TCL interpreter that invoked this command */ +@@ -1224,7 +1221,6 @@ + Tcl_AppendResult(interp, &zBuf[1], 0); + return SQLITE_OK; + } +-#endif + + /* + ** The command is provided for the purpose of setting breakpoints. +@@ -1440,10 +1436,8 @@ + { "btree_rollback_statement", (Tcl_CmdProc*)btree_rollback_statement }, + { "btree_from_db", (Tcl_CmdProc*)btree_from_db }, + { "btree_set_cache_size", (Tcl_CmdProc*)btree_set_cache_size }, +-#ifdef SQLITE_DEBUG + { "btree_cursor_info", (Tcl_CmdProc*)btree_cursor_info }, + { "btree_cursor_list", (Tcl_CmdProc*)btree_cursor_list }, +-#endif + }; + int i; + --- tclinstaller.tcl -+++ tclinstaller.tcl 2005/10/17 07:18:10 ++++ tclinstaller.tcl 2006/05/18 10:29:10 @@ -7,19 +7,23 @@ set VERSION [lindex $argv 0] set LIBFILE .libs/libtclsqlite3[info sharedlibextension] @@ -42,17 +136,52 @@ fconfigure $in -translation binary set out [open $LIB w] --- test/conflict.test -+++ test/conflict.test 2005/10/17 07:18:37 -@@ -302,6 +302,7 @@ - db close - sqlite3 db test.db - if {$conf1!=""} {set conf1 "ON CONFLICT $conf1"} -+ execsql {pragma temp_store=file} - set ::sqlite_opentemp_count 0 - set r0 [catch {execsql [subst { - DROP TABLE t1; ++++ test/conflict.test 2006/05/18 10:29:10 +@@ -286,18 +286,18 @@ + # + foreach {i conf1 cmd t0 t1 t2 t3} { + 1 {} UPDATE 1 {6 7 8 9} 1 1 +- 2 REPLACE UPDATE 0 {7 6 9} 1 1 +- 3 IGNORE UPDATE 0 {6 7 3 9} 1 1 ++ 2 REPLACE UPDATE 0 {7 6 9} 1 0 ++ 3 IGNORE UPDATE 0 {6 7 3 9} 1 0 + 4 FAIL UPDATE 1 {6 7 3 4} 1 0 + 5 ABORT UPDATE 1 {1 2 3 4} 1 1 + 6 ROLLBACK UPDATE 1 {1 2 3 4} 0 0 +- 7 REPLACE {UPDATE OR IGNORE} 0 {6 7 3 9} 1 1 +- 8 IGNORE {UPDATE OR REPLACE} 0 {7 6 9} 1 1 +- 9 FAIL {UPDATE OR IGNORE} 0 {6 7 3 9} 1 1 +- 10 ABORT {UPDATE OR REPLACE} 0 {7 6 9} 1 1 +- 11 ROLLBACK {UPDATE OR IGNORE} 0 {6 7 3 9} 1 1 +- 12 {} {UPDATE OR IGNORE} 0 {6 7 3 9} 1 1 +- 13 {} {UPDATE OR REPLACE} 0 {7 6 9} 1 1 ++ 7 REPLACE {UPDATE OR IGNORE} 0 {6 7 3 9} 1 0 ++ 8 IGNORE {UPDATE OR REPLACE} 0 {7 6 9} 1 0 ++ 9 FAIL {UPDATE OR IGNORE} 0 {6 7 3 9} 1 0 ++ 10 ABORT {UPDATE OR REPLACE} 0 {7 6 9} 1 0 ++ 11 ROLLBACK {UPDATE OR IGNORE} 0 {6 7 3 9} 1 0 ++ 12 {} {UPDATE OR IGNORE} 0 {6 7 3 9} 1 0 ++ 13 {} {UPDATE OR REPLACE} 0 {7 6 9} 1 0 + 14 {} {UPDATE OR FAIL} 1 {6 7 3 4} 1 0 + 15 {} {UPDATE OR ABORT} 1 {1 2 3 4} 1 1 + 16 {} {UPDATE OR ROLLBACK} 1 {1 2 3 4} 0 0 +--- test/pragma.test ++++ test/pragma.test 2006/05/18 10:30:47 +@@ -702,12 +702,6 @@ + } + } {2} + } +-do_test pragma-9.10 { +- catchsql " +- PRAGMA temp_store_directory='$pwd'; +- SELECT * FROM temp_store_directory_test; +- " +-} {1 {no such table: temp_store_directory_test}} + } ;# ifcapable pager_pragmas + + ifcapable trigger { --- test/printf.test -+++ test/printf.test 2005/10/17 07:18:10 ++++ test/printf.test 2006/05/18 10:29:10 @@ -130,12 +130,6 @@ sqlite3_mprintf_scaled {A double: %g} 1.0e307 100.0 } {A double: NaN} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit simias
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package simias checked in at Thu May 18 19:08:21 CEST 2006. -------- --- arch/i386/simias/simias.changes 2006-05-08 17:21:35.000000000 +0200 +++ simias/simias.changes 2006-05-18 16:18:26.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 18 16:17:48 CEST 2006 - meissner(a)suse.de + +- build helper binaries soapcpp2 and wsdl2h from source + to allow all platforms. Fixed the function return warnings. + + Now compiles on all platforms. + +------------------------------------------------------------------- New: ---- simias-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simias.spec ++++++ --- /var/tmp/diff_new_pack.Wqyy9j/_old 2006-05-18 19:07:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Wqyy9j/_new 2006-05-18 19:07:54.000000000 +0200 @@ -25,10 +25,11 @@ Requires: log4net Obsoletes: %{name} < %{version} Version: 1.4.6128.1 -Release: 2 +Release: 4 Summary: Collection-Oriented Data Storage Source: simias-1.4.%{buildnum}.1.tar.gz Patch: simias-libflaim.patch +Patch1: simias-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #============================================================================= @@ -42,13 +43,26 @@ %prep export BUILDNUM=%{buildnum} -%setup -n %{name}-%{version} -%patch +%setup -q -n %{name}-%{version} +%patch0 +%patch1 -p1 #============================================================================= %build export BUILDNUM=%{buildnum} ./autogen.sh --prefix=%{prefix} +rm tools/gsoap/linux-2.7/soapcpp2 +rm tools/gsoap/linux-2.7/wsdl2h +pushd tools/gsoap/linux-2.7 + cd src + make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + cp soapcpp2 .. + cd .. + cp -a ../macos*/wsdl . + cd wsdl + make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + cd .. +popd make make dist #============================================================================= @@ -131,6 +145,10 @@ #%config(noreplace) %{prefix}/web/web.config %changelog -n simias +* Thu May 18 2006 - meissner(a)suse.de +- build helper binaries soapcpp2 and wsdl2h from source + to allow all platforms. Fixed the function return warnings. + Now compiles on all platforms. * Mon May 08 2006 - jhargadon(a)novell.com - resubmitting package to keep in sync with iFolder3 package. * Thu Apr 20 2006 - jhargadon(a)novell.com ++++++ simias-fixes.patch ++++++ --- simias-1.4.6128.1/tools/gsoap/linux-2.7/src/init2.c.xx 2006-05-18 16:06:22.000000000 +0200 +++ simias-1.4.6128.1/tools/gsoap/linux-2.7/src/init2.c 2006-05-18 16:06:29.000000000 +0200 @@ -176,6 +176,7 @@ /* init - initialize symbol table with predefined keywords */ +void init() { struct Keyword *k; for (k = keywords; k->s; k++) --- simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.c.xx 2006-05-18 16:12:03.000000000 +0200 +++ simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.c 2006-05-18 16:08:44.000000000 +0200 @@ -58,6 +58,7 @@ /* yyerror - called by parser from an error production with nonterminal `error' */ +void yyerror(char *s) { fprintf(stderr, "%s(%d): %s\n", filename, yylineno, s); } @@ -65,6 +66,7 @@ /* lexerror - called by lexical analyzer upon failure to recognize a token */ +void lexerror(const char *s) { fprintf(stderr, "%s(%d): %s: %s\n", filename, yylineno, s, yytext); if (lexerrno++ >= MAXERR) @@ -74,6 +76,7 @@ /* synerror - called by a semantic action in the yacc grammar */ +void synerror(const char *s) { fprintf(stderr, "%s(%d): Syntax error: %s\n", filename, yylineno-1, s); if (synerrno++ >= MAXERR) @@ -83,6 +86,7 @@ /* semerror - report semantic error from static checking */ +void semerror(const char *s) { fprintf(stderr, "\n%s(%d): **ERROR**: %s\n\n", filename, yylineno, s); if (semerrno++ >= MAXERR) @@ -92,6 +96,7 @@ /* semwarn - report semantic warning from static checking */ +void semwarn(const char *s) { fprintf(stderr, "\n**WARNING**: %s (detected at line %d in %s)\n\n", s, yylineno, filename); semwarno++; @@ -100,6 +105,7 @@ /* compliancewarn - report compliance warning */ +void compliancewarn(const char *s) { fprintf(stderr, "Compliance warning: %s\n", s); } @@ -107,6 +113,7 @@ /* typerror - report type error (a semantic error) */ +void typerror(const char *s) { fprintf(stderr, "%s(%d): Type error: %s\n", filename, yylineno, s); if (semerrno++ >= MAXERR) @@ -116,6 +123,7 @@ /* execerror - print error message and terminate execution */ +void execerror(const char *s) { fprintf(stderr, "Critical error: %s\n", s); exit(1); @@ -124,6 +132,7 @@ /* progerror - called when check(expr) failed, i.e. upon programming error */ +void progerror(const char *s, const char *f, int l) { fprintf(stderr, "Program failure: %s in file %s line %d\n", s, f, l); exit(1); --- simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.h.xx 2006-05-18 16:07:25.000000000 +0200 +++ simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.h 2006-05-18 16:08:51.000000000 +0200 @@ -44,17 +44,17 @@ extern char errbuf[]; #ifdef WIN32 -extern soapcpp2error(char*); +extern void soapcpp2error(char*); #else -extern yyerror(char*); +extern void yyerror(char*); #endif -extern lexerror(const char*); -extern synerror(const char *); -extern semerror(const char *); -extern semwarn(const char *); -extern compliancewarn(const char *); -extern typerror(const char*); -extern execerror(const char*); -extern progerror(const char*, const char*, int); -extern errstat(); +extern void lexerror(const char*); +extern void synerror(const char *); +extern void semerror(const char *); +extern void semwarn(const char *); +extern void compliancewarn(const char *); +extern void typerror(const char*); +extern void execerror(const char*); +extern void progerror(const char*, const char*, int); +extern int errstat(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit seq24
by root＠suse.de 18 May '06

18 May '06

Hello community, here is the log from the commit of package seq24 checked in at Thu May 18 19:07:48 CEST 2006. -------- --- seq24/seq24.changes 2006-01-25 21:41:33.000000000 +0100 +++ seq24/seq24.changes 2006-05-18 16:51:46.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 18 16:43:21 CEST 2006 - tiwai(a)suse.de + +- updated to version 0.8.6: + * use gtkmm 2.4 or later + * new song editor + * loop sync with jack transport + * midi clock option, split loops, manual midi ports + * menug bug and cpu hog fixes + +------------------------------------------------------------------- Old: ---- seq24-0.6.3.tar.bz2 seq24-automake-fix.dif New: ---- seq24-0.8.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seq24.spec ++++++ --- /var/tmp/diff_new_pack.ZlQ9w2/_old 2006-05-18 19:07:42.000000000 +0200 +++ /var/tmp/diff_new_pack.ZlQ9w2/_new 2006-05-18 19:07:42.000000000 +0200 @@ -1,26 +1,25 @@ # -# spec file for package seq24 (Version 0.6.3) +# spec file for package seq24 (Version 0.8.6) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: seq24 -BuildRequires: alsa-devel gcc-c++ gtkmm2-devel jack-devel update-desktop-files +BuildRequires: alsa-devel gcc-c++ gtkmm24-devel jack-devel update-desktop-files Summary: A Small, Real-Time MIDI Sequencer -Version: 0.6.3 +Version: 0.8.6 Release: 1 License: GPL Group: Productivity/Multimedia/Sound/Midi Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: seq24.png -Patch: seq24-automake-fix.dif URL: http://www.filter24.org/seq24/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,7 +35,6 @@ %prep %setup -%patch %{?suse_update_config:%{suse_update_config -f}} %build @@ -66,6 +64,13 @@ %{_datadir}/pixmaps/*.png %changelog -n seq24 +* Thu May 18 2006 - tiwai(a)suse.de +- updated to version 0.8.6: + * use gtkmm 2.4 or later + * new song editor + * loop sync with jack transport + * midi clock option, split loops, manual midi ports + * menug bug and cpu hog fixes * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Aug 04 2005 - tiwai(a)suse.de ++++++ seq24-0.6.3.tar.bz2 -> seq24-0.8.6.tar.bz2 ++++++ ++++ 15890 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0