August 2006 - openSUSE Commits - openSUSE Mailing Lists

commit pam
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package pam checked in at Wed Aug 30 23:43:22 CEST 2006. -------- --- pam/pam.changes 2006-08-23 19:12:07.000000000 +0200 +++ pam/pam.changes 2006-08-30 17:52:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 17:14:22 CEST 2006 - kukuk(a)suse.de + +- Update to Llinux-PAM 0.99.6.2 (incorporate last change) +- Add pam_loginuid and fixes from CVS + +------------------------------------------------------------------- @@ -42,0 +49,5 @@ +Wed May 24 10:54:25 CEST 2006 - kukuk(a)suse.de + +- Fix problems found by Coverity + +------------------------------------------------------------------- Old: ---- Linux-PAM-0.99.6.1-docs.tar.bz2 Linux-PAM-0.99.6.1.tar.bz2 pam_cracklib.diff New: ---- Linux-PAM-0.99.6.2-docs.tar.bz2 Linux-PAM-0.99.6.2.tar.bz2 Linux-PAM-20060830.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.yBzmee/_old 2006-08-30 23:41:54.000000000 +0200 +++ /var/tmp/diff_new_pack.yBzmee/_new 2006-08-30 23:41:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pam (Version 0.99.6.1) +# spec file for package pam (Version 0.99.6.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,15 +12,18 @@ Name: pam URL: http://www.kernel.org/pub/linux/libs/pam/ -BuildRequires: audit-devel cracklib-devel db-devel +BuildRequires: cracklib-devel db-devel +%if %{suse_version} > 1000 +BuildRequires: audit-devel +%endif %define libpam_so_version 0.81.5 %define libpam_misc_so_version 0.81.2 %define libpamc_so_version 0.81.0 License: GPL, distributable Group: System/Libraries Autoreqprov: on -Version: 0.99.6.1 -Release: 3 +Version: 0.99.6.2 +Release: 1 Summary: A security tool that provides authentication for applications Obsoletes: pam-laus Source: Linux-PAM-%{version}.tar.bz2 @@ -32,7 +35,7 @@ Source6: common-password.pamd Source7: common-session.pamd Source8: etc.environment -Patch: pam_cracklib.diff +Patch: Linux-PAM-20060830.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,8 +64,14 @@ %prep %setup -q -n Linux-PAM-%{version} -b 1 %patch +chmod 755 modules/pam_loginuid/tst-pam_loginuid %build +aclocal -I m4 +autoheader +automake --add-missing --copy +autoreconf +chmod 755 configure CFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --infodir=%{_infodir} \ @@ -129,6 +138,15 @@ install -m 644 CHANGELOG Copyright README $DOC # SELinux is not part of SL: rm $DOC/modules/README.pam_selinux +# Not for CODE10 and older +%if %{suse_version} <= 1010 +rm $DOC/modules/README.pam_keyinit +rm $DOC/modules/README.pam_namespace +rm $RPM_BUILD_ROOT%{_mandir}/man8/pam_keyinit* +rm $RPM_BUILD_ROOT%{_mandir}/man8/pam_namespace* +rm $RPM_BUILD_ROOT/%{_lib}/security/pam_keyinit.so +rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_namespace.so +%endif # Create filelist with translatins %{find_lang} Linux-PAM @@ -153,8 +171,10 @@ %config(noreplace) %{_sysconfdir}/security/limits.conf %config(noreplace) %{_sysconfdir}/security/pam_env.conf %config(noreplace) %{_sysconfdir}/security/time.conf +%if %{suse_version} > 1010 %config(noreplace) %{_sysconfdir}/security/namespace.conf %config(noreplace) %{_sysconfdir}/security/namespace.init +%endif %doc %{_mandir}/man5/*.conf.5* %doc %{_mandir}/man5/pam.d.5* %doc %{_mandir}/man8/* @@ -165,9 +185,53 @@ /%{_lib}/libpam_misc.so.0 /%{_lib}/libpam_misc.so.%{libpam_misc_so_version} %dir /%{_lib}/security -/%{_lib}/security/pam_*.so +/%{_lib}/security/pam_access.so +/%{_lib}/security/pam_cracklib.so +/%{_lib}/security/pam_debug.so +/%{_lib}/security/pam_deny.so +/%{_lib}/security/pam_echo.so +/%{_lib}/security/pam_env.so +/%{_lib}/security/pam_exec.so +/%{_lib}/security/pam_filter.so %dir /%{_lib}/security/pam_filter /%{_lib}/security//pam_filter/upperLOWER +/%{_lib}/security/pam_ftp.so +/%{_lib}/security/pam_group.so +/%{_lib}/security/pam_issue.so +%if %{suse_version} > 1010 +/%{_lib}/security/pam_keyinit.so +%endif +/%{_lib}/security/pam_lastlog.so +/%{_lib}/security/pam_limits.so +/%{_lib}/security/pam_listfile.so +/%{_lib}/security/pam_localuser.so +/%{_lib}/security/pam_loginuid.so +/%{_lib}/security/pam_mail.so +/%{_lib}/security/pam_mkhomedir.so +/%{_lib}/security/pam_motd.so +%if %{suse_version} > 1010 +/%{_lib}/security/pam_namespace.so +%endif +/%{_lib}/security/pam_nologin.so +/%{_lib}/security/pam_permit.so +/%{_lib}/security/pam_rhosts.so +/%{_lib}/security/pam_rhosts_auth.so +/%{_lib}/security/pam_rootok.so +/%{_lib}/security/pam_securetty.so +/%{_lib}/security/pam_shells.so +/%{_lib}/security/pam_stress.so +/%{_lib}/security/pam_succeed_if.so +/%{_lib}/security/pam_tally.so +/%{_lib}/security/pam_time.so +/%{_lib}/security/pam_umask.so +/%{_lib}/security/pam_unix_acct.so +/%{_lib}/security/pam_unix_auth.so +/%{_lib}/security/pam_unix_passwd.so +/%{_lib}/security/pam_unix_session.so +/%{_lib}/security/pam_userdb.so +/%{_lib}/security/pam_warn.so +/%{_lib}/security/pam_wheel.so +/%{_lib}/security/pam_xauth.so /sbin/pam_tally %attr (2755,root,shadow)/sbin/unix_chkpwd @@ -182,6 +246,9 @@ %{_libdir}/libpam_misc.so %changelog -n pam +* Wed Aug 30 2006 - kukuk(a)suse.de +- Update to Llinux-PAM 0.99.6.2 (incorporate last change) +- Add pam_loginuid and fixes from CVS * Wed Aug 23 2006 - kukuk(a)suse.de - Fix seg.fault in pam_cracklib if retyped password is empty * Tue Aug 22 2006 - kukuk(a)suse.de @@ -199,6 +266,8 @@ - Update to current CVS (lot of new manual pages and docu) * Tue May 30 2006 - kukuk(a)suse.de - Update to Linux-PAM 0.99.4.0 (merge all patches and translations) +* Wed May 24 2006 - kukuk(a)suse.de +- Fix problems found by Coverity * Wed May 17 2006 - schwab(a)suse.de - Don't strip binaries. * Fri May 05 2006 - kukuk(a)suse.de ++++++ Linux-PAM-0.99.6.1-docs.tar.bz2 -> Linux-PAM-0.99.6.2-docs.tar.bz2 ++++++ ++++ 2475 lines of diff (skipped) ++++++ Linux-PAM-0.99.6.1-docs.tar.bz2 -> Linux-PAM-0.99.6.2.tar.bz2 ++++++ ++++ 204210 lines of diff (skipped) ++++++ Linux-PAM-20060830.diff ++++++ ++++ 1437 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package linuxrc checked in at Wed Aug 30 23:38:58 CEST 2006. -------- --- linuxrc/linuxrc.changes 2006-08-30 00:48:58.000000000 +0200 +++ linuxrc/linuxrc.changes 2006-08-30 15:37:12.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Aug 30 15:37:06 CEST 2006 - snwint(a)suse.de + +- s390: remove dependency on libsysfs + +------------------------------------------------------------------- +Wed Aug 30 14:52:43 CEST 2006 - snwint(a)suse.de + +- tell the user what file we failed to FTP +- s390: accept upper-case CCW addresses +- s390: make CTC mode dialog wider (bug #186563) +- set min vnc password length to 8 (#184204) +- changed tftp to bind to different port for each connection (#187745) +- remove libsysfs but for s390 + +------------------------------------------------------------------- Old: ---- linuxrc-2.1.0.tar.bz2 linuxrc-sysfs.patch New: ---- linuxrc-2.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.Xv7K2w/_old 2006-08-30 23:38:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Xv7K2w/_new 2006-08-30 23:38:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.1.0) +# spec file for package linuxrc (Version 2.1.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,14 @@ # norootforbuild Name: linuxrc -BuildRequires: hwinfo-devel sysfsutils +BuildRequires: hwinfo-devel License: GPL Group: System/Boot Autoreqprov: on Summary: SUSE Installation Program -Version: 2.1.0 -Release: 5 -Source: linuxrc-2.1.0.tar.bz2 -Patch: linuxrc-sysfs.patch +Version: 2.1.2 +Release: 1 +Source: linuxrc-2.1.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -33,7 +32,6 @@ %prep %setup -%patch %build make @@ -55,6 +53,15 @@ %doc linuxrc.html %changelog -n linuxrc +* Wed Aug 30 2006 - snwint(a)suse.de +- s390: remove dependency on libsysfs +* Wed Aug 30 2006 - snwint(a)suse.de +- tell the user what file we failed to FTP +- s390: accept upper-case CCW addresses +- s390: make CTC mode dialog wider (bug #186563) +- set min vnc password length to 8 (#184204) +- changed tftp to bind to different port for each connection (#187745) +- remove libsysfs but for s390 * Wed Aug 30 2006 - ro(a)suse.de - added sysfsutils to BuildRequires and -lsysfs to LDFLAGS * Thu Jul 13 2006 - trenn(a)suse.de ++++++ linuxrc-2.1.0.tar.bz2 -> linuxrc-2.1.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/Changelog new/linuxrc-2.1.2/Changelog --- old/linuxrc-2.1.0/Changelog 2006-06-09 15:07:05.000000000 +0200 +++ new/linuxrc-2.1.2/Changelog 2006-08-30 15:36:03.000000000 +0200 @@ -1,3 +1,14 @@ +30/8/2006: v2.1.2 + - s390: remove dependency on libsysfs + +30/8/2006: v2.1.1 + - tell the user what file we failed to FTP + - s390: accept upper-case CCW addresses + - s390: make CTC mode dialog wider (bug #186563) + - set min vnc password length to 8 (#184204) + - changed tftp to bind to different port for each connection (#187745) + - remove libsysfs but for s390 + 9/6/2006: v2.1.0 - fixed device name matching for hard disk install (#177055) - read /proc/cmdline with fread() instead of fgets() (i.e. do not diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/VERSION new/linuxrc-2.1.2/VERSION --- old/linuxrc-2.1.0/VERSION 2006-06-09 15:07:19.000000000 +0200 +++ new/linuxrc-2.1.2/VERSION 2006-08-30 15:35:47.000000000 +0200 @@ -1 +1 @@ -2.1.0 +2.1.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/linuxrc.c new/linuxrc-2.1.2/linuxrc.c --- old/linuxrc-2.1.0/linuxrc.c 2006-07-13 14:51:05.000000000 +0200 +++ new/linuxrc-2.1.2/linuxrc.c 2006-05-11 11:03:10.000000000 +0200 @@ -1009,13 +1009,6 @@ } } - /* Try to activate dynamic frequency scaling */ -#if (defined(__i386__) || defined(__x86_64__) || defined(__PPC__)) - fprintf(stderr, "Activate dynamic frequency scaling..."); - i = cpufreq_activate(); - fprintf(stderr, "%s\n", i ? "failed" : "done"); -#endif - if(!config.manual) { if(auto2_init()) { config.manual = 0; /* ###### does it make sense? */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/net.c new/linuxrc-2.1.2/net.c --- old/linuxrc-2.1.0/net.c 2006-06-06 09:29:45.000000000 +0200 +++ new/linuxrc-2.1.2/net.c 2006-08-30 15:35:29.000000000 +0200 @@ -94,11 +94,11 @@ { int win_old = config.win; - if(config.vnc && (!config.net.vncpassword || strlen(config.net.vncpassword) < 5)) { + if(config.vnc && (!config.net.vncpassword || strlen(config.net.vncpassword) < 8)) { if(!config.win) util_disp_init(); for(;;) { if(dia_input2(txt_get(TXT_VNC_PASSWORD), &config.net.vncpassword, 20, 1)) break; - if(config.net.vncpassword && strlen(config.net.vncpassword) >= 5) break; + if(config.net.vncpassword && strlen(config.net.vncpassword) >= 8) break; dia_message(txt_get(TXT_VNC_PASSWORD_TOO_SHORT), MSGTYPE_ERROR); } } @@ -1677,16 +1677,14 @@ } \ if(config.manual) -#include <sysfs/dlist.h> -#include <sysfs/libsysfs.h> +#include <dirent.h> void net_list_s390_devs(char* driver, int model) { char buf[4<<10]; /* good enough for ca. 240 devices */ - struct sysfs_driver* driv; - struct dlist* devs; - struct sysfs_device* dev; - struct sysfs_attribute* attr; + char tmp[256]; + DIR* driv; + struct dirent* devs; char* bp=&buf[0]; int count = 0; @@ -1694,14 +1692,15 @@ if(!config.manual) return; - driv=sysfs_open_driver("ccw",driver); // FIXME: error handling - devs=sysfs_get_driver_devices(driv); // FIXME: error handling - dlist_for_each_data(devs,dev,struct sysfs_device) + driv=opendir("/sys/bus/ccw/devices"); + while((devs = readdir(driv))) { - attr=sysfs_get_device_attr(dev,"cutype"); - if(model && strtol(attr->value+5,NULL,16)!=model) continue; - bp+=sprintf(bp,"%s ",dev->bus_id); - bp+=sprintf(bp,"%s",attr->value); /* attr->value contains a LF */ + if(devs->d_type == DT_DIR) continue; + sprintf(tmp,"/sys/bus/ccw/devices/%s/cutype", devs->d_name); + util_read_and_chop(tmp, tmp); + if(model && strtol(tmp+5,NULL,16)!=model) continue; + bp+=sprintf(bp,"%s ",devs->d_name); + bp+=sprintf(bp,"%s",tmp); /* attribute contains a LF */ count++; if(count % 100 == 0) /* avoid buffer overruns with many devices */ { @@ -1710,8 +1709,7 @@ buf[0] = 0; } } - sysfs_close_list(devs); - /* calling sysfs_close_driver() here causes double free()s */ + closedir(driv); if(buf[0]) dia_message(buf,MSGTYPE_INFO); } @@ -1728,7 +1726,10 @@ if(addr[i] != '.') goto error; } else + { + addr[i] = tolower(addr[i]); if((addr[i] < 'a' || addr[i] > 'f') && (addr[i] < '0' || addr[i] > '9')) goto error; + } } return 0; @@ -1937,7 +1938,7 @@ else rc=0; IFNOTAUTO(config.hwp.protocol) { - rc=dia_menu2(txt_get(TXT_CHOOSE_CTC_PROTOCOL), 33, 0, protocols, rc); + rc=dia_menu2(txt_get(TXT_CHOOSE_CTC_PROTOCOL), 50, 0, protocols, rc); switch(rc) { case di_ctc_compat: config.hwp.protocol=0+1; break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/ar.po new/linuxrc-2.1.2/po/ar.po --- old/linuxrc-2.1.0/po/ar.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/ar.po 2006-06-27 12:35:29.000000000 +0200 @@ -885,7 +885,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/bg.po new/linuxrc-2.1.2/po/bg.po --- old/linuxrc-2.1.0/po/bg.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/bg.po 2006-06-27 12:35:29.000000000 +0200 @@ -966,8 +966,8 @@ "Необходими са поне %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Паролата е прекалено къса (трябва да има поне 5 символа)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Паролата е прекалено къса (трябва да има поне 8 символа)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/bn.po new/linuxrc-2.1.2/po/bn.po --- old/linuxrc-2.1.0/po/bn.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/bn.po 2006-06-27 12:35:29.000000000 +0200 @@ -885,7 +885,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/br.po new/linuxrc-2.1.2/po/br.po --- old/linuxrc-2.1.0/po/br.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/br.po 2006-06-27 12:35:29.000000000 +0200 @@ -1044,7 +1044,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/bs.po new/linuxrc-2.1.2/po/bs.po --- old/linuxrc-2.1.0/po/bs.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/bs.po 2006-06-27 12:35:29.000000000 +0200 @@ -1043,7 +1043,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/cs.po new/linuxrc-2.1.2/po/cs.po --- old/linuxrc-2.1.0/po/cs.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/cs.po 2006-06-27 12:35:29.000000000 +0200 @@ -955,8 +955,8 @@ "Minimální velikost RAM pro instalaci je %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Heslo je příliš krátké (musí mít nejméně 5 znaků)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Heslo je příliš krátké (musí mít nejméně 8 znaků)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/da.po new/linuxrc-2.1.2/po/da.po --- old/linuxrc-2.1.0/po/da.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/da.po 2006-06-27 12:35:29.000000000 +0200 @@ -919,8 +919,8 @@ "Du skal have mindst %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Din adgangskode er for kort (den skal være mindt 5 tegn lang)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Din adgangskode er for kort (den skal være mindt 8 tegn lang)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/de.po new/linuxrc-2.1.2/po/de.po --- old/linuxrc-2.1.0/po/de.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/de.po 2006-06-27 12:35:29.000000000 +0200 @@ -973,8 +973,8 @@ "benötigen mindestens %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Das Passwort ist zu kurz (es muss mindestens 5 Zeichen enthalten)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Das Passwort ist zu kurz (es muss mindestens 8 Zeichen enthalten)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/el.po new/linuxrc-2.1.2/po/el.po --- old/linuxrc-2.1.0/po/el.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/el.po 2006-06-27 12:35:29.000000000 +0200 @@ -956,8 +956,8 @@ "Χρειάζεστε τουλάχιστον %d ΜΒ." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Ο κωδικός πρόσβασης είναι πολύ σύντομος (πρέπει να έχει τουλάχιστον 5 χαρακτήρες)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Ο κωδικός πρόσβασης είναι πολύ σύντομος (πρέπει να έχει τουλάχιστον 8 χαρακτήρες)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/es.po new/linuxrc-2.1.2/po/es.po --- old/linuxrc-2.1.0/po/es.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/es.po 2006-06-27 12:35:29.000000000 +0200 @@ -961,8 +961,8 @@ "Necesita al menos %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "La contraseña es demasiado corta (debe tener al menos 5 caracteres)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "La contraseña es demasiado corta (debe tener al menos 8 caracteres)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/fi.po new/linuxrc-2.1.2/po/fi.po --- old/linuxrc-2.1.0/po/fi.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/fi.po 2006-06-27 12:35:29.000000000 +0200 @@ -932,8 +932,8 @@ "Tarvitset vähintään %d Mt muistia." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Salasana on liian lyhyt (täytyy olla vähintään 5 merkkiä)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Salasana on liian lyhyt (täytyy olla vähintään 8 merkkiä)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/fr.po new/linuxrc-2.1.2/po/fr.po --- old/linuxrc-2.1.0/po/fr.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/fr.po 2006-06-27 12:35:29.000000000 +0200 @@ -1145,9 +1145,9 @@ "nécessitez au moins %d Mo." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" -"Le mot de passe est trop court (il doit contenir au moins 5 caractères)." +"Le mot de passe est trop court (il doit contenir au moins 8 caractères)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/he.po new/linuxrc-2.1.2/po/he.po --- old/linuxrc-2.1.0/po/he.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/he.po 2006-06-27 12:35:29.000000000 +0200 @@ -885,7 +885,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/hu.po new/linuxrc-2.1.2/po/hu.po --- old/linuxrc-2.1.0/po/hu.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/hu.po 2006-06-27 12:35:29.000000000 +0200 @@ -913,8 +913,8 @@ msgstr "A számítógépében nincs elegendő RAM a(z) %s telepítéséhez. Legalább %d MB szükséges." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "A jelszó túl rövid (legalább 5 karakterből kell állnia)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "A jelszó túl rövid (legalább 8 karakterből kell állnia)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/id.po new/linuxrc-2.1.2/po/id.po --- old/linuxrc-2.1.0/po/id.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/id.po 2006-06-27 12:35:29.000000000 +0200 @@ -1026,7 +1026,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/it.po new/linuxrc-2.1.2/po/it.po --- old/linuxrc-2.1.0/po/it.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/it.po 2006-06-27 12:35:29.000000000 +0200 @@ -1016,8 +1016,8 @@ "richiesti almeno %d Mbyte." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Password troppo breve (deve essere composta almeno di 5 caratteri)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Password troppo breve (deve essere composta almeno di 8 caratteri)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/ja.po new/linuxrc-2.1.2/po/ja.po --- old/linuxrc-2.1.0/po/ja.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/ja.po 2006-06-27 12:35:29.000000000 +0200 @@ -965,7 +965,7 @@ "RAM容量が少ないため、%sをインストールできません。 %dMB以上の容量が必要です。" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "パスワードの文字数が少なすぎます。5文字以上にしてください。" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/ko.po new/linuxrc-2.1.2/po/ko.po --- old/linuxrc-2.1.0/po/ko.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/ko.po 2006-06-27 12:35:29.000000000 +0200 @@ -885,7 +885,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/linuxrc.pot new/linuxrc-2.1.2/po/linuxrc.pot --- old/linuxrc-2.1.0/po/linuxrc.pot 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/linuxrc.pot 2006-06-27 12:31:44.000000000 +0200 @@ -885,7 +885,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/nb.po new/linuxrc-2.1.2/po/nb.po --- old/linuxrc-2.1.0/po/nb.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/nb.po 2006-06-27 12:35:29.000000000 +0200 @@ -930,8 +930,8 @@ "Du trenger minst %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Passordet er for kort (må minst bestå av 5 tegn)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Passordet er for kort (må minst bestå av 8 tegn)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/nl.po new/linuxrc-2.1.2/po/nl.po --- old/linuxrc-2.1.0/po/nl.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/nl.po 2006-06-27 12:35:29.000000000 +0200 @@ -963,8 +963,8 @@ "minstens %d MB nodig." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Wachtwoord is te kort (moet uit minstens 5 karakters bestaan)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Wachtwoord is te kort (moet uit minstens 8 karakters bestaan)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/pl.po new/linuxrc-2.1.2/po/pl.po --- old/linuxrc-2.1.0/po/pl.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/pl.po 2006-06-27 12:35:29.000000000 +0200 @@ -929,8 +929,8 @@ msgstr "Komputer ten nie ma wystarczającej ilości pamięci RAM do instalacji %s. Wymagane jest co najmniej %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Hasło za krótkie (musi mieć co najmniej 5 znaków)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Hasło za krótkie (musi mieć co najmniej 8 znaków)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/pt.po new/linuxrc-2.1.2/po/pt.po --- old/linuxrc-2.1.0/po/pt.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/pt.po 2006-06-27 12:35:29.000000000 +0200 @@ -909,8 +909,8 @@ msgstr "O computador não tem memória RAM suficiente para a instalação de %s. São necessários pelo menos %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "A palavra passe é demasiado curta (deve ter pelo menos 5 caracteres)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "A palavra passe é demasiado curta (deve ter pelo menos 8 caracteres)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/pt_BR.po new/linuxrc-2.1.2/po/pt_BR.po --- old/linuxrc-2.1.0/po/pt_BR.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/pt_BR.po 2006-06-27 12:35:29.000000000 +0200 @@ -956,8 +956,8 @@ "de pelo menos %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "A senha é muito curta (deve ter pelo menos 5 caracteres)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "A senha é muito curta (deve ter pelo menos 8 caracteres)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/ro.po new/linuxrc-2.1.2/po/ro.po --- old/linuxrc-2.1.0/po/ro.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/ro.po 2006-06-27 12:35:29.000000000 +0200 @@ -1025,7 +1025,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/ru.po new/linuxrc-2.1.2/po/ru.po --- old/linuxrc-2.1.0/po/ru.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/ru.po 2006-06-27 12:35:29.000000000 +0200 @@ -1030,7 +1030,7 @@ msgstr "" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." +msgid "Password is too short (must have at least 8 characters)." msgstr "" #. TXT_XSERVER_IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/sk.po new/linuxrc-2.1.2/po/sk.po --- old/linuxrc-2.1.0/po/sk.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/sk.po 2006-06-27 12:35:29.000000000 +0200 @@ -953,8 +953,8 @@ "Potrebujete aspoň %d MB." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Heslo je príliš krátke (musí byť aspoň 5 znakov dlhé)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Heslo je príliš krátke (musí byť aspoň 8 znakov dlhé)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/sl.po new/linuxrc-2.1.2/po/sl.po --- old/linuxrc-2.1.0/po/sl.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/sl.po 2006-06-27 12:35:29.000000000 +0200 @@ -939,8 +939,8 @@ msgstr "Vaš računalnik nima dovolj pomnilnika za namestitev %s. Imeti morate najmanj %d MB pomnilnika." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Geslo je prekratko (imeti mora najmanj 5 znakov)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Geslo je prekratko (imeti mora najmanj 8 znakov)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/sv.po new/linuxrc-2.1.2/po/sv.po --- old/linuxrc-2.1.0/po/sv.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/sv.po 2006-06-27 12:36:35.000000000 +0200 @@ -961,9 +961,8 @@ msgstr "för av s Du vid Mibyte." #. TXT_VNC_PASSWORD_TOO_SHORT -#, fuzzy -msgid "Password is too short (must have at least 5 characters)." -msgstr "Lösenord är short vid." +msgid "Password is too short (must have at least 8 characters)." +msgstr "" #. TXT_XSERVER_IP #, fuzzy diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/uk.po new/linuxrc-2.1.2/po/uk.po --- old/linuxrc-2.1.0/po/uk.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/uk.po 2006-06-27 12:35:29.000000000 +0200 @@ -921,8 +921,8 @@ msgstr "Ваш комп'ютер не має достатньо RAM для встановлення %s. Необхідно мати принаймні %d МБ." #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "Закороткий пароль (повинно бути не менше 5 символів)." +msgid "Password is too short (must have at least 8 characters)." +msgstr "Закороткий пароль (повинно бути не менше 8 символів)." #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/zh_CN.po new/linuxrc-2.1.2/po/zh_CN.po --- old/linuxrc-2.1.0/po/zh_CN.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/zh_CN.po 2006-06-27 12:35:29.000000000 +0200 @@ -937,8 +937,8 @@ msgstr "您的计算机 RAM 不足，无法安装 %s。至少需要 %d MB。" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "口令太短（必须至少为 5 个字符）。" +msgid "Password is too short (must have at least 8 characters)." +msgstr "口令太短（必须至少为 8 个字符）。" #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/po/zh_TW.po new/linuxrc-2.1.2/po/zh_TW.po --- old/linuxrc-2.1.0/po/zh_TW.po 2006-05-18 17:07:58.000000000 +0200 +++ new/linuxrc-2.1.2/po/zh_TW.po 2006-06-27 12:35:29.000000000 +0200 @@ -935,8 +935,8 @@ msgstr "您的電腦沒有足夠的 RAM 來安裝 %s。您至少需要 %d MB。" #. TXT_VNC_PASSWORD_TOO_SHORT -msgid "Password is too short (must have at least 5 characters)." -msgstr "密碼太短 (必須至少有 5 個字元)。" +msgid "Password is too short (must have at least 8 characters)." +msgstr "密碼太短 (必須至少有 8 個字元)。" #. TXT_XSERVER_IP msgid "Enter the IP address of the host running the X11 server." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/scsi_rename.c new/linuxrc-2.1.2/scsi_rename.c --- old/linuxrc-2.1.0/scsi_rename.c 2004-08-06 10:06:49.000000000 +0200 +++ new/linuxrc-2.1.2/scsi_rename.c 2006-08-30 14:51:08.000000000 +0200 @@ -1,8 +1,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sysfs/dlist.h> -#include <sysfs/libsysfs.h> + +#include <hd.h> /* * Rename SCSI devices (disk & CD-ROM) writing add/remove-single-device to @@ -10,6 +10,7 @@ */ #include "global.h" +#include "util.h" #include "scsi_rename.h" #define MAX_SCSI_DEVS 0x110 @@ -47,58 +48,66 @@ } +str_list_t *reverse_str_list(str_list_t *list); +str_list_t *free_str_list(str_list_t *list); +str_list_t *read_dir(char *dir_name, int type); +char *hd_read_sysfs_link(char *base_dir, char *link_name); + void get_scsi_list() { scsi_dev_t *scsi_dev; char *s; unsigned u; - - struct sysfs_class *sf_class; - struct sysfs_class_device *sf_cdev; - struct sysfs_device *sf_dev; - struct dlist *sf_cdev_list; + str_list_t *sf_class, *sf_class_e; + char *sf_cdev = NULL, *sf_dev, *sf_cdev_name, *bus_id; scsi_list = calloc(MAX_SCSI_DEVS + 1, sizeof *scsi_list); - sf_class = sysfs_open_class("block"); + sf_class = reverse_str_list(read_dir("/sys/block", 'd')); if(!sf_class) { if(config.debug) fprintf(stderr, "no block devices\n"); return; } - sf_cdev_list = sysfs_get_class_devices(sf_class); - if(sf_cdev_list) dlist_for_each_data(sf_cdev_list, sf_cdev, struct sysfs_class_device) { - sf_dev = sysfs_get_classdev_device(sf_cdev); + for(sf_class_e = sf_class; sf_class_e; sf_class_e = sf_class_e->next) { + strprintf(&sf_cdev, "/sys/block/%s", sf_class_e->str); + sf_dev = hd_read_sysfs_link(sf_cdev, "device"); + + sf_cdev_name = strrchr(sf_cdev, '/'); + if(sf_cdev_name) sf_cdev_name++; + + if(sf_dev && sf_cdev_name) { + bus_id = strrchr(sf_dev, '/'); + if(bus_id) bus_id++; - if(sf_dev) { scsi_dev = NULL; if( ( - !strncmp(sf_cdev->name, "sr", 2) || - !strncmp(sf_cdev->name, "sd", 2) + !strncmp(sf_cdev_name, "sr", 2) || + !strncmp(sf_cdev_name, "sd", 2) ) && scsi_list_len < MAX_SCSI_DEVS ) { scsi_dev = scsi_list[scsi_list_len++] = calloc(1, sizeof *scsi_dev); - scsi_dev->name = strdup(sf_cdev->name); - scsi_dev->bus_id = strdup(sf_dev->bus_id); + scsi_dev->name = strdup(sf_cdev_name); + scsi_dev->bus_id = strdup(bus_id); for(s = scsi_dev->bus_id; *s; s++) if(*s == ':') *s = ' '; - scsi_dev->path = strdup(sf_dev->path); + scsi_dev->path = strdup(sf_dev); if( - strstr(sf_dev->path, "/usb") || - strstr(sf_dev->path, "/fw-host") + strstr(sf_dev, "/usb") || + strstr(sf_dev, "/fw-host") ) { scsi_dev->hotplug = 1; } } - } } - sysfs_close_class(sf_class); + free(sf_cdev); + sf_class = free_str_list(sf_class); if(scsi_list_len) { qsort(scsi_list, scsi_list_len, sizeof *scsi_list, cmp_func); @@ -198,23 +207,13 @@ unsigned u; char *s; - struct sysfs_directory *sf_dir; - struct sysfs_link *sf_link; - do_rename(disk_list, disk_list_len); do_rename(cdrom_list, cdrom_list_len); for(u = 0; u < scsi_list_len; u++) { if(scsi_list[u]->renamed) { - sf_dir = sysfs_open_directory(scsi_list[u]->path); - if(sf_dir) { - sysfs_read_directory(sf_dir); - sf_link = sysfs_get_directory_link(sf_dir, "block"); - if(sf_link) { - if((s = strrchr(sf_link->target, '/'))) - scsi_list[u]->new_name = strdup(s + 1); - } - sysfs_close_directory(sf_dir); + if((s = hd_read_sysfs_link(scsi_list[u]->path, "block"))) { + if((s = strrchr(s, '/'))) scsi_list[u]->new_name = strdup(s + 1); } } } @@ -224,7 +223,6 @@ fprintf(stderr, "%s -> %s\n", scsi_list[u]->name, scsi_list[u]->new_name); } } - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/tftp.c new/linuxrc-2.1.2/tftp.c --- old/linuxrc-2.1.0/tftp.c 2004-11-03 11:52:37.000000000 +0100 +++ new/linuxrc-2.1.2/tftp.c 2006-06-30 14:24:40.000000000 +0200 @@ -86,6 +86,7 @@ struct sockaddr_in msa; int s; int r, nl; + static int rid; nl = strlen(filename); if (nl > 500) @@ -100,15 +101,21 @@ sprintf(tftp->buf, "socket: %s", strerror(errno)); return -1; } - msa.sin_family = AF_INET; - msa.sin_addr.s_addr = INADDR_ANY; - msa.sin_port = 0; - if (bind(s, (struct sockaddr *)&msa, sizeof(msa))) + for (r = 0; r <= 8192; r++) + { + msa.sin_family = AF_INET; + msa.sin_addr.s_addr = INADDR_ANY; + msa.sin_port = r == 8192 ? 0 : htons(((r + rid) & 8191) + 30000); + if (!bind(s, (struct sockaddr *)&msa, sizeof(msa))) + break; + } + if (r == 8193) { sprintf(tftp->buf, "bind: %s", strerror(errno)); close(s); return -1; } + rid = r + 1; tftp->nr = 0; tftp->s = s; tftp->timo = timo; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/util.c new/linuxrc-2.1.2/util.c --- old/linuxrc-2.1.0/util.c 2006-07-13 14:51:05.000000000 +0200 +++ new/linuxrc-2.1.2/util.c 2006-08-30 14:51:02.000000000 +0200 @@ -38,8 +38,6 @@ #include <net/if.h> #include <linux/major.h> #include <linux/raid/md_u.h> -#include <sysfs/dlist.h> -#include <sysfs/libsysfs.h> #define CDROMEJECT 0x5309 /* Ejects the cdrom media */ @@ -3332,7 +3330,7 @@ fd = ftpGetFileDesc(config.net.ftp_sock, url_decode(filename)); if(fd < 0) { - str_copy(&config.net.error, (char *) ftpStrerror(fd)); + strprintf(&config.net.error, "%s: %s", filename, (char *) ftpStrerror(fd)); ftpClose(config.net.ftp_sock); return config.net.ftp_sock = -1; } @@ -4441,34 +4439,38 @@ int util_set_sysfs_attr(char* attr, char* value) { - int rc; - struct sysfs_attribute* sa; + int i, fd; - sa=sysfs_open_attribute(attr); - if(!sa) return -1; - - rc=sysfs_write_attribute(sa,value,strlen(value)); + if((fd = open(attr, O_WRONLY)) < 0) return -1; + + i = write(fd, value, strlen(value)); + + close(fd); - sysfs_close_attribute(sa); - return rc; + return i < 0 ? i : 0; } int util_get_sysfs_int_attr(char* attr, int *retval) { - int rc; - struct sysfs_attribute* sa; + int i, fd; + char buf[1024]; + + if((fd = open(buf, O_RDONLY)) < 0) return -1; + + i = read(fd, buf, sizeof buf - 1); + + close(fd); - sa=sysfs_open_attribute(attr); - if(!sa) return -1; + if(i >= 0) { + buf[i] = 0; + } + else { + return -1; + } - rc=sysfs_read_attribute(sa); - if (sa->value) - *retval = strtol(sa->value,NULL,10); - else - rc = 1; + *retval = strtol(buf, NULL, 0); - sysfs_close_attribute(sa); - return rc; + return 0; } char *print_driverid(driver_t *drv, int with_0x) @@ -4731,41 +4733,3 @@ return de ? 1 : 0; } - -/* - * Return: - * -1 : no hardware support - * 0 : ok - */ -#if (defined(__i386__) || defined(__x86_64__) || defined(__PPC__)) -int cpufreq_activate(void) -{ - char attrpath[256]; - unsigned i, max_cpu = 256; - FILE *f; - - for(i = 0; i < max_cpu; i++) { - sprintf(attrpath, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor", i); - if((f = fopen(attrpath, "w"))) { - fwrite("ondemand", 1, 8, f); - fclose(f); - } - else { - break; - } - } - - if(!i) { - /* these modules (nearly) always load successfully... - remove them again if activating cpufreq failed */ - mod_unload_module("freq_table"); - - return -1; - } - else { - fprintf (stderr, "detected cpufreq support...\n"); - } - - return 0; -} -#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.0/util.h new/linuxrc-2.1.2/util.h --- old/linuxrc-2.1.0/util.h 2006-07-13 14:51:05.000000000 +0200 +++ new/linuxrc-2.1.2/util.h 2006-04-26 16:25:13.000000000 +0200 @@ -154,7 +154,3 @@ char *get_translation(slist_t *trans, char *locale); int util_process_running(char *name); -#if (defined(__i386__) || defined(__x86_64__) || defined(__PPC__)) -int cpufreq_activate(void); -#endif - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xsp
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package xsp checked in at Wed Aug 30 23:38:33 CEST 2006. -------- --- xsp/xsp.changes 2006-08-01 02:56:13.000000000 +0200 +++ xsp/xsp.changes 2006-08-30 20:07:35.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 30 20:03:08 CEST 2006 - wberrier(a)suse.de + +- Update to 1.1.17 + - Added support for X.509 client certificates + - Update to handle newly created AppDomains + +------------------------------------------------------------------- Old: ---- xsp-1.1.16.1.tar.gz New: ---- xsp-1.1.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.h1nn4d/_old 2006-08-30 23:38:29.000000000 +0200 +++ /var/tmp/diff_new_pack.h1nn4d/_new 2006-08-30 23:38:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xsp (Version 1.1.16.1) +# spec file for package xsp (Version 1.1.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ Group: Productivity/Networking/Web/Servers Autoreqprov: on Requires: gnome-filesystem -Version: 1.1.16.1 +Version: 1.1.17 Release: 1 Summary: Small Web Server Hosting ASP.NET Source: %{name}-%{version}.tar.gz @@ -49,7 +49,7 @@ make %install -make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package xsp /root ${RPM_BUILD_ROOT}/usr/lib" +make install DESTDIR=$RPM_BUILD_ROOT mkdir -p ${RPM_BUILD_ROOT}/usr/share mv ${RPM_BUILD_ROOT}/usr/lib/pkgconfig ${RPM_BUILD_ROOT}/usr/share @@ -59,12 +59,28 @@ %files %defattr(-,root,root) %{prefix}/bin/* -%{prefix}/lib/xsp %{prefix}/share/pkgconfig/* %{prefix}/share/man/*/* +%{prefix}/lib/xsp +%{prefix}/lib/mono/gac/Mono.WebServer +%{prefix}/lib/mono/1.0/Mono.WebServer.dll +%{prefix}/lib/mono/gac/Mono.WebServer2 +%{prefix}/lib/mono/2.0/Mono.WebServer2.dll +%{prefix}/lib/mono/gac/xsp +%{prefix}/lib/mono/1.0/xsp.exe +%{prefix}/lib/mono/gac/xsp2 +%{prefix}/lib/mono/2.0/xsp2.exe +%{prefix}/lib/mono/gac/mod-mono-server +%{prefix}/lib/mono/1.0/mod-mono-server.exe +%{prefix}/lib/mono/gac/mod-mono-server2 +%{prefix}/lib/mono/2.0/mod-mono-server2.exe %doc NEWS README %changelog -n xsp +* Wed Aug 30 2006 - wberrier(a)suse.de +- Update to 1.1.17 +- Added support for X.509 client certificates +- Update to handle newly created AppDomains * Tue Aug 01 2006 - wberrier(a)suse.de - update to 1.1.16.1 - better connection handling ++++++ xsp-1.1.16.1.tar.gz -> xsp-1.1.17.tar.gz ++++++ ++++ 1838 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/xsp-1.1.16.1/ChangeLog new/xsp-1.1.17/ChangeLog --- old/xsp-1.1.16.1/ChangeLog 2006-07-20 09:47:38.000000000 +0200 +++ new/xsp-1.1.17/ChangeLog 2006-08-25 21:55:56.000000000 +0200 @@ -1,3 +1,50 @@ +2006-08-23 Wade Berrier <wberrier(a)novell.com> + + * configure.in: + * src/Makefile.am: + * src/Mono.WebServer/Makefile.am: Add GACUTIL_FLAGS to make gac root dir package + friendly (Relative to DESTDIR) + +2006-08-16 Gonzalo Paniagua Javier <gonzalo(a)ximian.com> + + * configure.in: + * src/mono.snk: + * src/AssemblyInfo.cs.in: + * src/Makefile.am: + * src/Mono.WebServer/xsp-2.pc.in: + * src/Mono.WebServer/xsp.pc.in: + * src/Mono.WebServer/AssemblyInfo2.cs.in: + * src/Mono.WebServer/AssemblyInfo.cs.in: + * src/Mono.WebServer/Makefile.am: + * src/AssemblyInfoModMono.cs.in: + * src/mono.pub: + * scripts/Makefile.am: xsp, xsp2, Mono.WebServer and Mono.WebServer2 are + installed in the GAC now to avoid problems with the upcoming patch in + the runtime. + +2006-08-16 Gonzalo Paniagua Javier <gonzalo(a)ximian.com> + + * src/Mono.WebServer/MonoWorkerRequest.cs: + * src/Mono.WebServer/XSPApplicationHost.cs: + * src/ModMonoApplicationHost.cs: display unexpected errors in + ProcessRequest from the root domain, as it will help pinpoint deployment + errors once the upcoming patch modifies the way assemblies are loaded + in newly created domains. + +2006-08-03 Sebastien Pouliot <sebastien(a)ximian.com> + + * src/Makefile.am: Add a reference to Mono.Security.dll for + mod-mono-server.exe + * src/ModMonoWorkerRequest.cs: Add support for client certificate + validation using Apache and/or Mono. + * src/ModMonoApplicationHost.cs: Add PEM (Privacy Enhanced Mail) + base64 decoding for certificates and set the proper variables so + HttpClientCertificate can be used with mod_mono. + * src/Mono.WebServer/MonoWorkerRequest.cs: Add support for special SSL + variables (moved from XSPWorkerRequest.cs). + * src/Mono.WebServer/XSPWorkerRequest.cs: Removed support for special + SSL variables (now shared in MonoWorkerRequest.cs). + 2006-07-20 Gonzalo Paniagua Javier <gonzalo(a)ximian.com> * src/ModMonoApplicationHost.cs: don't prepend the file:// scheme, as 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/xsp-1.1.16.1/configure.in new/xsp-1.1.17/configure.in --- old/xsp-1.1.16.1/configure.in 2006-07-20 09:47:38.000000000 +0200 +++ new/xsp-1.1.17/configure.in 2006-08-25 21:55:56.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.57) AC_INIT(src/server.cs) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(xsp, 1.1.16.1) +AM_INIT_AUTOMAKE(xsp, 1.1.17) AM_MAINTAINER_MODE AC_PROG_INSTALL @@ -15,6 +15,8 @@ AC_PATH_PROG(MCS, mcs, no) AC_PATH_PROG(GMCS, gmcs, no) AC_PATH_PROG(RUNTIME, mono, no) +AC_PATH_PROG(GACUTIL, gacutil, no) +AC_PATH_PROG(SN, sn, no) CS="C#" if test "x$CSC" = "xno" -a "x$MCS" = "xno" ; then dnl AC_MSG_ERROR([You need to install a C# compiler]) @@ -54,9 +56,14 @@ echo "$CS compiler: $MCS" test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS" +GACUTIL_FLAGS='-root $(DESTDIR)$(prefix)/lib' + AC_SUBST(MCS) AC_SUBST(GMCS) AC_SUBST(RUNTIME) +AC_SUBST(GACUTIL) +AC_SUBST(GACUTIL_FLAGS) +AC_SUBST(SN) AC_OUTPUT([ Makefile man/xsp.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsp-1.1.16.1/scripts/Makefile.am new/xsp-1.1.17/scripts/Makefile.am --- old/xsp-1.1.16.1/scripts/Makefile.am 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/scripts/Makefile.am 2006-08-25 21:55:56.000000000 +0200 @@ -1,17 +1,21 @@ EXTRA_DIST = script.in -bin2_scripts_real = xsp2 mod-mono-server2 asp-state2 dbsessmgr2 +bin2_scripts_real = xsp2 mod-mono-server2 if NET_2_0 bin2_scripts = $(bin2_scripts_real) +tool2_scripts = asp-state2 dbsessmgr2 endif -bin1_scripts = xsp mod-mono-server asp-state dbsessmgr -bin_SCRIPTS = $(bin1_scripts) $(bin2_scripts) - -CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) - -plat_bindir = $(prefix)/lib/xsp/1.0 -plat_bindir2 = $(prefix)/lib/xsp/2.0 +bin1_scripts = xsp mod-mono-server +tool_scripts = asp-state dbsessmgr +bin_SCRIPTS = $(bin1_scripts) $(bin2_scripts) $(tool_scripts) $(tool2_scripts) + +CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) $(tool_scripts) $(tool2_scripts) + +plat_bindir = $(prefix)/lib/mono/1.0 +plat_bindir2 = $(prefix)/lib/mono/2.0 +plat_tooldir = $(prefix)/lib/xsp/1.0 +plat_tooldir2 = $(prefix)/lib/xsp/2.0 REWRITE = sed \ -e 's,@''plat_bindir@,$(plat_bindir),g' \ @@ -23,12 +27,31 @@ -e 's,@''exe_file@,$@.exe,g' \ -e 's,@''RUNTIME@,@RUNTIME@,g' +REWRITE_TOOLS = sed \ + -e 's,@''plat_bindir@,$(plat_tooldir),g' \ + -e 's,@''exe_file@,$@.exe,g' \ + -e 's,@''RUNTIME@,@RUNTIME@,g' + +REWRITE_TOOLS2 = sed \ + -e 's,@''plat_bindir@,$(plat_tooldir2),g' \ + -e 's,@''exe_file@,$@.exe,g' \ + -e 's,@''RUNTIME@,@RUNTIME@,g' + $(bin1_scripts): $(srcdir)/script.in Makefile.am $(REWRITE) $(srcdir)/script.in > $@.tmp mv $@.tmp $@ +$(tool_scripts): $(srcdir)/script.in Makefile.am + $(REWRITE_TOOLS) $(srcdir)/script.in > $@.tmp + mv $@.tmp $@ + if NET_2_0 $(bin2_scripts): $(srcdir)/script.in Makefile.am $(REWRITE2) $(srcdir)/script.in > $@.tmp mv $@.tmp $@ + +$(tool2_scripts): $(srcdir)/script.in Makefile.am + $(REWRITE_TOOLS2) $(srcdir)/script.in > $@.tmp + mv $@.tmp $@ endif + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsp-1.1.16.1/scripts/script.in new/xsp-1.1.17/scripts/script.in --- old/xsp-1.1.16.1/scripts/script.in 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/scripts/script.in 2006-08-25 21:55:56.000000000 +0200 @@ -1,2 +1,2 @@ #!/bin/sh -exec @RUNTIME@ "@plat_bindir@/@exe_file@" "$@" +exec @RUNTIME@ $MONO_OPTIONS "@plat_bindir@/@exe_file@" "$@" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsp-1.1.16.1/src/AssemblyInfo.cs.in new/xsp-1.1.17/src/AssemblyInfo.cs.in --- old/xsp-1.1.16.1/src/AssemblyInfo.cs.in 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/AssemblyInfo.cs.in 2006-08-25 21:55:56.000000000 +0200 @@ -3,7 +3,7 @@ // Authors: // Gonzalo Paniagua Javier (gonzalo(a)ximian.com) // -// Copyright (c) 2002,2003,2004,2005 Novell, Inc. (http://www.novell.com) +// Copyright (c) 2002,2003,2004,2005,2006 Novell, Inc. (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -31,5 +31,7 @@ [assembly: AssemblyVersion("@VERSION@")] [assembly: AssemblyTitle ("Mono-XSP Server")] [assembly: AssemblyDescription ("Minimalistic web server for testing System.Web")] -[assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")] +[assembly: AssemblyCopyright ("(c) 2002-2006 Novell, Inc.")] [assembly: AssemblyCompany ("Novell, Inc.")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")] 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/xsp-1.1.16.1/src/AssemblyInfoModMono.cs.in new/xsp-1.1.17/src/AssemblyInfoModMono.cs.in --- old/xsp-1.1.16.1/src/AssemblyInfoModMono.cs.in 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/AssemblyInfoModMono.cs.in 2006-08-25 21:55:56.000000000 +0200 @@ -3,7 +3,7 @@ // Authors: // Gonzalo Paniagua Javier (gonzalo(a)ximian.com) // -// Copyright (c) 2002,2003,2004 Novell, Inc. (http://www.novell.com) +// Copyright (c) 2002,2003,2004,2005,2006 Novell, Inc. (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -31,5 +31,7 @@ [assembly: AssemblyVersion("@VERSION@")] [assembly: AssemblyTitle ("ModMono-XSP Server")] [assembly: AssemblyDescription ("Minimalistic web server for testing System.Web")] -[assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")] +[assembly: AssemblyCopyright ("(c) 2002-2006 Novell, Inc.")] [assembly: AssemblyCompany ("Novell, Inc.")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")] 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/xsp-1.1.16.1/src/Makefile.am new/xsp-1.1.17/src/Makefile.am --- old/xsp-1.1.16.1/src/Makefile.am 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Makefile.am 2006-08-25 21:55:56.000000000 +0200 @@ -1,4 +1,5 @@ SUBDIRS=Mono.WebServer +builddir=$(top_builddir)/src MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 @@ -7,34 +8,34 @@ xsp2dir = $(prefix)/lib/xsp/2.0 modmonoserver2dir = $(prefix)/lib/xsp/2.0 +GACUTIL1=$(GACUTIL) -package 1.0 if NET_2_0 XSP2_EXE = xsp2.exe MODMONOSERVER2_EXE = mod-mono-server2.exe +GACUTIL2=$(GACUTIL) -package 2.0 endif -xsp_SCRIPTS = xsp.exe -xsp2_SCRIPTS = $(XSP2_EXE) - if !XSP_ONLY -modmonoserver_SCRIPTS = mod-mono-server.exe -modmonoserver2_SCRIPTS = $(MODMONOSERVER2_EXE) +modmonoserver_SCR = mod-mono-server.exe +modmonoserver2_SCR = $(MODMONOSERVER2_EXE) endif -CLEANFILES = *.exe *.mdb +noinst_SCRIPTS=xsp.exe xsp.exe $(XSP2_EXE) $(modmonoserver_SCR) $(modmonoserver2_SCR) -EXTRA_DIST = $(xsp_sources) $(modmono_only) AssemblyInfo.cs.in AssemblyInfoModMono.cs.in +CLEANFILES = *.exe *.mdb # xsp_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer.dll -r:Mono.Security.dll xsp2_references= -r:System.Web.dll -r:System.Configuration.dll -r:Mono.WebServer/Mono.WebServer2.dll -r:Mono.Security.dll if PLATFORM_WIN32 modmono_references= -lib:"$(prefix)/lib" -r:Mono.WebServer/Mono.WebServer.dll \ - -r:System.Web.dll -r:Mono.Posix.dll + -r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll modmono2_references= -lib:"$(prefix)/lib" -r:Mono.WebServer/Mono.WebServer2.dll \ - -r:System.Web.dll -r:Mono.Posix.dll + -r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll else -modmono_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer.dll -r:Mono.Posix.dll -modmono2_references= -r:System.Web.dll -r:System.Configuration.dll -r:Mono.WebServer/Mono.WebServer2.dll -r:Mono.Posix.dll +modmono_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer.dll -r:Mono.Posix.dll -r:Mono.Security.dll +modmono2_references= -r:System.Web.dll -r:System.Configuration.dll -r:Mono.WebServer/Mono.WebServer2.dll \ + -r:Mono.Posix.dll -r:Mono.Security.dll endif xsp_sources = server.cs security.cs @@ -48,16 +49,38 @@ modmono_sources = $(modmono_only) $(xsp_sources) modmono_build_sources = $(addprefix $(srcdir)/, $(modmono_sources)) AssemblyInfoModMono.cs +EXTRA_DIST = $(xsp_sources) $(modmono_only) AssemblyInfo.cs.in AssemblyInfoModMono.cs.in mono.pub mono.snk + xsp.exe: $(xsp_build_sources) $(MCS) $(MCSFLAGS) $(xsp_references) /out:$@ $(xsp_build_sources) + $(SN) -q -R $(builddir)/$@ $(srcdir)/mono.snk mod-mono-server.exe: $(modmono_build_sources) $(MCS) $(MCSFLAGS) $(modmono_references) /d:MODMONO_SERVER /out:$@ $(modmono_build_sources) + $(SN) -q -R $(builddir)/$@ $(srcdir)/mono.snk xsp2.exe: $(xsp_build_sources) $(GMCS) -d:NET_2_0 $(MCSFLAGS) $(xsp2_references) /out:$@ $(xsp_build_sources) + $(SN) -q -R $(builddir)/$@ $(srcdir)/mono.snk mod-mono-server2.exe: $(modmono_build_sources) $(GMCS) -d:NET_2_0 $(MCSFLAGS) $(modmono2_references) /d:MODMONO_SERVER /out:$@ $(modmono_build_sources) + $(SN) -q -R $(builddir)/$@ $(srcdir)/mono.snk + +install-data-local: + for i in xsp.exe mod-mono-server.exe ; do \ + $(GACUTIL1) $(GACUTIL_FLAGS) -i $(top_builddir)/src/$$i ; \ + done + +#if NET_2_0 + for i in xsp2.exe mod-mono-server2.exe ; do \ + $(GACUTIL2) $(GACUTIL_FLAGS) -i $(top_builddir)/src/$$i ; \ + done +#endif + +uninstall-local: + -for i in xsp mod-mono-server xsp2 mod-mono-server2 ; do \ + $(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \ + done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsp-1.1.16.1/src/ModMonoApplicationHost.cs new/xsp-1.1.17/src/ModMonoApplicationHost.cs --- old/xsp-1.1.16.1/src/ModMonoApplicationHost.cs 2006-07-20 09:47:38.000000000 +0200 +++ new/xsp-1.1.17/src/ModMonoApplicationHost.cs 2006-08-25 21:55:56.000000000 +0200 @@ -31,6 +31,7 @@ using System.IO; using System.Net; using System.Net.Sockets; +using System.Security.Cryptography.X509Certificates; using Mono.Unix; namespace Mono.WebServer @@ -187,6 +188,21 @@ // public class ModMonoApplicationHost : BaseApplicationHost { + private byte[] FromPEM (string pem) + { + int start = pem.IndexOf ("-----BEGIN CERTIFICATE-----"); + if (start < 0) + return null; + + start += 27; // 27 being the -----BEGIN CERTIFICATE----- length + int end = pem.IndexOf ("-----END CERTIFICATE-----", start); + if (end < start) + return null; + + string base64 = pem.Substring (start, (end - start)); + return Convert.FromBase64String (base64); + } + public void ProcessRequest (int reqId, string verb, string queryString, string path, string protocol, string localAddress, int serverPort, string remoteAddress, int remotePort, string remoteName, string [] headers, string [] headerValues) @@ -195,6 +211,38 @@ ModMonoWorkerRequest mwr = new ModMonoWorkerRequest (reqId, broker, this, verb, path, queryString, protocol, localAddress, serverPort, remoteAddress, remotePort, remoteName, headers, headerValues); + if (mwr.IsSecure ()) { + // note: we're only setting what we use (and not the whole lot) + mwr.AddServerVariable ("CERT_KEYSIZE", broker.GetServerVariable (reqId, "SSL_CIPHER_USEKEYSIZE")); + mwr.AddServerVariable ("CERT_SECRETKEYSIZE", broker.GetServerVariable (reqId, "SSL_CIPHER_ALGKEYSIZE")); + + string pem_cert = broker.GetServerVariable (reqId, "SSL_CLIENT_CERT"); + // 52 is the minimal PEM size for certificate header/footer + if ((pem_cert != null) && (pem_cert.Length > 52)) { + byte[] certBytes = FromPEM (pem_cert); + mwr.SetClientCertificate (certBytes); + + // check client certificate validity with Apache and/or Mono + if (mwr.IsClientCertificateValid (certBytes)) { + // client cert present (bit0 = 1) and valid (bit1 = 0) + mwr.AddServerVariable ("CERT_FLAGS", "1"); + } else { + // client cert present (bit0 = 1) but invalid (bit1 = 1) + mwr.AddServerVariable ("CERT_FLAGS", "3"); + } + } else { + mwr.AddServerVariable ("CERT_FLAGS", "0"); + } + + pem_cert = broker.GetServerVariable (reqId, "SSL_SERVER_CERT"); + // 52 is the minimal PEM size for certificate header/footer + if ((pem_cert != null) && (pem_cert.Length > 52)) { + byte[] certBytes = FromPEM (pem_cert); + X509Certificate cert = new X509Certificate (certBytes); + mwr.AddServerVariable ("CERT_SERVER_ISSUER", cert.GetIssuerName ()); + mwr.AddServerVariable ("CERT_SERVER_SUBJECT", cert.GetName ()); + } + } ProcessRequest (mwr); } @@ -225,7 +273,15 @@ { try { InnerRun (state); - } catch (Exception) { + } catch (FileNotFoundException fnf) { + // We print this one, as it might be a sign of a bad deployment + // once we require the .exe and Mono.WebServer in bin or the GAC. + Console.Error.WriteLine (fnf); + } catch (IOException) { + // This is ok (including EndOfStreamException) + } catch (Exception e) { + Console.Error.WriteLine (e); + } finally { try { // Closing is enough for mod_mono. the module will return a 50x Stream.Close (); 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/xsp-1.1.16.1/src/ModMonoWorkerRequest.cs new/xsp-1.1.17/src/ModMonoWorkerRequest.cs --- old/xsp-1.1.16.1/src/ModMonoWorkerRequest.cs 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/ModMonoWorkerRequest.cs 2006-08-25 21:55:56.000000000 +0200 @@ -34,10 +34,13 @@ using System.Web; using System.Collections; using System.Configuration; +using System.Globalization; using System.IO; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using Mono.Security.X509; +using Mono.Security.X509.Extensions; namespace Mono.WebServer { @@ -107,6 +110,12 @@ bool gotSecure; bool isSecure; + // client certificate validity support + string cert_hash; + bool cert_validity; + static bool cert_check_apache; + static bool cert_check_mono; + string [][] unknownHeaders; static string [] indexFiles = { "index.aspx", "Default.aspx", @@ -122,6 +131,24 @@ string indexes = ConfigurationSettings.AppSettings ["MonoServerDefaultIndexFiles"]; #endif SetDefaultIndexFiles (indexes); + + // by default the client certificate validity (CCV) checks are done by both Apache and Mono + // but this can be limited to either Apache or Mono using the MOD_MONO_CCV environment variable + string ccv = Environment.GetEnvironmentVariable ("MOD_MONO_CCV"); + if (ccv != null) + ccv = ccv.ToLower (CultureInfo.InvariantCulture); + switch (ccv) { + case "mono": + cert_check_mono = true; + break; + case "apache": + cert_check_apache = true; + break; + default: // both + cert_check_apache = true; + cert_check_mono = true; + break; + } } static void SetDefaultIndexFiles (string list) @@ -254,6 +281,96 @@ return isSecure; } + private bool IsClientCertificateValidForApache () + { + string val = requestBroker.GetServerVariable (requestId, "SSL_CLIENT_VERIFY"); + if ((val == null) || (val.Length == 0)) + return false; + return (val.Trim () == "SUCCESS"); + } + + private bool CheckClientCertificateExtensions (X509Certificate cert) + { + KeyUsages ku = KeyUsages.digitalSignature | KeyUsages.keyEncipherment | KeyUsages.keyAgreement; + KeyUsageExtension kux = null; + ExtendedKeyUsageExtension eku = null; + + X509Extension xtn = cert.Extensions["2.5.29.15"]; + if (xtn != null) + kux = new KeyUsageExtension (xtn); + + xtn = cert.Extensions["2.5.29.37"]; + if (xtn != null) + eku = new ExtendedKeyUsageExtension (xtn); + + if ((kux != null) && (eku != null)) { + // RFC3280 states that when both KeyUsageExtension and + // ExtendedKeyUsageExtension are present then BOTH should + // be valid + return (kux.Support (ku) && + eku.KeyPurpose.Contains ("1.3.6.1.5.5.7.3.2")); + } else if (kux != null) { + return kux.Support (ku); + } else if (eku != null) { + // Client Authentication (1.3.6.1.5.5.7.3.2) + return eku.KeyPurpose.Contains ("1.3.6.1.5.5.7.3.2"); + } + + // last chance - try with older (deprecated) Netscape extensions + xtn = cert.Extensions["2.16.840.1.113730.1.1"]; + if (xtn != null) { + NetscapeCertTypeExtension ct = new NetscapeCertTypeExtension (xtn); + return ct.Support (NetscapeCertTypeExtension.CertTypes.SslClient); + } + + // certificate isn't valid for SSL client usage + return false; + } + + private bool CheckChain (X509Certificate cert) + { + return new X509Chain ().Build (cert); + } + + private bool IsCertificateValidForMono (byte[] der) + { + X509Certificate cert = new X509Certificate (der); + // invalidate cache if the certificate validity period has ended + if (cert.ValidUntil > DateTime.UtcNow) + cert_hash = null; + + // heavyweight process, cache result + string hash = BitConverter.ToString (cert.Hash); + if (hash != cert_hash) { + try { + cert_validity = CheckClientCertificateExtensions (cert) && CheckChain (cert); + cert_hash = hash; + } + catch { + cert_validity = false; + } + } + return cert_validity; + } + + // apache: Client certificate is valid if Apache is satisfied (SSL_CLIENT_VERIFY). + // mono: Client certificate is valid if Mono is satisfied. + // both: (Default) Client certificate is valid if BOTH Apache and Mono agree it is. + public bool IsClientCertificateValid (byte[] der) + { + bool apache = true; + // both or apache-only + if (cert_check_apache) { + apache = IsClientCertificateValidForApache (); + } + bool mono = true; + // both or mono-only + if (cert_check_mono) { + mono = IsCertificateValidForMono (der); + } + return (apache && mono); + } + public override void CloseConnection () { if (!closed) { 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/xsp-1.1.16.1/src/Mono.WebServer/AssemblyInfo.cs.in new/xsp-1.1.17/src/Mono.WebServer/AssemblyInfo.cs.in --- old/xsp-1.1.16.1/src/Mono.WebServer/AssemblyInfo.cs.in 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/AssemblyInfo.cs.in 2006-08-25 21:55:56.000000000 +0200 @@ -33,4 +33,6 @@ [assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application .NET 1.1")] [assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")] [assembly: AssemblyCompany ("Novell, Inc.")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")] 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/xsp-1.1.16.1/src/Mono.WebServer/AssemblyInfo2.cs.in new/xsp-1.1.17/src/Mono.WebServer/AssemblyInfo2.cs.in --- old/xsp-1.1.16.1/src/Mono.WebServer/AssemblyInfo2.cs.in 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/AssemblyInfo2.cs.in 2006-08-25 21:55:56.000000000 +0200 @@ -33,4 +33,6 @@ [assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application .NET 2.0.")] [assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")] [assembly: AssemblyCompany ("Novell, Inc.")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")] 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/xsp-1.1.16.1/src/Mono.WebServer/Makefile.am new/xsp-1.1.17/src/Mono.WebServer/Makefile.am --- old/xsp-1.1.16.1/src/Mono.WebServer/Makefile.am 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/Makefile.am 2006-08-25 21:55:56.000000000 +0200 @@ -1,16 +1,18 @@ pkgconfigdir=$(libdir)/pkgconfig +builddir=$(top_builddir)/src/Mono.WebServer MCSFLAGS= -debug+ -debug:full -nologo -unsafe -nowarn:618 monowebserverdir = $(prefix)/lib/xsp/1.0 monowebserver2dir = $(prefix)/lib/xsp/2.0 pkgconfig_DATA = xsp.pc xsp-2.pc -monowebserver_SCRIPTS = Mono.WebServer.dll -monowebserver2_SCRIPTS = $(monowebserver2_install) +noinst_SCRIPTS= Mono.WebServer.dll $(monowebserver2_install) +GACUTIL1=$(GACUTIL) -package 1.0 if NET_2_0 monowebserver2_install = Mono.WebServer2.dll monowebserver2_references = -r:System.Web.dll -r:System.Configuration.dll -r:Mono.Security.dll +GACUTIL2=$(GACUTIL) -package 2.0 endif CLEANFILES = Mono.WebServer.dll* Mono.WebServer2.dll* @@ -30,13 +32,26 @@ MonoWorkerRequest.cs \ XSPApplicationHost.cs \ XSPWorkerRequest.cs - monowebserver_build_sources = $(addprefix $(srcdir)/, $(monowebserver_sources)) $(addprefix $(top_builddir)/src/Mono.WebServer/, AssemblyInfo.cs) monowebserver2_build_sources = $(addprefix $(srcdir)/, $(monowebserver_sources)) $(addprefix $(top_builddir)/src/Mono.WebServer/, AssemblyInfo2.cs) Mono.WebServer.dll: $(monowebserver_build_sources) $(MCS) $(MCSFLAGS) $(monowebserver_references) /target:library /out:$@ $(monowebserver_build_sources) + $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk Mono.WebServer2.dll: $(monowebserver2_build_sources) $(GMCS) -d:NET_2_0 $(MCSFLAGS) $(monowebserver2_references) /target:library /out:$@ $(monowebserver2_build_sources) + $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk + +install-data-local: + $(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/Mono.WebServer.dll + +#if NET_2_0 + $(GACUTIL2) $(GACUTIL_FLAGS) -i $(builddir)/Mono.WebServer2.dll +#endif + +uninstall-local: + -for i in Mono.WebServer Mono.WebServer2 ; do \ + $(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \ + done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsp-1.1.16.1/src/Mono.WebServer/MonoWorkerRequest.cs new/xsp-1.1.17/src/Mono.WebServer/MonoWorkerRequest.cs --- old/xsp-1.1.16.1/src/Mono.WebServer/MonoWorkerRequest.cs 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/MonoWorkerRequest.cs 2006-08-25 21:55:56.000000000 +0200 @@ -321,12 +321,56 @@ } } - + // as we must have the client certificate (if provided) then we're able to avoid + // pre-calculating some items (and cache them if we have to calculate) + private string cert_cookie; + private string cert_issuer; + private string cert_serial; + private string cert_subject; + public override string GetServerVariable (string name) { if (server_variables == null) return String.Empty; + if (IsSecure ()) { + X509Certificate client = ClientCertificate; + switch (name) { + case "CERT_COOKIE": + if (cert_cookie == null) { + if (client == null) + cert_cookie = String.Empty; + else + cert_cookie = client.GetCertHashString (); + } + return cert_cookie; + case "CERT_ISSUER": + if (cert_issuer == null) { + if (client == null) + cert_issuer = String.Empty; + else + cert_issuer = client.GetIssuerName (); + } + return cert_issuer; + case "CERT_SERIALNUMBER": + if (cert_serial == null) { + if (client == null) + cert_serial = String.Empty; + else + cert_serial = client.GetSerialNumberString (); + } + return cert_serial; + case "CERT_SUBJECT": + if (cert_subject == null) { + if (client == null) + cert_subject = String.Empty; + else + cert_subject = client.GetName (); + } + return cert_subject; + } + } + string s = server_variables [name]; return (s == null) ? String.Empty : s; } 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/xsp-1.1.16.1/src/Mono.WebServer/XSPApplicationHost.cs new/xsp-1.1.17/src/Mono.WebServer/XSPApplicationHost.cs --- old/xsp-1.1.16.1/src/Mono.WebServer/XSPApplicationHost.cs 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/XSPApplicationHost.cs 2006-08-25 21:55:56.000000000 +0200 @@ -414,12 +414,22 @@ ssl.SecretKeySize = s.KeyExchangeStrength; } - string redirect; - vapp.Redirect (rdata.Path, out redirect); - host.ProcessRequest (requestId, localEP.Address.Address, localEP.Port, - remoteEP.Address.Address, remoteEP.Port, rdata.Verb, - rdata.Path, rdata.QueryString, - rdata.Protocol, rdata.InputBuffer, redirect, sock.Handle, ssl); + try { + string redirect; + vapp.Redirect (rdata.Path, out redirect); + host.ProcessRequest (requestId, localEP.Address.Address, localEP.Port, + remoteEP.Address.Address, remoteEP.Port, rdata.Verb, + rdata.Path, rdata.QueryString, + rdata.Protocol, rdata.InputBuffer, redirect, sock.Handle, ssl); + } catch (FileNotFoundException fnf) { + // We print this one, as it might be a sign of a bad deployment + // once we require the .exe and Mono.WebServer in bin or the GAC. + Console.Error.WriteLine (fnf); + } catch (IOException) { + // This is ok (including EndOfStreamException) + } catch (Exception e) { + Console.Error.WriteLine (e); + } } public override int Read (byte[] buffer, int position, int size) 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/xsp-1.1.16.1/src/Mono.WebServer/XSPWorkerRequest.cs new/xsp-1.1.17/src/Mono.WebServer/XSPWorkerRequest.cs --- old/xsp-1.1.16.1/src/Mono.WebServer/XSPWorkerRequest.cs 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/XSPWorkerRequest.cs 2006-08-25 21:55:56.000000000 +0200 @@ -509,11 +509,7 @@ result = server_software; break; default: - if (IsSecure ()) { - result = GetSslVariable (name); - } else { - result = base.GetServerVariable (name); - } + result = base.GetServerVariable (name); break; } @@ -685,63 +681,6 @@ { return secure; } - - // as we must have the client certificate (if provided) then we're able to avoid - // pre-calculating some items (and cache them if we have to calculate) - private string cert_cookie; - private string cert_issuer; - private string cert_serial; - private string cert_subject; - - private string GetSslVariable (string name) - { - X509Certificate client = ClientCertificate; - string result = null; - - switch (name) { - case "CERT_COOKIE": - if (cert_cookie == null) { - if (client == null) - cert_cookie = String.Empty; - else - cert_cookie = client.GetCertHashString (); - } - result = cert_cookie; - break; - case "CERT_ISSUER": - if (cert_issuer == null) { - if (client == null) - cert_issuer = String.Empty; - else - cert_issuer = client.GetIssuerName (); - } - result = cert_issuer; - break; - case "CERT_SERIALNUMBER": - if (cert_serial == null) { - if (client == null) - cert_serial = String.Empty; - else - cert_serial = client.GetSerialNumberString (); - } - result = cert_serial; - break; - case "CERT_SUBJECT": - if (cert_subject == null) { - if (client == null) - cert_subject = String.Empty; - else - cert_subject = client.GetName (); - } - result = cert_subject; - break; - default: - result = base.GetServerVariable (name); - break; - } - - return result; - } public override void SendResponseFromFile (IntPtr handle, long offset, long length) { 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/xsp-1.1.16.1/src/Mono.WebServer/xsp-2.pc.in new/xsp-1.1.17/src/Mono.WebServer/xsp-2.pc.in --- old/xsp-1.1.16.1/src/Mono.WebServer/xsp-2.pc.in 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/xsp-2.pc.in 2006-08-25 21:55:56.000000000 +0200 @@ -1,5 +1,5 @@ prefix=@prefix@ -assemblies_dir=${prefix}/lib/xsp/2.0 +assemblies_dir=${prefix}/lib/mono/2.0 Libraries=${assemblies_dir}/Mono.WebServer2.dll Executable=${assemblies_dir}/xsp2.exe 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/xsp-1.1.16.1/src/Mono.WebServer/xsp.pc.in new/xsp-1.1.17/src/Mono.WebServer/xsp.pc.in --- old/xsp-1.1.16.1/src/Mono.WebServer/xsp.pc.in 2006-07-06 00:27:10.000000000 +0200 +++ new/xsp-1.1.17/src/Mono.WebServer/xsp.pc.in 2006-08-25 21:55:56.000000000 +0200 @@ -1,5 +1,5 @@ prefix=@prefix@ -assemblies_dir=${prefix}/lib/xsp/1.0 +assemblies_dir=${prefix}/lib/mono/1.0 Libraries=${assemblies_dir}/Mono.WebServer.dll Executable=${assemblies_dir}/xsp.exe Binary files old/xsp-1.1.16.1/src/mono.pub and new/xsp-1.1.17/src/mono.pub differ Binary files old/xsp-1.1.16.1/src/mono.snk and new/xsp-1.1.17/src/mono.snk differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-dns-server
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package yast2-dns-server checked in at Wed Aug 30 23:37:29 CEST 2006. -------- --- yast2-dns-server/yast2-dns-server.changes 2006-08-04 16:12:55.000000000 +0200 +++ yast2-dns-server/yast2-dns-server.changes 2006-08-30 15:33:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 15:32:35 CEST 2006 - locilka(a)suse.cz + +- DnsServerPunycode renamed to Punycode and moved to yast2-2.13.78. +- 2.13.17 + +------------------------------------------------------------------- Old: ---- yast2-dns-server-2.13.16.tar.bz2 New: ---- yast2-dns-server-2.13.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.IWxttb/_old 2006-08-30 23:37:24.000000000 +0200 +++ /var/tmp/diff_new_pack.IWxttb/_new 2006-08-30 23:37:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dns-server (Version 2.13.16) +# spec file for package yast2-dns-server (Version 2.13.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,17 @@ # norootforbuild Name: yast2-dns-server -Version: 2.13.16 +Version: 2.13.17 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dns-server-2.13.16.tar.bz2 +Source0: yast2-dns-server-2.13.17.tar.bz2 prefix: /usr BuildRequires: perl-Digest-SHA1 perl-X500-DN perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite Requires: yast2 /usr/bin/host perl-gettext yast2-perl-bindings bind-utils yast2-ldap perl-X500-DN perl-Digest-SHA1 perl-Parse-RecDescent yast2-ldap-client +# DnsServerPunycode renamed to Punycode and moved to yast2.rpm +Requires: yast2 >= 2.13.78 BuildArchitectures: noarch Summary: YaST2 - DNS Server Configuration @@ -31,9 +33,10 @@ Authors: -------- Jiri Srain <jsrain(a)suse.cz> + Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-dns-server-2.13.16 +%setup -n yast2-dns-server-2.13.17 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +79,9 @@ %doc %{prefix}/share/doc/packages/yast2-dns-server %changelog -n yast2-dns-server +* Wed Aug 30 2006 - locilka(a)suse.cz +- DnsServerPunycode renamed to Punycode and moved to yast2-2.13.78. +- 2.13.17 * Fri Aug 04 2006 - locilka(a)suse.cz - Added new function IsServiceConfigurableExternally() to the DnsServerAPI module to be used from external modules like ++++++ yast2-dns-server-2.13.16.tar.bz2 -> yast2-dns-server-2.13.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/VERSION new/yast2-dns-server-2.13.17/VERSION --- old/yast2-dns-server-2.13.16/VERSION 2006-08-04 16:13:01.000000000 +0200 +++ new/yast2-dns-server-2.13.17/VERSION 2006-08-30 15:32:14.000000000 +0200 @@ -1 +1 @@ -2.13.16 +2.13.17 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/configure new/yast2-dns-server-2.13.17/configure --- old/yast2-dns-server-2.13.16/configure 2006-08-04 16:19:32.000000000 +0200 +++ new/yast2-dns-server-2.13.17/configure 2006-08-30 15:42:27.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-dns-server 2.13.16. +# Generated by GNU Autoconf 2.59 for yast2-dns-server 2.13.17. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-dns-server' PACKAGE_TARNAME='yast2-dns-server' -PACKAGE_VERSION='2.13.16' -PACKAGE_STRING='yast2-dns-server 2.13.16' +PACKAGE_VERSION='2.13.17' +PACKAGE_STRING='yast2-dns-server 2.13.17' 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-dns-server 2.13.16 to adapt to many kinds of systems. +\`configure' configures yast2-dns-server 2.13.17 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-dns-server 2.13.16:";; + short | recursive ) echo "Configuration of yast2-dns-server 2.13.17:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-dns-server configure 2.13.16 +yast2-dns-server configure 2.13.17 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-dns-server $as_me 2.13.16, which was +It was created by yast2-dns-server $as_me 2.13.17, 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-dns-server' - VERSION='2.13.16' + VERSION='2.13.17' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.16" +VERSION="2.13.17" RPMNAME="yast2-dns-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-dns-server $as_me 2.13.16, which was +This file was extended by yast2-dns-server $as_me 2.13.17, 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-dns-server config.status 2.13.16 +yast2-dns-server config.status 2.13.17 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-dns-server-2.13.16/configure.in new/yast2-dns-server-2.13.17/configure.in --- old/yast2-dns-server-2.13.16/configure.in 2006-08-04 16:19:29.000000000 +0200 +++ new/yast2-dns-server-2.13.17/configure.in 2006-08-30 15:42:22.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dns-server, 2.13.16, http://bugs.opensuse.org/, yast2-dns-server) +AC_INIT(yast2-dns-server, 2.13.17, http://bugs.opensuse.org/, yast2-dns-server) 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.16" +VERSION="2.13.17" RPMNAME="yast2-dns-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/DnsServerPunycode.ycp new/yast2-dns-server-2.13.17/src/DnsServerPunycode.ycp --- old/yast2-dns-server-2.13.16/src/DnsServerPunycode.ycp 2006-07-27 16:36:32.000000000 +0200 +++ new/yast2-dns-server-2.13.17/src/DnsServerPunycode.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,376 +0,0 @@ -/** - * File: modules/DnsServerPunycode.ycp - * Package: Configuration of dns-server - * Summary: DNS Punycode Handling - * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> - * Tags: Unstable - * - * $Id:$ - * - * Representation of the configuration of dns-server. - * Input and output routines. - */ - -{ - - module "DnsServerPunycode"; - textdomain "dns-server"; - - string tmp_dir = nil; - - // string, matching this regexp, is not cached - string not_cached_regexp = "^[0123456789\.]*$"; - - // - // Encoded string in cache has the same index - // as its Decoded format in the second list. - // - - // list of encoded strings to be cached (Punycode or Unicode) - list <string> cache_encoded = []; - // list of decoded strings to be cached (Unicode or Punycode) - list <string> cache_decoded = []; - - integer current_cache_index = 0; - - // cached amount of data should be controled - integer current_cache_size = 0; - integer maximum_cache_size = 32768; - - /** - * Returns the maximum cache size (sum of already converted - * strings). - * - * @return integer maximum_cache_size - * @see SetMaximumCacheSize() - */ - global define integer GetMaximumCacheSize () { - return maximum_cache_size; - } - - /** - * Offers to set the maximum cache size (sum of already - * converted strings). - * - * @param integer new_max_size - * @see GetMaximumCacheSize() - */ - global define void SetMaximumCacheSize (integer new_max_size) { - if (new_max_size != nil) { - maximum_cache_size = new_max_size; - } else { - y2error("Cannot set MaximumCacheSize to nil!"); - } - } - - /** - * Adds new cache records for encoded and decoded strings. - * - * @params string decoded - * @params string encoded - */ - define void CreateNewCacheRecord (string decoded, string encoded) { - // Erroneous cache record - if (decoded == nil || encoded == nil) return; - - // Already cached - if (contains(cache_decoded, decoded)) return; - - integer decoded_size = size(decoded); - integer encoded_size = size(encoded); - - // Do not store this record if the cache would exceed maximum - if ((current_cache_size + decoded_size + encoded_size) > maximum_cache_size) return; - - current_cache_size = current_cache_size + decoded_size + encoded_size; - cache_decoded[current_cache_index] = decoded; - cache_encoded[current_cache_index] = encoded; - current_cache_index = current_cache_index + 1; - } - - /** - * Returns string encoded in Punycode if it has been - * already cached. Returns nil if not found. - * - * @param string decoded_string (Unicode) - * @return string encoded_string (Punycode) - */ - define string GetEncodedCachedString (string decoded_string) { - string ret = nil; - - // numbers and empty strings are not converted - if (regexpmatch(decoded_string, not_cached_regexp)) { - return decoded_string; - } - - integer counter = -1; - // searching through decoded strings to find the index - foreach (string cached_string, cache_decoded, { - counter = counter + 1; - if (cached_string == decoded_string) { - // returning encoded representation - ret = cache_encoded[counter]:nil; - break; - } - }); - - return ret; - } - - /** - * Returns string encoded in Punycode if it has been - * already cached. Returns nil if not found. - * - * @param string encoded_string (Punycode) - * @return string decoded_string (Unicode) - */ - define string GetDecodedCachedString (string encoded_string) { - string ret = nil; - - // numbers and empty strings are not converted - if (regexpmatch(encoded_string, not_cached_regexp)) { - return encoded_string; - } - - integer counter = -1; - // searching through encoded strings to find the index - foreach (string cached_string, cache_encoded, { - counter = counter + 1; - if (cached_string == encoded_string) { - // returning decoded representation - ret = cache_decoded[counter]:nil; - break; - } - }); - - return ret; - } - - /** - * Returns the current temporary directory. - * Lazy loading for the initialization is used. - */ - define string GetTmpDirectory () { - if (tmp_dir == nil) { - tmp_dir = (string) SCR::Read(.target.tmpdir); - } - - return tmp_dir; - } - - /** - * Function takes the list of strings and returns them in the converted - * format. Unicode to Punycode or Punycode to Unicode (param to_punycode). - * It uses a cache of already-converted strings. - */ - define list <string> ConvertBackAndForth (list <string> strings_in, boolean to_punycode) { - // list of returned strings - list <string> strings_out = []; - - // Some (or maybe all) strings needn't be cached - list <string> not_cached = []; - - // Check the cache for already entered strings - integer current_index = -1; - map <string, string> test_cached = listmap (string string_in, strings_in, { - string string_out = nil; - - // Numbers, IPs and empty strings are not converted - if (regexpmatch(string_in, not_cached_regexp)) { - string_out = string_in; - } else { - if (to_punycode) { - string_out = GetEncodedCachedString(string_in); - } else { - string_out = GetDecodedCachedString(string_in); - } - } - - if (string_out == nil) { - current_index = current_index + 1; - not_cached[current_index] = string_in; - } - - return $[string_in : string_out]; - }); - - list <string> converted_not_cached = []; - - // There is something not cached, converting them at once - if (not_cached != []) { - string tmp_in = GetTmpDirectory() + "/tmp-idnconv-in.ycp"; - string tmp_out = GetTmpDirectory() + "/tmp-idnconv-out.ycp"; - - SCR::Write(.target.ycp, tmp_in, not_cached); - string convert_command = sformat( - "/usr/bin/idnconv %1 %2 > %3", - (to_punycode ? "":"-reverse"), tmp_in, tmp_out - ); - - if ((integer) SCR::Execute(.target.bash, convert_command) != 0) { - y2error("Conversion failed!"); - } else { - converted_not_cached = (list <string>) SCR::Read(.target.ycp, tmp_out); - // Parsing the YCP file failed - if (converted_not_cached == nil) { - y2error("Erroneous YCP file: %1", SCR::Read(.target.string, tmp_out)); - } - } - } - - // Listing through the given list and adjusting the return list - current_index = -1; - integer found_index = -1; - foreach (string string_in, strings_in, { - current_index = current_index + 1; - - // Already cached string - if (test_cached[string_in]:nil != nil) { - strings_out[current_index] = test_cached[string_in]:""; - - // Recently converted strings - } else { - found_index = found_index + 1; - strings_out[current_index] = converted_not_cached[found_index]:""; - - // Adding converted strings to cache - if (to_punycode) { - CreateNewCacheRecord(string_in, converted_not_cached[found_index]:""); - } else { - CreateNewCacheRecord(converted_not_cached[found_index]:"", string_in); - } - } - }); - - return strings_out; - } - - /** - * Converts list of UTF-8 strings into their Punycode - * ASCII repserentation. - * - * @param list <string> punycode_strings - * @return list <string> encoded_strings - */ - global define list <string> EncodePunycodes (list <string> punycode_strings) { - return ConvertBackAndForth(punycode_strings, true); - } - - /** - * Converts list of Punycode strings into their UTF-8 - * representation. - * - * @param list <string> punycode_strings - * @return list <string> decoded_strings - */ - global define list <string> DecodePunycodes (list <string> punycode_strings) { - return ConvertBackAndForth(punycode_strings, false); - } - - /** - * Encodes the domain name (relative or FQDN) to the Punycode. - * - * @param string decoded domain_name - * @return string encoded domain_name - * - * @example - * EncodeDomainName("žížala.jůlinka.go.home") - * -> "xn--ala-qma83eb.xn--jlinka-3mb.go.home" - */ - global define string EncodeDomainName (string decoded_domain_name) { - return mergestring( - EncodePunycodes( - splitstring(decoded_domain_name, ".") - ), - "." - ); - } - - /** - * Decodes the domain name (relative or FQDN) from the Punycode. - * - * @param string encoded_domain_name - * @return string decoded domain_name - * - * @example - * DecodeDomainName("xn--ala-qma83eb.xn--jlinka-3mb.go.home") - * -> "žížala.jůlinka.go.home" - */ - global define string DecodeDomainName (string encoded_domain_name) { - return mergestring( - DecodePunycodes( - splitstring(encoded_domain_name, ".") - ), - "." - ); - } - - /** - * Decodes the list of domain names to their Unicode representation. - * This function is similar to DecodePunycodes but it works with every - * string as a domain name (that means every domain name is parsed - * by dots and separately evaluated). - * - * @param list <string> encoded_domain_names - * @return list <string> decoded_domain_names - * - * @example - * DocodeDomainNames(["mx1.example.org", "xp3.example.org.", "xn--ala-qma83eb.org.example."]) - * -> ["mx1.example.org", "xp3.example.org.", "žížala.org.example."] - */ - global define list <string> DocodeDomainNames (list <string> encoded_domain_names) { - list <string> decoded_domain_names = []; - list <string> strings_to_decode = []; - - // $[0 : [0, 2], 1 : [3, 5]] - map <integer, list <integer> > backward_map_of_conversion = $[]; - - integer current_domain_index = -1; - integer current_domain_item = 0; - - // parsing all domain names one by one - foreach (string one_domain_name, encoded_domain_names, { - current_domain_index = current_domain_index + 1; - integer start = current_domain_item; - - // parsing the domain name by dots - foreach (string domain_item, splitstring(one_domain_name, "."), { - strings_to_decode[current_domain_item] = domain_item; - current_domain_item = current_domain_item + 1; - }); - // creating backward index - backward_map_of_conversion[current_domain_index] = [start, (current_domain_item-1)]; - }); - - // Transformating strings to the decoded format - strings_to_decode = DnsServerPunycode::DecodePunycodes(strings_to_decode); - - current_domain_index = -1; - foreach (string one_encoded, encoded_domain_names, { - current_domain_index = current_domain_index + 1; - - // Where the current string starts and ends - integer current = backward_map_of_conversion[current_domain_index, 0]:nil; - integer end = backward_map_of_conversion[current_domain_index, 1]:nil; - - // error? - if (current == nil || end == nil) { - y2error("Cannot find start/end for %1 in %2", - one_encoded, backward_map_of_conversion[current_domain_index]:nil - ); - decoded_domain_names[current_domain_index] = one_encoded; - } else { - // create a list of items of the current domain (translated) - list <string> decoded_domain = []; - while (current <= end) { - decoded_domain = add(decoded_domain, strings_to_decode[current]:""); - current = current + 1; - } - // create a domain name from these strings - decoded_domain_names[current_domain_index] = mergestring(decoded_domain, "."); - } - }); - - return decoded_domain_names; - } -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/Makefile.am new/yast2-dns-server-2.13.17/src/Makefile.am --- old/yast2-dns-server-2.13.16/src/Makefile.am 2006-07-26 15:57:15.000000000 +0200 +++ new/yast2-dns-server-2.13.17/src/Makefile.am 2006-08-30 15:18:26.000000000 +0200 @@ -33,8 +33,7 @@ DnsTsigKeys.pm \ DnsServerUI.ycp \ DnsFakeTabs.ycp \ - DnsServerAPI.pm \ - DnsServerPunycode.ycp + DnsServerAPI.pm YaPI_perldir = @moduledir@/YaPI diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/Makefile.in new/yast2-dns-server-2.13.17/src/Makefile.in --- old/yast2-dns-server-2.13.16/src/Makefile.in 2006-08-04 16:19:33.000000000 +0200 +++ new/yast2-dns-server-2.13.17/src/Makefile.in 2006-08-30 15:42:28.000000000 +0200 @@ -205,8 +205,7 @@ DnsTsigKeys.pm \ DnsServerUI.ycp \ DnsFakeTabs.ycp \ - DnsServerAPI.pm \ - DnsServerPunycode.ycp + DnsServerAPI.pm YaPI_perldir = @moduledir@/YaPI YaPI_perl_DATA = \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/dialog-main.ycp new/yast2-dns-server-2.13.17/src/dialog-main.ycp --- old/yast2-dns-server-2.13.16/src/dialog-main.ycp 2006-07-28 12:24:05.000000000 +0200 +++ new/yast2-dns-server-2.13.17/src/dialog-main.ycp 2006-08-30 15:33:26.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dialog-main.ycp 32043 2006-07-28 10:25:33Z locilka $ + * $Id: dialog-main.ycp 32634 2006-08-30 13:35:02Z locilka $ */ { @@ -34,7 +34,7 @@ import "Hostname"; import "Confirm"; import "DnsServerAPI"; -import "DnsServerPunycode"; +import "Punycode"; /* String defines the initial screen for the expert dialog */ string initial_screen = "start_up"; @@ -1389,7 +1389,7 @@ list <string> encoded_zone_names = maplist (map z, zones, { return z["zone"]:""; }); - list <string> decoded_zone_names = DnsServerPunycode::DocodeDomainNames(encoded_zone_names); + list <string> decoded_zone_names = Punycode::DocodeDomainNames(encoded_zone_names); integer index = -1; // Creating map $[encoded:decoded] map <string, string> enc_to_dec = listmap (string enc_zone, encoded_zone_names, { @@ -1485,7 +1485,7 @@ string zone_type = (string) UI::QueryWidget (`id ("new_zone_type"), `Value); - string encoded_zone_name = DnsServerPunycode::EncodeDomainName(zone_name); + string encoded_zone_name = Punycode::EncodeDomainName(zone_name); // zone validation if ( Hostname::CheckDomain (encoded_zone_name) != true ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/dialog-masterzone.ycp new/yast2-dns-server-2.13.17/src/dialog-masterzone.ycp --- old/yast2-dns-server-2.13.16/src/dialog-masterzone.ycp 2006-08-03 11:06:29.000000000 +0200 +++ new/yast2-dns-server-2.13.17/src/dialog-masterzone.ycp 2006-08-30 15:33:26.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jiri.srain(a)suse.cz>, * Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dialog-masterzone.ycp 32043 2006-07-28 10:25:33Z locilka $ + * $Id: dialog-masterzone.ycp 32634 2006-08-30 13:35:02Z locilka $ */ { @@ -333,7 +333,7 @@ `id ("name_server_list"), // selection box label _("Na&me Server List"), - DnsServerPunycode::DocodeDomainNames(current_zone_ns) + Punycode::DocodeDomainNames(current_zone_ns) ) ); } @@ -396,7 +396,7 @@ // NS is converted to the Punycode first string new_ns_entered = (string) UI::QueryWidget (`id ("add_name_server"), `Value); - string new_ns = DnsServerPunycode::EncodeDomainName(new_ns_entered); + string new_ns = Punycode::EncodeDomainName(new_ns_entered); y2milestone("New NS: %1", new_ns); string check_ns = new_ns; @@ -510,7 +510,7 @@ } void RedrawMxListWidget () { - list <string> zone_mx_decoded = DnsServerPunycode::DocodeDomainNames(current_zone_mx); + list <string> zone_mx_decoded = Punycode::DocodeDomainNames(current_zone_mx); integer index = -1; // create term items using already translated strings @@ -585,7 +585,7 @@ { string new_mx_decoded = (string) UI::QueryWidget (`id ("add_mail_server"), `Value); - string new_mx = DnsServerPunycode::EncodeDomainName(new_mx_decoded); + string new_mx = Punycode::EncodeDomainName(new_mx_decoded); integer prio = (integer)UI::QueryWidget (`id ("add_priority"), `Value); // maximal priority is 65535 @@ -950,7 +950,7 @@ void RedrawZonesTable () { integer index = -1; string zone_name = current_zone["zone"]:""; - string decoded_zone_name = DnsServerPunycode::DecodeDomainName(zone_name); + string decoded_zone_name = Punycode::DecodeDomainName(zone_name); list<integer> ret = maplist (map m, current_zone["records"]:[], { index = index + 1; @@ -983,7 +983,7 @@ }), { decoded_names = add (decoded_names, record); }); - decoded_names = DnsServerPunycode::DecodePunycodes(decoded_names); + decoded_names = Punycode::DecodePunycodes(decoded_names); integer counter = -1; list items = maplist (integer r, ret, { @@ -1009,14 +1009,14 @@ UI::QueryWidget (`id ("records_list"), `CurrentItem ); UI::ChangeWidget (`id ("add_record_name"), `Value, ToRelativeName( - DnsServerPunycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone_name + Punycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone_name ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_zone["records", r, "type"]:""); UI::ChangeWidget (`id ("add_record_val"), `Value, ToRelativeName( - DnsServerPunycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone_name + Punycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone_name ) ); } @@ -1192,28 +1192,28 @@ UI::QueryWidget (`id ("add_record_type"), `Value); // translating new record key and val - string key = DnsServerPunycode::EncodeDomainName( + string key = Punycode::EncodeDomainName( (string) UI::QueryWidget (`id ("add_record_name"), `Value) ); - string val = DnsServerPunycode::EncodeDomainName( + string val = Punycode::EncodeDomainName( (string) UI::QueryWidget (`id ("add_record_val"), `Value) ); string zone = current_zone["zone"]:""; - string decoded_zone = DnsServerPunycode::DecodeDomainName(zone); + string decoded_zone = Punycode::DecodeDomainName(zone); if (ret == "records_list") { UI::ChangeWidget (`id ("add_record_name"), `Value, ToRelativeName( - DnsServerPunycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone + Punycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_zone["records", r, "type"]:""); UI::ChangeWidget (`id ("add_record_val"), `Value, ToRelativeName( - DnsServerPunycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone + Punycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone ) ); } @@ -1498,7 +1498,7 @@ // Label - connected with Textentry which shows current edited zone `HSquash ( `Label ( _("Settings for Zone") ) ), `HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "", - DnsServerPunycode::DecodeDomainName(zone_name) + Punycode::DecodeDomainName(zone_name) ) ), `HStretch () ), @@ -1627,7 +1627,7 @@ // Label - connected with Textentry which shows current edited zone `HSquash ( `Label ( _("Settings for Zone") ) ), `HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "", - DnsServerPunycode::DecodeDomainName(zone_name) + Punycode::DecodeDomainName(zone_name) ) ), `HStretch () ), @@ -1799,7 +1799,7 @@ // Label - connected with Textentry which shows current edited zone `HSquash ( `Label ( _("Settings for Zone") ) ), `HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "", - DnsServerPunycode::DecodeDomainName(zone_name) + Punycode::DecodeDomainName(zone_name) ) ), `HStretch () ), @@ -1873,7 +1873,7 @@ y2milestone("Zone %1 (%2), Forwarders: %3", current_zone["zone"]:"", - DnsServerPunycode::DecodeDomainName(current_zone["zone"]:""), + Punycode::DecodeDomainName(current_zone["zone"]:""), current_zone_forwarders ); current_zone["modified"] = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/dialogs.ycp new/yast2-dns-server-2.13.17/src/dialogs.ycp --- old/yast2-dns-server-2.13.16/src/dialogs.ycp 2006-07-26 17:04:21.000000000 +0200 +++ new/yast2-dns-server-2.13.17/src/dialogs.ycp 2006-08-30 15:33:26.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs.ycp 32011 2006-07-26 15:05:52Z locilka $ + * $Id: dialogs.ycp 32634 2006-08-30 13:35:02Z locilka $ */ { @@ -19,7 +19,7 @@ import "Wizard"; import "Message"; import "SuSEFirewall"; - import "DnsServerPunycode"; + import "Punycode"; /** * Ask user if exit without saving @@ -316,7 +316,7 @@ define symbol runZoneTypeSwitch () ``{ string type = current_zone["type"]:"master"; string name = current_zone["zone"]:"unknown"; - y2milestone ("Editing zone %1 (%2), type %3", name, DnsServerPunycode::DecodeDomainName(name), type); + y2milestone ("Editing zone %1 (%2), type %3", name, Punycode::DecodeDomainName(name), type); if (type == "master") return `master; else if (type == "slave") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-dhcp-server
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package yast2-dhcp-server checked in at Wed Aug 30 23:37:16 CEST 2006. -------- --- yast2-dhcp-server/yast2-dhcp-server.changes 2006-08-18 14:58:43.000000000 +0200 +++ yast2-dhcp-server/yast2-dhcp-server.changes 2006-08-30 15:51:01.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Aug 30 15:50:04 CEST 2006 - locilka(a)suse.cz + +- DnsServerPunycode has been renamed to Punycode + and moved to yast2-2.13.78 +- 2.13.8 + +------------------------------------------------------------------- +Mon Aug 21 09:50:50 CEST 2006 - locilka(a)suse.cz + +- Corrected HTML in helps. +- Added missing keyboard shortcuts. + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-2.13.7.tar.bz2 New: ---- yast2-dhcp-server-2.13.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.UU10Ke/_old 2006-08-30 23:36:58.000000000 +0200 +++ /var/tmp/diff_new_pack.UU10Ke/_new 2006-08-30 23:36:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dhcp-server (Version 2.13.7) +# spec file for package yast2-dhcp-server (Version 2.13.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,17 +11,18 @@ # norootforbuild Name: yast2-dhcp-server -Version: 2.13.7 +Version: 2.13.8 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dhcp-server-2.13.7.tar.bz2 +Source0: yast2-dhcp-server-2.13.8.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent -# Address::CheckMAC && Address::ValidMAC -Requires: yast2 >= 2.13.73 +# Address::CheckMAC && Address::ValidMAC (2.13.73) +# Punycode +Requires: yast2 >= 2.13.78 # DnsServerAPI::IsServiceConfigurableExternally Requires: yast2-dns-server >= 2.13.16 BuildArchitectures: noarch @@ -36,9 +37,10 @@ Authors: -------- Jiri Srain <jsrain(a)suse.cz> + Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-dhcp-server-2.13.7 +%setup -n yast2-dhcp-server-2.13.8 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +77,13 @@ %doc %{prefix}/share/doc/packages/yast2-dhcp-server %changelog -n yast2-dhcp-server +* Wed Aug 30 2006 - locilka(a)suse.cz +- DnsServerPunycode has been renamed to Punycode + and moved to yast2-2.13.78 +- 2.13.8 +* Mon Aug 21 2006 - locilka(a)suse.cz +- Corrected HTML in helps. +- Added missing keyboard shortcuts. * Fri Aug 18 2006 - locilka(a)suse.cz - Added help texts for Zone Editor Dialog. - Added reverse-zone synchronization into Zone Editor Dialog. ++++++ yast2-dhcp-server-2.13.7.tar.bz2 -> yast2-dhcp-server-2.13.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/VERSION new/yast2-dhcp-server-2.13.8/VERSION --- old/yast2-dhcp-server-2.13.7/VERSION 2006-08-18 14:47:30.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/VERSION 2006-08-30 15:49:58.000000000 +0200 @@ -1 +1 @@ -2.13.7 +2.13.8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/configure new/yast2-dhcp-server-2.13.8/configure --- old/yast2-dhcp-server-2.13.7/configure 2006-08-18 14:55:30.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/configure 2006-08-30 15:51:34.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-dhcp-server 2.13.7. +# Generated by GNU Autoconf 2.59 for yast2-dhcp-server 2.13.8. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-dhcp-server' PACKAGE_TARNAME='yast2-dhcp-server' -PACKAGE_VERSION='2.13.7' -PACKAGE_STRING='yast2-dhcp-server 2.13.7' +PACKAGE_VERSION='2.13.8' +PACKAGE_STRING='yast2-dhcp-server 2.13.8' 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-dhcp-server 2.13.7 to adapt to many kinds of systems. +\`configure' configures yast2-dhcp-server 2.13.8 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-dhcp-server 2.13.7:";; + short | recursive ) echo "Configuration of yast2-dhcp-server 2.13.8:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-dhcp-server configure 2.13.7 +yast2-dhcp-server configure 2.13.8 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-dhcp-server $as_me 2.13.7, which was +It was created by yast2-dhcp-server $as_me 2.13.8, 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-dhcp-server' - VERSION='2.13.7' + VERSION='2.13.8' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.7" +VERSION="2.13.8" RPMNAME="yast2-dhcp-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-dhcp-server $as_me 2.13.7, which was +This file was extended by yast2-dhcp-server $as_me 2.13.8, 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-dhcp-server config.status 2.13.7 +yast2-dhcp-server config.status 2.13.8 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-dhcp-server-2.13.7/configure.in new/yast2-dhcp-server-2.13.8/configure.in --- old/yast2-dhcp-server-2.13.7/configure.in 2006-08-18 14:55:26.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/configure.in 2006-08-30 15:51:30.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dhcp-server, 2.13.7, http://bugs.opensuse.org/, yast2-dhcp-server) +AC_INIT(yast2-dhcp-server, 2.13.8, http://bugs.opensuse.org/, yast2-dhcp-server) 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.7" +VERSION="2.13.8" RPMNAME="yast2-dhcp-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/src/dialogs2.ycp new/yast2-dhcp-server-2.13.8/src/dialogs2.ycp --- old/yast2-dhcp-server-2.13.7/src/dialogs2.ycp 2006-08-18 13:58:31.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/src/dialogs2.ycp 2006-08-21 09:51:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Vladimír Bobek <vbobek(a)suse.cz> * - * $Id: dialogs2.ycp 32442 2006-08-18 12:00:06Z locilka $ + * $Id: dialogs2.ycp 32456 2006-08-21 07:52:45Z locilka $ */ { @@ -302,7 +302,7 @@ if (expert_ui) ldap = `VBox( // configuration will be saved in ldap? - `Left(`CheckBox(`id("ldap"), `opt( `notify), _("LDAP Support"), true)), + `Left(`CheckBox(`id("ldap"), `opt( `notify), _("&LDAP Support"), true)), `VSpacing(2) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/src/dns-helps.ycp new/yast2-dhcp-server-2.13.8/src/dns-helps.ycp --- old/yast2-dhcp-server-2.13.7/src/dns-helps.ycp 2006-08-18 14:16:11.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/src/dns-helps.ycp 2006-08-21 09:46:52.000000000 +0200 @@ -59,14 +59,14 @@ the zone name servers.") + // TRANSLATORS: DNS Wizard - step 2 (part 3) - _("To add a New Name Server, click Add..., fill-up the form + _("To add a New Name Server, click Add..., fill-up the form and then click OK. If the new name server name is included in the current DNS zone, enter also its IP address. It is mandatory because it will be used -during the zone creation.") + +during the zone creation.") + // TRANSLATORS: DNS Wizard - step 2 (part 4) - _("To edit or delete an entry, select it and click -the appropriate Edit or Delete button."), + _("To edit or delete an entry, select it and click +the appropriate Edit or Delete button."), // TRANSLATORS: DNS Wizard - step 3 (part 1) "wizard-ranges" : _("<big>DNS Records</big> @@ -89,8 +89,8 @@ new_range_help + // TRANSLATORS: DNS Wizard - step 3 (part 5) - _("To edit or delete an entry, select it and click -the appropriate Edit or Delete button."), + _("To edit or delete an entry, select it and click +the appropriate Edit or Delete button."), // TRANSLATORS: DNS Wizard - summary (part 1) "wizard-summary" : _("Here you can see summarized everything diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/src/dns-server-dialogs.ycp new/yast2-dhcp-server-2.13.8/src/dns-server-dialogs.ycp --- old/yast2-dhcp-server-2.13.7/src/dns-server-dialogs.ycp 2006-08-18 14:46:20.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/src/dns-server-dialogs.ycp 2006-08-30 15:49:05.000000000 +0200 @@ -14,7 +14,7 @@ import "IP"; import "Label"; import "Report"; - import "DnsServerPunycode"; + import "Punycode"; import "Hostname"; import "DnsServerAPI"; @@ -322,7 +322,7 @@ hostname_base_check = hostname_base_check + "0"; } - hostname_base_check = DnsServerPunycode::EncodeDomainName(hostname_base_check); + hostname_base_check = Punycode::EncodeDomainName(hostname_base_check); } y2milestone("Checking hostname base: %1", hostname_base_check); @@ -518,7 +518,7 @@ // Writing records into the DNS Server if (hostname_counter > 0) { - hostnames = DnsServerPunycode::EncodePunycodes (hostnames); + hostnames = Punycode::EncodePunycodes (hostnames); index_counter = -1; foreach (string one_hostname, hostnames, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/src/dns-server-management.ycp new/yast2-dhcp-server-2.13.8/src/dns-server-management.ycp --- old/yast2-dhcp-server-2.13.7/src/dns-server-management.ycp 2006-08-18 14:18:00.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/src/dns-server-management.ycp 2006-08-30 15:49:12.000000000 +0200 @@ -18,7 +18,7 @@ import "Report"; import "Popup"; import "Label"; - import "DnsServerPunycode"; + import "Punycode"; import "Confirm"; import "IP"; import "Hostname"; @@ -175,7 +175,7 @@ } }); - punycode_translations = DnsServerPunycode::DocodeDomainNames(punycode_translations); + punycode_translations = Punycode::DocodeDomainNames(punycode_translations); counter = -1; list <term> items = maplist (map <string, string> one_record, zone_records, { @@ -222,7 +222,7 @@ if (ret == `ok) { string new_hostname = (string) UI::QueryWidget (`id("new_hostname"), `Value); - new_hostname = DnsServerPunycode::EncodeDomainName(new_hostname); + new_hostname = Punycode::EncodeDomainName(new_hostname); if (! Hostname::Check(new_hostname)) { UI::SetFocus(`id("new_hostname")); // TRANSLATORS: popup error, followed by a newline and a valid hostname description diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/src/dns-server-wizard.ycp new/yast2-dhcp-server-2.13.8/src/dns-server-wizard.ycp --- old/yast2-dhcp-server-2.13.7/src/dns-server-wizard.ycp 2006-08-18 14:43:41.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/src/dns-server-wizard.ycp 2006-08-30 15:49:18.000000000 +0200 @@ -15,7 +15,7 @@ import "Label"; import "DnsServer"; import "DnsServerAPI"; - import "DnsServerPunycode"; + import "Punycode"; import "IP"; import "Hostname"; import "Sequencer"; @@ -122,7 +122,7 @@ frame_label, `VBox ( // TRANSLATORS: text entry - `TextEntry (`id("nameserver"), _("Hostname"), selected_ns), + `TextEntry (`id("nameserver"), _("&Hostname"), selected_ns), // TRANSLATORS: text entry `TextEntry (`id("ip"), _("Server &IP"), selected_ip) ) @@ -150,7 +150,7 @@ string new_selected_ip = (string) UI::QueryWidget (`id("ip"), `Value); if (new_selected_ns != "") { - new_selected_ns = DnsServerPunycode::EncodeDomainName(new_selected_ns); + new_selected_ns = Punycode::EncodeDomainName(new_selected_ns); } // Hostname with a dot at the end is not a valid hostname @@ -619,7 +619,7 @@ }); if (counter > -1) { - strings_to_translate = DnsServerPunycode::DocodeDomainNames(strings_to_translate); + strings_to_translate = Punycode::DocodeDomainNames(strings_to_translate); counter = -1; list <term> table_items = maplist ( @@ -663,7 +663,7 @@ return tostring(one_range["base"]:""); }); if (counter > -1) { - basenames = DnsServerPunycode::DecodePunycodes(basenames); + basenames = Punycode::DecodePunycodes(basenames); } counter = -1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.7/src/helps.ycp new/yast2-dhcp-server-2.13.8/src/helps.ycp --- old/yast2-dhcp-server-2.13.7/src/helps.ycp 2006-07-19 09:10:01.000000000 +0200 +++ new/yast2-dhcp-server-2.13.8/src/helps.ycp 2006-08-21 09:51:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: helps.ycp 31946 2006-07-19 07:11:33Z locilka $ + * $Id: helps.ycp 32456 2006-08-21 07:52:45Z locilka $ */ { @@ -151,7 +151,7 @@ // Wizard Installation - Step 2 4/9 _("Primary Name Server IP and Secondary Name Server IP offer these name servers to the DHCP clients. -These values must be IP addresses.") + +These values must be IP addresses.") + // Wizard Installation - Step 2 5/9 _("Default Gateway inserts this ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-fonts
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package xorg-x11-fonts checked in at Wed Aug 30 23:36:46 CEST 2006. -------- --- xorg-x11-fonts/xorg-x11-fonts.changes 2006-08-29 17:55:17.000000000 +0200 +++ xorg-x11-fonts/xorg-x11-fonts.changes 2006-08-30 18:37:38.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 30 18:37:21 CEST 2006 - sndirsch(a)suse.de + +- moved encodings to -core subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts.spec ++++++ --- /var/tmp/diff_new_pack.IVaZWe/_old 2006-08-30 23:36:33.000000000 +0200 +++ /var/tmp/diff_new_pack.IVaZWe/_new 2006-08-30 23:36:33.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.1 -Release: 7 +Release: 8 License: X11/MIT BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,13 +68,14 @@ %package core -Summary: X.Org fonts +Summary: Core Fonts for X.Org Group: System/X11/Fonts Provides: xorg-x11:/usr/X11R6/%{_lib}/X11/fonts/misc/cursor.pcf.gz Autoreqprov: on %description core -This package contains fonts maintained and shipped with X.Org. +This package contains the 'fixed' and 'cursor' font required for any X +Server. @@ -96,11 +97,11 @@ *75dpi-*) option="--with-fontdir=/usr/share/fonts/75dpi" ;; *type1-*) option="--with-fontdir=/usr/share/fonts/Type1" ;; *ethiopic-*) option="--with-ttf-fontdir=/usr/share/fonts/truetype --with-otf-fontdir=/usr/share/fonts/truetype" ;; + *meltho-*) option="--with-fontdir=/usr/share/fonts/truetype" ;; *misc-*) option="--with-fontdir=/usr/share/fonts/misc" ;; *ttf-*) option="--with-fontdir=/usr/share/fonts/truetype" ;; *speedo-*) option="--with-fontdir=/usr/share/fonts/Speedo" ;; *cyrillic-*) option="--with-fontdir=/usr/share/fonts/cyrillic" ;; - *meltho-*) option="--with-fontdir=/usr/share/fonts/truetype" ;; *) option="" ;; esac #autoreconf -fi @@ -120,9 +121,11 @@ -e "^%dir /usr$" \ -e "^%dir /usr/share$" \ -e "^%dir /usr/share/fonts$" \ + -e "^%dir /usr/share/fonts/encodings$" \ -e "^%dir /usr/share/fonts/misc$" \ > $RPM_BUILD_DIR/files.%{name} find . -type f | sed 's/^\.//g' | grep -v \ + -e "/usr/share/fonts/encodings" \ -e "^/usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz$" \ -e "^/usr/share/fonts/misc/cursor.pcf.gz$" \ -e "^/usr/share/fonts/misc/fonts.alias$" \ @@ -150,11 +153,15 @@ %files core %defattr(-,root,root) %dir /usr/share/fonts/misc +%dir /usr/share/fonts/encodings +/usr/share/fonts/encodings/* /usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz /usr/share/fonts/misc/cursor.pcf.gz /usr/share/fonts/misc/fonts.alias %changelog -n xorg-x11-fonts +* Wed Aug 30 2006 - sndirsch(a)suse.de +- moved encodings to -core subpackage * Tue Aug 29 2006 - sndirsch(a)suse.de - move 'fixed' + 'cursor' fonts to new xorg-x11-fonts-core package * Wed Aug 09 2006 - sndirsch(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodoc-core
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package monodoc-core checked in at Wed Aug 30 23:36:27 CEST 2006. -------- --- monodoc-core/monodoc-core.changes 2006-08-01 03:19:15.000000000 +0200 +++ monodoc-core/monodoc-core.changes 2006-08-30 19:26:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 19:25:55 CEST 2006 - wberrier(a)suse.de + +- Update to 1.1.17 + - Updated documentation for mono 1.1.17 + +------------------------------------------------------------------- Old: ---- monodoc-1.1.16.zip New: ---- monodoc-1.1.17.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodoc-core.spec ++++++ --- /var/tmp/diff_new_pack.HCtLud/_old 2006-08-30 23:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.HCtLud/_new 2006-08-30 23:36:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package monodoc-core (Version 1.1.16) +# spec file for package monodoc-core (Version 1.1.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ Group: Development/Tools/Other Summary: Monodoc--A Documentation Browser Written in C# URL: http://go-mono.org/ -Version: 1.1.16 +Version: 1.1.17 Release: 1 Source0: monodoc-%version.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,6 +88,9 @@ %doc AUTHORS ChangeLog NEWS README %changelog -n monodoc-core +* Wed Aug 30 2006 - wberrier(a)suse.de +- Update to 1.1.17 +- Updated documentation for mono 1.1.17 * Tue Aug 01 2006 - wberrier(a)suse.de - Update to 1.1.16 - Fixes problem with missing documentation (pathnames too long ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodevelop
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package monodevelop checked in at Wed Aug 30 23:35:56 CEST 2006. -------- --- monodevelop/monodevelop.changes 2006-08-01 03:29:01.000000000 +0200 +++ monodevelop/monodevelop.changes 2006-08-30 18:59:41.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 30 18:59:18 CEST 2006 - wberrier(a)suse.de + +- Add mono-nunit to BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop.spec ++++++ --- /var/tmp/diff_new_pack.Tt5gbS/_old 2006-08-30 23:35:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Tt5gbS/_new 2006-08-30 23:35:50.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: monodevelop -BuildRequires: boo bytefx-data-mysql gconf-sharp2 glade-sharp2 gtk-sharp2 gtk-sharp2-gapi gtkhtml-sharp2 gtkhtml2-devel gtksourceview-sharp2 ikvm intltool mono-basic mono-data-oracle mono-data-postgresql mono-data-sqlite mono-data-sybase mono-tools perl-XML-Parser update-desktop-files vte-sharp2 +BuildRequires: boo bytefx-data-mysql gconf-sharp2 glade-sharp2 gtk-sharp2 gtk-sharp2-gapi gtkhtml-sharp2 gtkhtml2-devel gtksourceview-sharp2 ikvm intltool mono-basic mono-data-oracle mono-data-postgresql mono-data-sqlite mono-data-sybase mono-nunit mono-tools perl-XML-Parser update-desktop-files vte-sharp2 URL: http://www.go-mono.com/ %define prefix /usr %define gnome_prefix /opt/gnome @@ -20,7 +20,7 @@ Group: Development/Languages/Other Autoreqprov: on Version: 0.11 -Release: 1 +Release: 3 Summary: A Full-Featured IDE for Mono and Gtk# Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,6 +88,8 @@ %dir %{prefix}/share/locale/ja_JP/LC_MESSAGES %changelog -n monodevelop +* Wed Aug 30 2006 - wberrier(a)suse.de +- Add mono-nunit to BuildRequires * Tue Aug 01 2006 - wberrier(a)suse.de - Update to 0.11 - Lots of new features and fixes, too many to list here. One big ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit device-mapper
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package device-mapper checked in at Wed Aug 30 23:35:38 CEST 2006. -------- --- device-mapper/device-mapper.changes 2006-08-30 09:11:20.000000000 +0200 +++ device-mapper/device-mapper.changes 2006-08-30 14:39:29.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 14:38:57 CEST 2006 - hare(a)suse.de + +- Fix gcc warnings +- Fix field display for 'dmsetup info'. + +------------------------------------------------------------------- New: ---- device-mapper-gcc-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.7ZhJ61/_old 2006-08-30 23:35:30.000000000 +0200 +++ /var/tmp/diff_new_pack.7ZhJ61/_new 2006-08-30 23:35:30.000000000 +0200 @@ -14,12 +14,13 @@ Group: System/Base Autoreqprov: on Version: 1.02.09 -Release: 3 +Release: 4 Summary: Device Mapper Tools Source: device-mapper.%{version}.tar.bz2 Source1: boot.device-mapper Patch: k_dev_t.dif Patch1: %{name}-option-values.patch +Patch2: %{name}-gcc-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -39,6 +40,7 @@ %patch %endif %patch1 -p1 +%patch2 -p1 %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -71,6 +73,9 @@ %changelog -n device-mapper * Wed Aug 30 2006 - hare(a)suse.de +- Fix gcc warnings +- Fix field display for 'dmsetup info'. +* Wed Aug 30 2006 - hare(a)suse.de - Add 'major', 'minor', and 'uuid' as valid fields for 'dmsetup info -o XXX'. * Wed Aug 16 2006 - fehr(a)suse.de ++++++ device-mapper-gcc-warnings.patch ++++++ diff -pur device-mapper.1.02.09.orig/dmsetup/dmsetup.c device-mapper.1.02.09/dmsetup/dmsetup.c --- device-mapper.1.02.09.orig/dmsetup/dmsetup.c 2006-08-30 09:22:04.000000000 +0200 +++ device-mapper.1.02.09/dmsetup/dmsetup.c 2006-08-30 09:32:59.000000000 +0200 @@ -1329,7 +1329,7 @@ static void _out_char(const unsigned c) } } -static void _out_string(const unsigned char *str) +static void _out_string(const char *str) { while (*str) _out_char(*str++); diff -pur device-mapper.1.02.09.orig/lib/datastruct/hash.c device-mapper.1.02.09/lib/datastruct/hash.c --- device-mapper.1.02.09.orig/lib/datastruct/hash.c 2006-01-09 21:35:24.000000000 +0100 +++ device-mapper.1.02.09/lib/datastruct/hash.c 2006-08-30 09:27:47.000000000 +0200 @@ -19,7 +19,7 @@ struct dm_hash_node { struct dm_hash_node *next; void *data; unsigned keylen; - char key[0]; + unsigned char key[0]; }; struct dm_hash_table { @@ -140,7 +140,7 @@ void dm_hash_destroy(struct dm_hash_tabl static struct dm_hash_node **_find(struct dm_hash_table *t, const char *key, uint32_t len) { - unsigned h = _hash(key, len) & (t->num_slots - 1); + unsigned h = _hash((unsigned char *)key, len) & (t->num_slots - 1); struct dm_hash_node **c; for (c = &t->slots[h]; *c; c = &((*c)->next)) @@ -232,7 +232,7 @@ void dm_hash_wipe(struct dm_hash_table * char *dm_hash_get_key(struct dm_hash_table *t, struct dm_hash_node *n) { - return n->key; + return (char *)n->key; } void *dm_hash_get_data(struct dm_hash_table *t, struct dm_hash_node *n) Nur in device-mapper.1.02.09/lib/datastruct: hash.c~. diff -pur device-mapper.1.02.09.orig/lib/ioctl/libdm-iface.c device-mapper.1.02.09/lib/ioctl/libdm-iface.c --- device-mapper.1.02.09.orig/lib/ioctl/libdm-iface.c 2006-08-08 23:22:31.000000000 +0200 +++ device-mapper.1.02.09/lib/ioctl/libdm-iface.c 2006-08-30 09:36:14.000000000 +0200 @@ -1555,7 +1555,8 @@ static struct dm_ioctl *_do_dm_ioctl(str dmt->major > 0 ? ") " : "", dmt->no_open_count ? 'N' : 'O', dmt->skip_lockfs ? "S " : "", - dmt->sector, dmt->message ? dmt->message : "", + (unsigned long long int)dmt->sector, + dmt->message ? dmt->message : "", dmi->data_size); #ifdef DM_IOCTLS if (ioctl(_control_fd, command, dmi) < 0) { Nur in device-mapper.1.02.09/lib/ioctl: libdm-iface.c~. ++++++ device-mapper-option-values.patch ++++++ --- /var/tmp/diff_new_pack.7ZhJ61/_old 2006-08-30 23:35:30.000000000 +0200 +++ /var/tmp/diff_new_pack.7ZhJ61/_new 2006-08-30 23:35:30.000000000 +0200 @@ -44,11 +44,11 @@ + printf("%s", uuid); + break; + } ++ if (v & 0xfe) ++ printf(":"); + } + v >>= 1; + shift++; -+ if (v) -+ printf(":"); + } + printf("\n"); + } else @@ -140,12 +140,12 @@ return 1; } -+static int _process_fields(char *optarg) ++static int _process_fields(char *arg) +{ + int flags = 0; + char *f, *e; + -+ f = optarg; ++ f = arg; + + while (f && *f) { + if (!strncmp("name", f, 4)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zmd
by root＠suse.de 30 Aug '06

30 Aug '06

Hello community, here is the log from the commit of package zmd checked in at Wed Aug 30 23:35:05 CEST 2006. -------- --- zmd/zmd.changes 2006-07-18 22:50:05.000000000 +0200 +++ zmd/zmd.changes 2006-08-30 19:51:59.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 19:29:23 CEST 2006 - maw(a)suse.de + +- New source drop (r33979) which: +- Fixes compilation error (#202721). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.2HcPBB/_old 2006-08-30 23:34:52.000000000 +0200 +++ /var/tmp/diff_new_pack.2HcPBB/_new 2006-08-30 23:34:52.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono libzypp-zmd-backend log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 65 +Release: 67 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -173,6 +173,9 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Wed Aug 30 2006 - maw(a)suse.de +- New source drop (r33979) which: +- Fixes compilation error (#202721). * Tue Jul 18 2006 - maw(a)suse.de - New source drop (r32306) which: - Traps an unhandled exception in ProcessRequest ++++++ zmd-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/NetworkManager/NetworkManagerModule.cs new/zmd-7.1.1.0/modules/linux/NetworkManager/NetworkManagerModule.cs --- old/zmd-7.1.1.0/modules/linux/NetworkManager/NetworkManagerModule.cs 2006-06-23 00:41:54.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/NetworkManager/NetworkManagerModule.cs 2006-08-30 19:18:20.000000000 +0200 @@ -74,7 +74,7 @@ } }; - ZenThreadPool.SharedPool.RunThread (delegate { + ZenThreadPool.SharedPool.RunThread (delegate () { g_main_loop_run (g_main_loop_new (IntPtr.Zero, false)); }); } Binary files old/zmd-7.1.1.0/po/ar.gmo and new/zmd-7.1.1.0/po/ar.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ar.po new/zmd-7.1.1.0/po/ar.po --- old/zmd-7.1.1.0/po/ar.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/ar.po 2006-07-11 22:11:15.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-07-13 15:36+0200\n" "Last-Translator: Ghayss Tarraf <jodi(a)suse.de>\n" "Language-Team: Arabic <i18n(a)suse.de>\n" @@ -145,12 +145,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/bg.gmo and new/zmd-7.1.1.0/po/bg.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/bg.po new/zmd-7.1.1.0/po/bg.po --- old/zmd-7.1.1.0/po/bg.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/bg.po 2006-07-11 22:11:15.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2003-02-27 11:59+0100\n" "Last-Translator: Y Gonch <gonch(a)mail.bulgaria.com>\n" "Language-Team: Bulgarian <i18n(a)suse.de>\n" @@ -161,12 +161,12 @@ msgid "A transaction is already in progress" msgstr "Избраният параметър вече е въведен" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Пакетът %1 ще бъде инсталиран." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Инсталирането на необходимите пакети бе неуспешно." Binary files old/zmd-7.1.1.0/po/bn.gmo and new/zmd-7.1.1.0/po/bn.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/bn.po new/zmd-7.1.1.0/po/bn.po --- old/zmd-7.1.1.0/po/bn.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/bn.po 2006-07-11 22:11:15.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2004-08-09 10:24+0200\n" "Last-Translator: xxx <yyy(a)example.org>\n" "Language-Team: Bengali <i18n(a)suse.de>\n" @@ -155,12 +155,12 @@ msgstr "নির্বাচিত অপশনটি আগে থেকেই বিদ্যমান।" # প্যাকেজ -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "এই প্যাকেজটি আগে থেকেই ইনস্টল করা আছে। এটি মুছে দাও।" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/br.gmo and new/zmd-7.1.1.0/po/br.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/br.po new/zmd-7.1.1.0/po/br.po --- old/zmd-7.1.1.0/po/br.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/br.po 2006-07-11 22:11:16.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-07-18 10:57+0200\n" "Last-Translator: Francoise Lermen <flermen(a)suse.de>\n" "Language-Team: i18n <i18n(a)suse.de>\n" @@ -151,12 +151,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/bs.gmo and new/zmd-7.1.1.0/po/bs.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/bs.po new/zmd-7.1.1.0/po/bs.po --- old/zmd-7.1.1.0/po/bs.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/bs.po 2006-07-11 22:11:16.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-07-23 18:27+0200\n" "Last-Translator: Damir Bjelobradic <Nagual(a)lugbih.org>\n" "Language-Team: Bosnian <i18n(a)suse.de>\n" @@ -151,12 +151,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/ca.gmo and new/zmd-7.1.1.0/po/ca.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ca.po new/zmd-7.1.1.0/po/ca.po --- old/zmd-7.1.1.0/po/ca.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/ca.po 2006-07-11 22:11:16.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-02-08 15:47+0100\n" "Last-Translator: Jaume Badiella <myotis(a)drac.com>\n" "Language-Team: Catalan\n" @@ -149,12 +149,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Comprovant els escàners ja instal·lats..." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/cs.gmo and new/zmd-7.1.1.0/po/cs.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/cs.po new/zmd-7.1.1.0/po/cs.po --- old/zmd-7.1.1.0/po/cs.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/cs.po 2006-07-11 22:11:16.000000000 +0200 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: zmd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-16 18:13+0200\n" "Last-Translator: Jakub Friedl <jfriedl(a)suse.cz>\n" "Language-Team: <cs(a)li.org>\n" @@ -166,12 +166,12 @@ msgid "A transaction is already in progress" msgstr "Transakce již běží" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "Balík {0} je již nainstalován." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Nelze stáhnout balík {0}." Binary files old/zmd-7.1.1.0/po/cy.gmo and new/zmd-7.1.1.0/po/cy.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/cy.po new/zmd-7.1.1.0/po/cy.po --- old/zmd-7.1.1.0/po/cy.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/cy.po 2006-07-11 22:11:16.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2003-09-23 10:33+0200\n" "Last-Translator: Kevin Donnelly <kevin(a)dotmon.com>\n" "Language-Team: Welsh <i18n(a)suse.de>\n" @@ -153,12 +153,12 @@ msgid "A transaction is already in progress" msgstr "Mae'r gwerth dewisiedig yn bresennol yn barod" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Bydd pecyn %1 yn cael ei arsefydlu" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/da.gmo and new/zmd-7.1.1.0/po/da.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/da.po new/zmd-7.1.1.0/po/da.po --- old/zmd-7.1.1.0/po/da.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/da.po 2006-07-11 22:11:16.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-07-01 14:35+0200\n" "Last-Translator: H. Merethe Eriksen <djinni(a)mail1.stofanet.dk>\n" "Language-Team: Danish <de(a)li.org>\n" @@ -163,12 +163,12 @@ msgid "A transaction is already in progress" msgstr "Det valgte tilvalg er allerede tilstede" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Pakke %1 vil blive installeret" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Kan ikke installere krævede pakker." Binary files old/zmd-7.1.1.0/po/de.gmo and new/zmd-7.1.1.0/po/de.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de.po new/zmd-7.1.1.0/po/de.po --- old/zmd-7.1.1.0/po/de.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/de.po 2006-07-11 22:11:16.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version:ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-31 13:25\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -150,12 +150,12 @@ msgid "A transaction is already in progress" msgstr "Es wird bereits eine Transaktion ausgeführt." -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "Paket {0} ist bereits installiert." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Herunterladen von Paket {0} nicht möglich." Binary files old/zmd-7.1.1.0/po/el_GR.gmo and new/zmd-7.1.1.0/po/el_GR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/el_GR.po new/zmd-7.1.1.0/po/el_GR.po --- old/zmd-7.1.1.0/po/el_GR.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/el_GR.po 2006-07-11 22:11:16.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-07-17 16:12+0200\n" "Last-Translator: Bill Giannakopoulos <BillG(a)hellug.gr>\n" "Language-Team: Greek <i18n(a)suse.de>\n" @@ -163,12 +163,12 @@ msgid "A transaction is already in progress" msgstr "Η τρέχουσα επιλογή είναι ήδη παρούσα" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Το πακέτο %1 θα εγκατασταθεί." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Αδυναμία εγκατάστασης απαραίτητων πακέτων" Binary files old/zmd-7.1.1.0/po/en_GB.gmo and new/zmd-7.1.1.0/po/en_GB.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_GB.po new/zmd-7.1.1.0/po/en_GB.po --- old/zmd-7.1.1.0/po/en_GB.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/en_GB.po 2006-07-11 22:11:16.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley <ogley(a)suse.co.uk>\n" "Language-Team: English <i18n(a)suse.de>\n" @@ -163,12 +163,12 @@ msgid "A transaction is already in progress" msgstr "The selected option is already present" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Package %1 will be installed." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Cannot install required packages." Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po --- old/zmd-7.1.1.0/po/en_US.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/en_US.po 2006-07-11 22:11:16.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -147,12 +147,12 @@ msgid "A transaction is already in progress" msgstr "Another transaction is already in progress" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "'{0}' is already installed." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/es.gmo and new/zmd-7.1.1.0/po/es.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es.po new/zmd-7.1.1.0/po/es.po --- old/zmd-7.1.1.0/po/es.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/es.po 2006-07-11 22:11:16.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-31 13:42\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -152,12 +152,12 @@ msgid "A transaction is already in progress" msgstr "Ya hay una transacción en progreso." -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "El paquete {0} ya está instalado." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "No es posible descargar el paquete {0}." Binary files old/zmd-7.1.1.0/po/fi.gmo and new/zmd-7.1.1.0/po/fi.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fi.po new/zmd-7.1.1.0/po/fi.po --- old/zmd-7.1.1.0/po/fi.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/fi.po 2006-07-11 22:11:16.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: zmd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-29 17:25+0300\n" "Last-Translator: Jyri Palokangas <jmp(a)netti.fi>\n" "Language-Team: <fi(a)li.org>\n" @@ -155,12 +155,12 @@ msgid "A transaction is already in progress" msgstr "Toinen tapahtuma on jo parhaillaan käynnissä" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "Paketti {0} on jo asennettu." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Paketin {0} lataus ei onnistunut." Binary files old/zmd-7.1.1.0/po/fr.gmo and new/zmd-7.1.1.0/po/fr.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr.po new/zmd-7.1.1.0/po/fr.po --- old/zmd-7.1.1.0/po/fr.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/fr.po 2006-07-11 22:11:16.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-31 14:18\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -152,12 +152,12 @@ msgid "A transaction is already in progress" msgstr "Une transaction est déjà en cours" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "Le paquetage {0} est déjà installé." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Impossible de télécharger le paquetage {0}." Binary files old/zmd-7.1.1.0/po/gl.gmo and new/zmd-7.1.1.0/po/gl.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/gl.po new/zmd-7.1.1.0/po/gl.po --- old/zmd-7.1.1.0/po/gl.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/gl.po 2006-07-11 22:11:16.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-07-23 11:51+0200\n" "Last-Translator: Jesús Bravo Álvarez <jba(a)pobox.com>\n" "Language-Team: Galician <i18n(a)suse.de>\n" @@ -151,12 +151,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/he.gmo and new/zmd-7.1.1.0/po/he.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/he.po new/zmd-7.1.1.0/po/he.po --- old/zmd-7.1.1.0/po/he.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/he.po 2006-07-11 22:11:16.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2004-08-09 10:24+0200\n" "Last-Translator: xxx <yyy(a)example.org>\n" "Language-Team: Hebrew <i18n(a)suse.de>\n" @@ -152,12 +152,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "חבילות שנבחרו יותקנו." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/hi.gmo and new/zmd-7.1.1.0/po/hi.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/hi.po new/zmd-7.1.1.0/po/hi.po --- old/zmd-7.1.1.0/po/hi.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/hi.po 2006-07-11 22:11:16.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Prasanth Kurian <prasanth.kurian(a)agreeya.com>\n" "Language-Team: Hindi <i18n(a)suse.de>\n" @@ -160,12 +160,12 @@ msgid "A transaction is already in progress" msgstr "चुन लिया वुकल्प पहले से हि उपस्थित हैं। " -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "ये पैकेज पहले से इंसटाल है।इसे मिटाऐं।" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "आवश्यक पैकेज इसटाल नहीं कर सकता ।" Binary files old/zmd-7.1.1.0/po/hr.gmo and new/zmd-7.1.1.0/po/hr.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/hr.po new/zmd-7.1.1.0/po/hr.po --- old/zmd-7.1.1.0/po/hr.po 2006-07-18 22:20:17.000000000 +0200 +++ new/zmd-7.1.1.0/po/hr.po 2006-07-11 22:11:16.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-07-17 16:22+0200\n" "Last-Translator: Vlatko Kosturjak <kost(a)iname.com>\n" "Language-Team: Croatian <i18n(a)suse.de>\n" @@ -157,12 +157,12 @@ msgid "A transaction is already in progress" msgstr "Odabrana opcija je već prisutna" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Paket %1 već postoji u novoj bazi podataka." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/hu.gmo and new/zmd-7.1.1.0/po/hu.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/hu.po new/zmd-7.1.1.0/po/hu.po --- old/zmd-7.1.1.0/po/hu.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/hu.po 2006-07-11 22:11:16.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hu_HU\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-21 00:02+0100\n" "Last-Translator: Szabolcs Varga <shirokuma(a)shirokuma.hu>\n" "Language-Team: <en(a)li.org>\n" @@ -150,12 +150,12 @@ msgid "A transaction is already in progress" msgstr "Egy tranzakció már folyamatban van" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "A(z) {0} csomag már telepítve van." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Nem sikerült a(z) {0} csomag letöltése." Binary files old/zmd-7.1.1.0/po/id.gmo and new/zmd-7.1.1.0/po/id.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/id.po new/zmd-7.1.1.0/po/id.po --- old/zmd-7.1.1.0/po/id.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/id.po 2006-07-11 22:11:16.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-10-08 13:38+0200\n" "Last-Translator: I Made Wiryana <made(a)nakula.rvs.uni-bielefeld.de>\n" "Language-Team: Indonesian <i18n(a)suse.de>\n" @@ -146,12 +146,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/it.gmo and new/zmd-7.1.1.0/po/it.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/it.po new/zmd-7.1.1.0/po/it.po --- old/zmd-7.1.1.0/po/it.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/it.po 2006-07-11 22:11:16.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-31 14:42\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -152,12 +152,12 @@ msgid "A transaction is already in progress" msgstr "È già in corso una transazione" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "Il pacchetto {0} è già installato." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Impossibile scaricare il pacchetto {0}." Binary files old/zmd-7.1.1.0/po/ja.gmo and new/zmd-7.1.1.0/po/ja.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ja.po new/zmd-7.1.1.0/po/ja.po --- old/zmd-7.1.1.0/po/ja.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/ja.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-06-16 14:06\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -147,12 +147,12 @@ msgid "A transaction is already in progress" msgstr "トランザクションがすでに進行中です" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "パッケージ{0}はすでにインストールされています。" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "パッケージ{0}をダウンロードできません。" Binary files old/zmd-7.1.1.0/po/ka.gmo and new/zmd-7.1.1.0/po/ka.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ka.po new/zmd-7.1.1.0/po/ka.po --- old/zmd-7.1.1.0/po/ka.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/ka.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2005-05-18 10:33+0200\n" "Last-Translator: Aiet Kolkhi <aiet(a)qartuli.net>\n" "Language-Team: Georgian <i18n(a)suse.de>\n" @@ -145,12 +145,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/km.gmo and new/zmd-7.1.1.0/po/km.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/km.po new/zmd-7.1.1.0/po/km.po --- old/zmd-7.1.1.0/po/km.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/km.po 2006-07-11 22:11:17.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-01-04 08:58+0100\n" "Last-Translator: Leang Chumsoben <soben(a)khmeros.info>\n" "Language-Team: Khmer <i18n(a)suse.de>\n" @@ -161,12 +161,12 @@ msgid "A transaction is already in progress" msgstr "ជម្រើសដែលបានជ្រើសមានរួចហើយ ។" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "កញ្ចប់ %1 នឹងត្រូវបានដំឡើង ។" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "មិនអាចដំឡើងកញ្ចប់ដែលត្រូវការ ។" Binary files old/zmd-7.1.1.0/po/ko.gmo and new/zmd-7.1.1.0/po/ko.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ko.po new/zmd-7.1.1.0/po/ko.po --- old/zmd-7.1.1.0/po/ko.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/ko.po 2006-07-11 22:11:17.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-07-18 11:05+0200\n" "Last-Translator: Hwang, Sang-Jin <violiet(a)suse.de>\n" "Language-Team: Korean <i18n(a)suse.de>\n" @@ -163,12 +163,12 @@ msgid "A transaction is already in progress" msgstr "선택하신 옵션은 이미 존재합니다." -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "%1 패키지가 설치되어질 것입니다." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "필요한 패키지를 설치할 수 없습니다." Binary files old/zmd-7.1.1.0/po/lo.gmo and new/zmd-7.1.1.0/po/lo.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/lo.po new/zmd-7.1.1.0/po/lo.po --- old/zmd-7.1.1.0/po/lo.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/lo.po 2006-07-11 22:11:17.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-01-04 08:58+0100\n" "Last-Translator: i18n(a)suse.de\n" "Language-Team: Lao <i18n(a)suse.de>\n" @@ -143,12 +143,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/lt.gmo and new/zmd-7.1.1.0/po/lt.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/lt.po new/zmd-7.1.1.0/po/lt.po --- old/zmd-7.1.1.0/po/lt.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/lt.po 2006-07-11 22:11:17.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-10-18 09:54+0200\n" "Last-Translator: Jonas Gocentas <jonasgocentas(a)florida.usa.com>\n" "Language-Team: Lithuanian <i18n(a)suse.de>\n" @@ -159,12 +159,12 @@ msgid "A transaction is already in progress" msgstr "Pažymėtas parametras jau pateiktas" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Bus įdiegtas paketas %1" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/nb.gmo and new/zmd-7.1.1.0/po/nb.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/nb.po new/zmd-7.1.1.0/po/nb.po --- old/zmd-7.1.1.0/po/nb.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/nb.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-06-17 14:33+0200\n" "Last-Translator: www.linuxbutikken.no <roy(a)bytek.no>\n" "Language-Team: Norwegian <i18n(a)suse.de>\n" @@ -164,12 +164,12 @@ msgid "A transaction is already in progress" msgstr "Det valgte alternativet finnes allerede" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Pakken %1 vil bli installert." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Kan ikke installere nødvendige pakker." Binary files old/zmd-7.1.1.0/po/nl.gmo and new/zmd-7.1.1.0/po/nl.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/nl.po new/zmd-7.1.1.0/po/nl.po --- old/zmd-7.1.1.0/po/nl.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/nl.po 2006-07-11 22:11:17.000000000 +0200 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-07-01 14:34+0200\n" "Last-Translator: A.S. Kerkmeester <ask_murphy(a)bigfoot.com>\n" "Language-Team: Dutch <i18n(a)suse.de>\n" @@ -171,12 +171,12 @@ msgid "A transaction is already in progress" msgstr "De geselecteerde optie is reeds aanwezig" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Pakket %1 zal geïnstalleerd worden." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Kan de benodigde pakketten niet installeren." Binary files old/zmd-7.1.1.0/po/pa.gmo and new/zmd-7.1.1.0/po/pa.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pa.po new/zmd-7.1.1.0/po/pa.po --- old/zmd-7.1.1.0/po/pa.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/pa.po 2006-07-11 22:11:17.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2005-02-16 10:21+0100\n" "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar(a)yahoo.co.in>\n" "Language-Team: Punjabi <i18n(a)suse.de>\n" @@ -160,12 +160,12 @@ msgid "A transaction is already in progress" msgstr "ਕੀਤੀ ਚੋਣ ਪਹਿਲਾਂ ਵੀ ਮੌਜੂਦ ਹੈ" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "ਪੈਕੇਜ %1 ਇੰਸਟਾਲ ਹੋਵੇਗਾ।" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "ਲੋੜੀਂਦੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕਰ ਸਕਦਾ।" Binary files old/zmd-7.1.1.0/po/pl.gmo and new/zmd-7.1.1.0/po/pl.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pl.po new/zmd-7.1.1.0/po/pl.po --- old/zmd-7.1.1.0/po/pl.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/pl.po 2006-07-11 22:11:17.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-06-11 01:48+0100\n" "Last-Translator: wadim dziedzic <nikdo(a)aviary.pl>\n" "Language-Team: Polish <i18n(a)suse.de>\n" @@ -148,12 +148,12 @@ msgid "A transaction is already in progress" msgstr "Transakcja jest w trakcie wykonania" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "Pakiet {0} jest już zainstalowany." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Nie można pobrać pakietu {0}." Binary files old/zmd-7.1.1.0/po/pt.gmo and new/zmd-7.1.1.0/po/pt.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt.po new/zmd-7.1.1.0/po/pt.po --- old/zmd-7.1.1.0/po/pt.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/pt.po 2006-07-11 22:11:17.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-07-01 14:56+0200\n" "Last-Translator: Bruno David Rodrigues <brunodavid(a)netc.pt>\n" "Language-Team: Portuguese <i18n(a)suse.de>\n" @@ -162,13 +162,13 @@ msgid "A transaction is already in progress" msgstr "A opção seleccionada já está presente" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "O pacote %1 será instalado." # /usr/lib/YaST2/clients/sw_single.ycp:12 -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Não é possível instalar os pacotes necessários." Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po --- old/zmd-7.1.1.0/po/pt_BR.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/pt_BR.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-31 14:44\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -147,12 +147,12 @@ msgid "A transaction is already in progress" msgstr "Já há uma transação em andamento" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "O pacote {0} já está instalado." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "Não é possível efetuar o download do pacote {0}." Binary files old/zmd-7.1.1.0/po/ro.gmo and new/zmd-7.1.1.0/po/ro.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ro.po new/zmd-7.1.1.0/po/ro.po --- old/zmd-7.1.1.0/po/ro.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/ro.po 2006-07-11 22:11:17.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2003-02-25 15:04+0100\n" "Last-Translator: <i18n(a)suse.de>\n" "Language-Team: Romanian <i18n(a)suse.de>\n" @@ -153,12 +153,12 @@ msgid "A transaction is already in progress" msgstr "Opţiunea selectată este deja prezentă" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Pachetul %1 va fi instalat" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/ru.gmo and new/zmd-7.1.1.0/po/ru.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ru.po new/zmd-7.1.1.0/po/ru.po --- old/zmd-7.1.1.0/po/ru.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/ru.po 2006-07-11 22:11:17.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-01-04 08:58+0100\n" "Last-Translator: Aleksey Osipov <pepela(a)yandex.ru>\n" "Language-Team: Russian <i18n(a)suse.de>\n" @@ -170,12 +170,12 @@ # if installation failes # Translators: The package name is stored in %1. -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Пакет %1 будет установлен." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Невозможно установить требуемые пакеты." Binary files old/zmd-7.1.1.0/po/sk.gmo and new/zmd-7.1.1.0/po/sk.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/sk.po new/zmd-7.1.1.0/po/sk.po --- old/zmd-7.1.1.0/po/sk.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/sk.po 2006-07-11 22:11:17.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2003-05-27 16:53+0200\n" "Last-Translator: Stanislav Visnovsky <visnovsky(a)kde.org>\n" "Language-Team: Slovak <i18n(a)suse.de>\n" @@ -159,12 +159,12 @@ msgid "A transaction is already in progress" msgstr "Vybraná voľba už je uvedená" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Bude nainštalovaný balík %1." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Nepodarilo sa nainštalovať požadované balíky." Binary files old/zmd-7.1.1.0/po/sl_SI.gmo and new/zmd-7.1.1.0/po/sl_SI.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/sl_SI.po new/zmd-7.1.1.0/po/sl_SI.po --- old/zmd-7.1.1.0/po/sl_SI.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/sl_SI.po 2006-07-11 22:11:17.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-10-18 11:02+0200\n" "Last-Translator: Janez Krek <janez.krek(a)euroteh.si>\n" "Language-Team: Slovenian\n" @@ -160,12 +160,12 @@ msgid "A transaction is already in progress" msgstr "Izbrana opcija je že prisotna" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Nameščen bo paket %1." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Ne morem namestiti zahtevanih paketov." Binary files old/zmd-7.1.1.0/po/sr.gmo and new/zmd-7.1.1.0/po/sr.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/sr.po new/zmd-7.1.1.0/po/sr.po --- old/zmd-7.1.1.0/po/sr.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/sr.po 2006-07-11 22:11:17.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2004-03-31 11:34+0200\n" "Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n" "Language-Team: Serbian <i18n(a)suse.de>\n" @@ -164,12 +164,12 @@ # if installation failes # Translators: The package name is stored in %1. -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Paket %1 će biti instaliran" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Nisam uspeo da instaliram potrebne pakete." Binary files old/zmd-7.1.1.0/po/sv.gmo and new/zmd-7.1.1.0/po/sv.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/sv.po new/zmd-7.1.1.0/po/sv.po --- old/zmd-7.1.1.0/po/sv.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/sv.po 2006-07-11 22:11:17.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2002-01-04 13:30+0100\n" "Last-Translator: Mattias Newzella <newzella(a)linux.nu>\n" "Language-Team: Swedish <i18n(a)suse.de>\n" @@ -162,12 +162,12 @@ msgid "A transaction is already in progress" msgstr "Det valda alternativet finns redan" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Paketet %1 kommer att installeras." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Kan inte installera paket som krävs." Binary files old/zmd-7.1.1.0/po/ta.gmo and new/zmd-7.1.1.0/po/ta.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/ta.po new/zmd-7.1.1.0/po/ta.po --- old/zmd-7.1.1.0/po/ta.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/ta.po 2006-07-11 22:11:17.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2003-08-14 10:47+0200\n" "Last-Translator: xxx <yyy(a)example.org>\n" "Language-Team: Tamil <i18n(a)suse.de>\n" @@ -144,12 +144,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/tr.gmo and new/zmd-7.1.1.0/po/tr.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/tr.po new/zmd-7.1.1.0/po/tr.po --- old/zmd-7.1.1.0/po/tr.po 2006-07-18 22:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/po/tr.po 2006-07-11 22:11:17.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-10-18 10:13+0200\n" "Last-Translator: Görkem Çetin <gorkem(a)gelecek.com.tr>\n" "Language-Team: turkish <i18n(a)suse.de>\n" @@ -165,13 +165,13 @@ msgstr "Seçimini yaptığınız seçenek mevcut" # clients/online_update_load.ycp:923 -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "%1 paketi kurulacak." # clients/inst_sw_single.ycp:647 -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, fuzzy, csharp-format msgid "Can not download package {0}." msgstr "Gerekli paketlerin kurulumu başarısız oldu." Binary files old/zmd-7.1.1.0/po/uk.gmo and new/zmd-7.1.1.0/po/uk.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/uk.po new/zmd-7.1.1.0/po/uk.po --- old/zmd-7.1.1.0/po/uk.po 2006-07-18 22:20:19.000000000 +0200 +++ new/zmd-7.1.1.0/po/uk.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2005-01-31 19:01+0100\n" "Last-Translator: xxx\n" "Language-Team: Ukrainian <i18n(a)suse.de>\n" @@ -159,12 +159,12 @@ msgid "A transaction is already in progress" msgstr "Вибраний параметр вже присутній" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "Буде встановлено пакунок %1." -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/zh.gmo and new/zmd-7.1.1.0/po/zh.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zh.po new/zmd-7.1.1.0/po/zh.po --- old/zmd-7.1.1.0/po/zh.po 2006-07-18 22:20:19.000000000 +0200 +++ new/zmd-7.1.1.0/po/zh.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2001-06-05 18:02+02:00\n" "Last-Translator: Hartmut Pilch <phm(a)suse.de>\n" "Language-Team: zhongwen <i18n(a)suse.de>\n" @@ -145,12 +145,12 @@ msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/zh_CN.gmo and new/zmd-7.1.1.0/po/zh_CN.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zh_CN.po new/zmd-7.1.1.0/po/zh_CN.po --- old/zmd-7.1.1.0/po/zh_CN.po 2006-07-18 22:20:19.000000000 +0200 +++ new/zmd-7.1.1.0/po/zh_CN.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-31 13:57\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -144,12 +144,12 @@ msgid "A transaction is already in progress" msgstr "事务已在运行中" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "包 {0} 已安装。" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "无法下载包 {0}。" Binary files old/zmd-7.1.1.0/po/zh_TW.gmo and new/zmd-7.1.1.0/po/zh_TW.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zh_TW.po new/zmd-7.1.1.0/po/zh_TW.po --- old/zmd-7.1.1.0/po/zh_TW.po 2006-07-18 22:20:19.000000000 +0200 +++ new/zmd-7.1.1.0/po/zh_TW.po 2006-07-11 22:11:17.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ZMD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-07-11 15:11-0500\n" "PO-Revision-Date: 2006-05-31 13:41\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -144,12 +144,12 @@ msgid "A transaction is already in progress" msgstr "異動已經在進行中" -#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:242 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "套件 {0} 已完成安裝。" -#: modules/linux/Transaction.cs:283 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "無法下載套件 {0}。" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot --- old/zmd-7.1.1.0/po/zmd.pot 2006-07-18 22:20:16.000000000 +0200 +++ new/zmd-7.1.1.0/po/zmd.pot 2006-08-30 19:19:23.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-18 16:20-0400\n" +"POT-Creation-Date: 2006-08-30 12:19-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BuildConfig.cs new/zmd-7.1.1.0/src/BuildConfig.cs --- old/zmd-7.1.1.0/src/BuildConfig.cs 2006-07-18 22:20:12.000000000 +0200 +++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-08-30 19:19:06.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/opt/zypp"; - public const string SYSCONFDIR = "/opt/zypp/etc"; - public const string DATADIR = "/opt/zypp/share"; - public const string LIBDIR = "/opt/zypp/lib"; - public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; - public const string LOCALSTATEDIR = "/opt/zypp/var"; + public const string PREFIX = "/usr/local"; + public const string SYSCONFDIR = "/usr/local/etc"; + public const string DATADIR = "/usr/local/share"; + public const string LIBDIR = "/usr/local/lib"; + public const string LIBDIR_MANAGED = "/usr/local" + "/lib"; + public const string LOCALSTATEDIR = "/usr/local/var"; - public const string LOGDIR = "/opt/zypp/var/log"; + public const string LOGDIR = "/usr/local/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0