Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2013-01-17 09:48:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc", Maintainer is "snw...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2013-01-14
22:22:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2013-01-17
09:48:38.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Jan 16 14:42:35 CET 2013 - snw...@suse.de
+
+- drop /etc/nothing
+
+-------------------------------------------------------------------
+Tue Jan 15 15:41:14 CET 2013 - snw...@suse.de
+
+- support https
+
+-------------------------------------------------------------------
Old:
----
linuxrc-4.1.2.tar.bz2
New:
----
linuxrc-4.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.rNQA9b/_old 2013-01-17 09:48:39.000000000 +0100
+++ /var/tmp/diff_new_pack.rNQA9b/_new 2013-01-17 09:48:39.000000000 +0100
@@ -24,9 +24,9 @@
Summary: SUSE Installation Program
License: GPL-3.0+
Group: System/Boot
-Version: 4.1.2
+Version: 4.1.4
Release: 0
-Source: linuxrc-4.1.2.tar.bz2
+Source: linuxrc-4.1.4.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-4.1.2.tar.bz2 -> linuxrc-4.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/VERSION new/linuxrc-4.1.4/VERSION
--- old/linuxrc-4.1.2/VERSION 2013-01-14 14:06:33.000000000 +0100
+++ new/linuxrc-4.1.4/VERSION 2013-01-16 14:42:31.000000000 +0100
@@ -1 +1 @@
-4.1.2
+4.1.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/changelog new/linuxrc-4.1.4/changelog
--- old/linuxrc-4.1.2/changelog 2013-01-14 14:06:35.000000000 +0100
+++ new/linuxrc-4.1.4/changelog 2013-01-16 14:42:32.000000000 +0100
@@ -1,4 +1,10 @@
-2013-01-14: HEAD
+2013-01-16: HEAD
+ - drop /etc/nothing
+
+2013-01-15: 4.1.3
+ - support https
+
+2013-01-14: 4.1.2
- fix segfault reading duds (bnc #798110)
2012-12-13: 4.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/dialog.c new/linuxrc-4.1.4/dialog.c
--- old/linuxrc-4.1.2/dialog.c 2012-11-26 13:43:57.000000000 +0100
+++ new/linuxrc-4.1.4/dialog.c 2013-01-15 14:27:39.000000000 +0100
@@ -74,6 +74,7 @@
{ di_netsource_smb, 0, "SMB / CIFS (Windows Share)" },
{ di_netsource_ftp, 0, "FTP" },
{ di_netsource_http, 0, "HTTP" },
+ { di_netsource_https, 0, "HTTPS" },
{ di_netsource_tftp, 0, "TFTP" },
{ di_info_kernel, TXT_INFO_KERNEL },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/dialog.h new/linuxrc-4.1.4/dialog.h
--- old/linuxrc-4.1.2/dialog.h 2012-11-26 13:43:57.000000000 +0100
+++ new/linuxrc-4.1.4/dialog.h 2013-01-15 14:27:22.000000000 +0100
@@ -60,6 +60,7 @@
di_netsource_smb,
di_netsource_ftp,
di_netsource_http,
+ di_netsource_https,
di_netsource_tftp,
di_info_kernel,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/file.c new/linuxrc-4.1.4/file.c
--- old/linuxrc-4.1.2/file.c 2012-11-26 13:43:57.000000000 +0100
+++ new/linuxrc-4.1.4/file.c 2013-01-15 14:56:09.000000000 +0100
@@ -272,6 +272,7 @@
{ key_ntfs_3g, "UseNTFS-3G", kf_cfg + kf_cmd + kf_cmd_early },
{ key_hash, "HASH", kf_cfg + kf_cont },
{ key_insecure, "Insecure", kf_cfg + kf_cmd + kf_cmd_early },
+ { key_sslcerts, "SSLCerts", kf_cfg + kf_cmd + kf_cmd_early },
{ key_kexec, "kexec", kf_cfg + kf_cmd },
{ key_kexec_reboot, "kexec_reboot", kf_cfg + kf_cmd },
{ key_nisdomain, "NISDomain", kf_dhcp },
@@ -328,6 +329,7 @@
{ "ftp", inst_ftp },
{ "smb", inst_smb },
{ "http", inst_http },
+ { "https", inst_https },
{ "tftp", inst_tftp },
{ "cd", inst_cdrom },
{ "floppy", inst_floppy },
@@ -1446,6 +1448,12 @@
}
break;
+ case key_sslcerts:
+ if(f->is.numeric && !f->nvalue) {
+ config.sslcerts = 0;
+ }
+ break;
+
case key_kexec:
if(f->is.numeric) config.kexec = f->nvalue;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/file.h new/linuxrc-4.1.4/file.h
--- old/linuxrc-4.1.2/file.h 2012-11-26 13:43:57.000000000 +0100
+++ new/linuxrc-4.1.4/file.h 2013-01-15 14:53:43.000000000 +0100
@@ -52,7 +52,7 @@
key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno,
key_osahwaddr, key_zen, key_zenconfig, key_udevrule, key_dhcpfail,
key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests,
- key_plymouth
+ key_plymouth, key_sslcerts
} file_key_t;
typedef enum {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/global.h new/linuxrc-4.1.4/global.h
--- old/linuxrc-4.1.2/global.h 2012-11-26 13:43:57.000000000 +0100
+++ new/linuxrc-4.1.4/global.h 2013-01-15 14:53:09.000000000 +0100
@@ -126,7 +126,7 @@
*/
typedef enum {
inst_none = 0, inst_file, inst_nfs, inst_ftp, inst_smb,
- inst_http, inst_tftp, inst_cdrom, inst_floppy, inst_hd,
+ inst_http, inst_https, inst_tftp, inst_cdrom, inst_floppy, inst_hd,
inst_dvd, inst_cdwithnet, inst_net, inst_slp, inst_exec,
inst_rel, inst_disk
} instmode_t;
@@ -336,6 +336,7 @@
unsigned has_pcmcia:1; /* we've seen a pcmcia chip */
unsigned ntfs_3g:1; /* use ntfs-3g */
unsigned secure:1; /* secure mode (check digest of all downloaded
files) */
+ unsigned sslcerts:1; /* whether to check ssl certificates */
unsigned sig_failed:2; /* signature check failed (1: not signed, 2:
wrong signature) */
unsigned kexec:1; /* kexec to kernel & initrd from repo */
unsigned kexec_reboot:1; /* kexec to installed system (just passed to
yast) */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/install.c new/linuxrc-4.1.4/install.c
--- old/linuxrc-4.1.2/install.c 2012-11-15 11:41:53.000000000 +0100
+++ new/linuxrc-4.1.4/install.c 2013-01-16 14:40:46.000000000 +0100
@@ -156,6 +156,7 @@
dia_item_t items[] = {
di_netsource_ftp,
di_netsource_http,
+ di_netsource_https,
di_netsource_nfs,
di_netsource_smb,
di_netsource_tftp,
@@ -174,6 +175,10 @@
di_inst_choose_netsource_last = di_netsource_http;
break;
+ case inst_https:
+ di_inst_choose_netsource_last = di_netsource_https;
+ break;
+
case inst_smb:
di_inst_choose_netsource_last = di_netsource_smb;
break;
@@ -223,6 +228,10 @@
err = inst_do_network(inst_http);
break;
+ case di_netsource_https:
+ err = inst_do_network(inst_https);
+ break;
+
case di_netsource_tftp:
err = inst_do_network(inst_tftp);
break;
@@ -732,7 +741,7 @@
if(!err && dia_input2(txt_get(TXT_INPUT_DIR), &path, 30, 0)) err = 1;
/* user, password */
- if(!err && (scheme == inst_http || scheme == inst_ftp)) {
+ if(!err && (scheme == inst_http || scheme == inst_https || scheme ==
inst_ftp)) {
if(!n_user) {
strprintf(&buf,
txt_get(TXT_USER_PW_SERVER),
@@ -788,7 +797,7 @@
}
/* proxy setup */
- if(!err && (scheme == inst_http || scheme == inst_ftp)) {
+ if(!err && (scheme == inst_http || scheme == inst_https || scheme ==
inst_ftp)) {
/* get current proxy values*/
if(config.url.proxy) {
@@ -905,7 +914,7 @@
str_copy(&config.url.install->domain, domain);
}
- if(scheme == inst_http || scheme == inst_ftp || scheme == inst_smb) {
+ if(scheme == inst_http || scheme == inst_http || scheme == inst_ftp ||
scheme == inst_smb) {
str_copy(&config.url.install->user, user);
str_copy(&config.url.install->password, password);
}
@@ -1096,8 +1105,6 @@
if(config.test) return;
- lxrc_set_modprobe("/etc/nothing");
-
lxrc_killall(0);
for(count = 0; count < 8; count++) {
@@ -1125,7 +1132,6 @@
}
if(!config.test) {
- lxrc_set_modprobe("/sbin/modprobe");
if(util_check_exist("/sbin/update")) system("/sbin/update");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/linuxrc.c new/linuxrc-4.1.4/linuxrc.c
--- old/linuxrc-4.1.2/linuxrc.c 2012-12-13 10:42:19.000000000 +0100
+++ new/linuxrc-4.1.4/linuxrc.c 2013-01-16 14:41:17.000000000 +0100
@@ -460,7 +460,6 @@
/* screen saver on */
if(!config.linemode) printf("\033[9;15]");
- lxrc_set_modprobe("/sbin/modprobe");
lxrc_set_bdflush(40);
LXRC_WAIT
@@ -726,6 +725,7 @@
config.kbd_fd = -1;
config.ntfs_3g = 1;
config.secure = 1;
+ config.sslcerts = 1;
config.squash = 1;
config.kexec_reboot = 1;
config.efi = -1;
@@ -861,7 +861,6 @@
config.download.instsys = config.memoryXXX.free >
config.memoryXXX.load_image ? 1 : 0;
}
- lxrc_set_modprobe("/etc/nothing");
lxrc_set_bdflush(5);
lxrc_check_console();
@@ -1228,19 +1227,6 @@
return (1);
}
-void lxrc_set_modprobe(char *prog)
-{
- FILE *f;
-
- /* do nothing if we have a modprobe */
- if(config.test || !config.nomodprobe) return;
-
- if((f = fopen("/proc/sys/kernel/modprobe", "w"))) {
- fprintf(f, "%s\n", prog);
- fclose(f);
- }
-}
-
/* Check if we start linuxrc on a serial console. On Intel and
Alpha, we look if the "console" parameter was used on the
@@ -1281,8 +1267,6 @@
if(!util_check_exist("/lbin")) mkdir("/lbin", 0755);
- if(!util_check_exist("/etc/nothing")) link(name, "/etc/nothing");
-
for(i = 0; (unsigned) i < sizeof lxrc_internal / sizeof *lxrc_internal; i++)
{
sprintf(buf, "/lbin/%s", lxrc_internal[i].name);
if(!util_check_exist(buf)) link(name, buf);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/linuxrc.h new/linuxrc-4.1.4/linuxrc.h
--- old/linuxrc-4.1.2/linuxrc.h 2011-08-09 10:57:09.000000000 +0200
+++ new/linuxrc-4.1.4/linuxrc.h 2013-01-16 14:40:58.000000000 +0100
@@ -8,7 +8,6 @@
extern void lxrc_killall (int);
extern void lxrc_end (void);
-extern void lxrc_set_modprobe(char *prog);
extern const char *lxrc_new_root;
void find_shell(void);
void lxrc_readd_parts(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/url.c new/linuxrc-4.1.4/url.c
--- old/linuxrc-4.1.2/url.c 2013-01-14 14:04:57.000000000 +0100
+++ new/linuxrc-4.1.4/url.c 2013-01-15 14:58:16.000000000 +0100
@@ -92,7 +92,8 @@
curl_easy_setopt(c_handle, CURLOPT_FAILONERROR, 1);
curl_easy_setopt(c_handle, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(c_handle, CURLOPT_MAXREDIRS, 10);
- curl_easy_setopt(c_handle, CURLOPT_SSL_VERIFYPEER, 0);
+ curl_easy_setopt(c_handle, CURLOPT_SSL_VERIFYPEER, config.sslcerts ? 1 : 0);
+ // curl_easy_setopt(c_handle, CURLOPT_SSL_VERIFYHOST, 2);
curl_easy_setopt(c_handle, CURLOPT_PROGRESSFUNCTION, url_progress_cb);
curl_easy_setopt(c_handle, CURLOPT_PROGRESSDATA, url_data);
@@ -558,6 +559,7 @@
url->scheme == inst_ftp ||
url->scheme == inst_smb ||
url->scheme == inst_http ||
+ url->scheme == inst_https ||
url->scheme == inst_tftp
) {
url->is.network = 1;
@@ -757,6 +759,7 @@
scheme != inst_file &&
scheme != inst_ftp &&
scheme != inst_http &&
+ scheme != inst_https &&
scheme != inst_nfs &&
scheme != inst_smb &&
scheme != inst_tftp
@@ -1223,6 +1226,7 @@
break;
case inst_http:
+ case inst_https:
case inst_ftp:
case inst_tftp:
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.1.2/util.c new/linuxrc-4.1.4/util.c
--- old/linuxrc-4.1.2/util.c 2012-12-13 10:32:04.000000000 +0100
+++ new/linuxrc-4.1.4/util.c 2013-01-15 14:56:31.000000000 +0100
@@ -1179,6 +1179,7 @@
add_flag(&sl0, buf, config.net.all_ifs, "all_ifs");
add_flag(&sl0, buf, config.ntfs_3g, "ntfs-3g");
add_flag(&sl0, buf, config.secure, "secure");
+ add_flag(&sl0, buf, config.sslcerts, "sslcerts");
add_flag(&sl0, buf, config.mediacheck, "mediacheck");
add_flag(&sl0, buf, config.net.ipv4, "ipv4");
add_flag(&sl0, buf, config.net.ipv6, "ipv6");
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
