Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2014-08-06 11:42:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-07-31
21:49:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-08-06
11:42:14.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 4 12:10:57 CEST 2014 - snw...@suse.de
+
+- explicitly set CURLOPT_IPRESOLVE to debug/workaround resolve issues (bnc
#889981)
+- unify password handling and add password.enc option to pass encrypted
passwords
+- 5.0.9
+
+-------------------------------------------------------------------
Old:
----
linuxrc-5.0.8.tar.xz
New:
----
linuxrc-5.0.9.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.UgOElx/_old 2014-08-06 11:42:15.000000000 +0200
+++ /var/tmp/diff_new_pack.UgOElx/_new 2014-08-06 11:42:15.000000000 +0200
@@ -25,9 +25,9 @@
Summary: SUSE Installation Program
License: GPL-3.0+
Group: System/Boot
-Version: 5.0.8
+Version: 5.0.9
Release: 0
-Source: linuxrc-5.0.8.tar.xz
+Source: linuxrc-5.0.9.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-5.0.8.tar.xz -> linuxrc-5.0.9.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/VERSION new/linuxrc-5.0.9/VERSION
--- old/linuxrc-5.0.8/VERSION 2014-07-31 10:29:00.000000000 +0200
+++ new/linuxrc-5.0.9/VERSION 2014-08-04 12:10:54.000000000 +0200
@@ -1 +1 @@
-5.0.8
+5.0.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/changelog new/linuxrc-5.0.9/changelog
--- old/linuxrc-5.0.8/changelog 2014-07-31 10:29:02.000000000 +0200
+++ new/linuxrc-5.0.9/changelog 2014-08-04 12:10:56.000000000 +0200
@@ -1,4 +1,14 @@
-2014-07-31: HEAD
+2014-08-04: HEAD
+ - Merge pull request #18 from openSUSE/sw_0006
+ - Sw 0006
+ - explicitly set CURLOPT_IPRESOLVE to debug/workaround resolve issues
(bnc #889981)
+ - Unify password handling and add password.enc option to pass encrypted
passwords.
+ - There is an unused 'password' option; make it an alias to
'sshpassword' and
+ - set password even without ssh enabled (it's also used for rescue
system).
+ - Add 'password.enc' and 'sshpassword.enc' to allow passing passwords in
+ - encrypted form.
+
+2014-07-31: 5.0.8
- Merge pull request #16 from openSUSE/sw_0004
- fix point-to-point interface handling (bnc #889580)
- fix point-to-point interface handling (bnc #889580)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/file.c new/linuxrc-5.0.9/file.c
--- old/linuxrc-5.0.8/file.c 2014-07-30 10:56:14.000000000 +0200
+++ new/linuxrc-5.0.9/file.c 2014-08-04 12:09:57.000000000 +0200
@@ -109,6 +109,7 @@
{ key_disks, "Disks", kf_none },
/* obsolete */
{ key_username, "Username", kf_cfg + kf_cmd },
{ key_password, "Password", kf_cfg + kf_cmd },
+ { key_passwordenc, "PasswordEnc", kf_cfg + kf_cmd },
{ key_workdomain, "WorkDomain", kf_cfg + kf_cmd },
{ key_alias, "Alias", kf_none },
{ key_options, "Options", kf_cfg + kf_cmd_early },
@@ -161,6 +162,7 @@
{ key_vncpassword, "VNCPassword", kf_cfg + kf_cmd },
{ key_displayip, "Display_IP", kf_cfg + kf_cmd },
{ key_sshpassword, "SSHPassword", kf_cfg + kf_cmd },
+ { key_sshpasswordenc, "SSHPasswordEnc", kf_cfg + kf_cmd },
{ key_term, "TERM", kf_cfg + kf_cmd },
{ key_addswap, "AddSwap", kf_cfg + kf_cmd },
{ key_aborted, "Aborted", kf_yast },
@@ -727,7 +729,11 @@
break;
case key_password:
- str_copy(&config.net.password, *f->value ? f->value : NULL);
+ str_copy(&config.net.sshpassword, *f->value ? f->value : NULL);
+ break;
+
+ case key_passwordenc:
+ str_copy(&config.net.sshpassword_enc, *f->value ? f->value : NULL);
break;
case key_workdomain:
@@ -861,6 +867,10 @@
/* do not enable ssh nor network ... this is done with usessh=1 */
break;
+ case key_sshpasswordenc:
+ str_copy(&config.net.sshpassword_enc, *f->value ? f->value : NULL);
+ break;
+
case key_term:
str_copy(&config.term, *f->value ? f->value : NULL);
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/file.h new/linuxrc-5.0.9/file.h
--- old/linuxrc-5.0.8/file.h 2014-07-23 15:49:46.000000000 +0200
+++ new/linuxrc-5.0.9/file.h 2014-08-04 12:09:57.000000000 +0200
@@ -14,7 +14,7 @@
key_sourcemounted, key_cdrom, key_console,
key_ptphost, key_domain, key_manual, key_reboot, key_floppydisk,
key_keyboard, key_yast2update, key_textmode, key_bootdisk,
- key_disks, key_username, key_password, key_workdomain, key_alias,
+ key_disks, key_username, key_password, key_passwordenc, key_workdomain,
key_alias,
key_options, key_initrdmodules, key_locale, key_font, key_screenmap,
key_fontmagic, key_autoyast, key_linuxrc, key_forceinsmod, key_dhcp,
key_ipaddr, key_hostname, key_dns, key_dhcpsiaddr, key_rootpath,
@@ -24,7 +24,7 @@
key_usedhcp, key_dhcptimeout, key_tftptimeout, key_tmpfs,
key_testmode, key_debugwait, key_expert, key_rescue, key_rootimage,
key_rescueimage, key_vnc, key_vncpassword, key_displayip,
- key_sshpassword, key_term, key_addswap, key_aborted, key_netstop,
+ key_sshpassword, key_sshpasswordenc, key_term, key_addswap, key_aborted,
key_netstop,
key_exec, key_usbwait, key_nfsrsize, key_nfswsize, key_setupcmd,
key_setupnetif, key_netconfig, key_usessh, key_noshell, key_hwdetect,
key_consoledevice, key_product, key_productdir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/global.h new/linuxrc-5.0.9/global.h
--- old/linuxrc-5.0.8/global.h 2014-07-28 16:37:52.000000000 +0200
+++ new/linuxrc-5.0.9/global.h 2014-08-04 12:09:57.000000000 +0200
@@ -608,10 +608,10 @@
char *workgroup; /* SMB */
char *share; /* SMB */
char *user; /* if this is NULL, perform guest login
*/
- char *password;
char *vncpassword;
inet_t displayip; /* IP of remote X server */
- char *sshpassword;
+ char *sshpassword; /* inst-sys root password */
+ char *sshpassword_enc; /* encrypted inst-sys root password */
net_config_t configured; /* how we configured the network device */
char *ethtool_used; /* ethtool options used for active card
*/
char *dhcpfail; /* dhcp failure action */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/install.c new/linuxrc-5.0.9/install.c
--- old/linuxrc-5.0.8/install.c 2014-07-25 18:13:49.000000000 +0200
+++ new/linuxrc-5.0.9/install.c 2014-08-04 12:09:57.000000000 +0200
@@ -1165,9 +1165,9 @@
util_free_mem();
- if(!config.test && config.usessh && config.net.sshpassword) {
- if((f = popen("/usr/sbin/chpasswd", "w"))) {
- fprintf(f, "root:%s\n", config.net.sshpassword);
+ if(!config.test && (config.net.sshpassword || config.net.sshpassword_enc)) {
+ if((f = popen(config.net.sshpassword_enc ? "chpasswd -e" : "chpasswd",
"w"))) {
+ fprintf(f, "root:%s\n", config.net.sshpassword_enc ?:
config.net.sshpassword);
pclose(f);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/linuxrc.c new/linuxrc-5.0.9/linuxrc.c
--- old/linuxrc-5.0.8/linuxrc.c 2014-07-25 18:13:49.000000000 +0200
+++ new/linuxrc-5.0.9/linuxrc.c 2014-08-04 12:09:57.000000000 +0200
@@ -377,6 +377,7 @@
if(config.rescue) {
if(config.usessh) setenv("SSH", "1", 1);
if(config.net.sshpassword) setenv("SSHPASSWORD", config.net.sshpassword,
1);
+ if(config.net.sshpassword_enc) setenv("SSHPASSWORDENC",
config.net.sshpassword_enc, 1);
system("/mounts/initrd/scripts/prepare_rescue");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/url.c new/linuxrc-5.0.9/url.c
--- old/linuxrc-5.0.8/url.c 2014-07-31 10:28:30.000000000 +0200
+++ new/linuxrc-5.0.9/url.c 2014-08-04 12:09:57.000000000 +0200
@@ -100,6 +100,16 @@
curl_easy_setopt(c_handle, CURLOPT_PROGRESSDATA, url_data);
curl_easy_setopt(c_handle, CURLOPT_NOPROGRESS, 0);
+ if(config.net.ipv6 && !config.net.ipv4) {
+ curl_easy_setopt(c_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
+ }
+ else if(config.net.ipv4 && !config.net.ipv6) {
+ curl_easy_setopt(c_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+ }
+ else {
+ curl_easy_setopt(c_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER);
+ }
+
url_data->err = curl_easy_setopt(c_handle, CURLOPT_URL, url_data->url->str);
if(config.debug >= 2) fprintf(stderr, "curl opt url = %d (%s)\n",
url_data->err, url_data->curl_err_buf);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.8/util.c new/linuxrc-5.0.9/util.c
--- old/linuxrc-5.0.8/util.c 2014-07-28 16:37:52.000000000 +0200
+++ new/linuxrc-5.0.9/util.c 2014-08-04 12:09:57.000000000 +0200
@@ -1328,7 +1328,12 @@
}
if(config.net.sshpassword) {
- sprintf(buf, "sshpassword = %s", config.net.sshpassword);
+ sprintf(buf, "password = %s", config.net.sshpassword);
+ slist_append_str(&sl0, buf);
+ }
+
+ if(config.net.sshpassword_enc) {
+ sprintf(buf, "encrypted password = %s", config.net.sshpassword_enc);
slist_append_str(&sl0, buf);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
