Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2023-07-06 18:28:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.23466 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Thu Jul 6 18:28:27 2023 rev:315 rq:1096973 version:9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2023-02-09
16:22:03.918360076 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.23466/linuxrc.changes
2023-07-06 18:28:32.503097429 +0200
@@ -1,0 +2,9 @@
+Wed Jul 5 14:15:18 UTC 2023 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#321
+- adjust code to updated libhd API
+- fix mediacheck test for valid app_id
+- replace obsolete CURLOPT_PROGRESSFUNCTION
+- 9.0
+
+--------------------------------------------------------------------
Old:
----
linuxrc-8.20.tar.xz
New:
----
linuxrc-9.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.nsBmfs/_old 2023-07-06 18:28:33.587104084 +0200
+++ /var/tmp/diff_new_pack.nsBmfs/_new 2023-07-06 18:28:33.595104133 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 8.20
+Version: 9.0
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-8.20.tar.xz -> linuxrc-9.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/VERSION new/linuxrc-9.0/VERSION
--- old/linuxrc-8.20/VERSION 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/VERSION 2023-07-05 16:15:18.000000000 +0200
@@ -1 +1 @@
-8.20
+9.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/changelog new/linuxrc-9.0/changelog
--- old/linuxrc-8.20/changelog 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/changelog 2023-07-05 16:15:18.000000000 +0200
@@ -1,3 +1,9 @@
+2023-07-05: 9.0
+ - merge gh#openSUSE/linuxrc#321
+ - adjust code to updated libhd API
+ - fix mediacheck test for valid app_id
+ - replace obsolete CURLOPT_PROGRESSFUNCTION
+
2023-02-08: 8.20
- really parse 'firmwaretype' key (bsc#1208042)
- merge gh#openSUSE/linuxrc#318
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/checkmedia.c
new/linuxrc-9.0/checkmedia.c
--- old/linuxrc-8.20/checkmedia.c 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/checkmedia.c 2023-07-05 16:15:18.000000000 +0200
@@ -60,7 +60,7 @@
return 1;
}
- if(media->app_id) log_info("app: %s\n", media->app_id);
+ if(*media->app_id) log_info("app: %s\n", media->app_id);
if(media->iso_blocks) {
log_info(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/global.h new/linuxrc-9.0/global.h
--- old/linuxrc-8.20/global.h 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/global.h 2023-07-05 16:15:18.000000000 +0200
@@ -15,9 +15,6 @@
#include <blkid/blkid.h>
#include <hd.h>
-extern str_list_t *search_str_list(str_list_t *sl, char *str);
-extern str_list_t *add_str_list(str_list_t **sl, char *str);
-extern char *hd_join(char *del, str_list_t *str);
/* lang_undef _must_ be 0 */
enum langid_t {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/linuxrc.c new/linuxrc-9.0/linuxrc.c
--- old/linuxrc-8.20/linuxrc.c 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/linuxrc.c 2023-07-05 16:15:18.000000000 +0200
@@ -953,7 +953,7 @@
if (config.linemode)
putchar('\n');
printf(
- "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2021 SUSE
LLC %s <<<\n",
+ "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2023 SUSE
LLC %s <<<\n",
config.product,
config.platform_name
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/scsi_rename.c
new/linuxrc-9.0/scsi_rename.c
--- old/linuxrc-8.20/scsi_rename.c 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/scsi_rename.c 2023-07-05 16:15:18.000000000 +0200
@@ -48,11 +48,6 @@
}
-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;
@@ -63,7 +58,7 @@
scsi_list = calloc(MAX_SCSI_DEVS + 1, sizeof *scsi_list);
- sf_class = reverse_str_list(read_dir("/sys/block", 'D'));
+ sf_class = hd_reverse_str_list(hd_read_dir("/sys/block", 'D'));
if(!sf_class) {
log_info("no block devices\n");
@@ -107,7 +102,7 @@
}
free(sf_cdev);
- sf_class = free_str_list(sf_class);
+ sf_class = hd_free_str_list(sf_class);
if(scsi_list_len) {
qsort(scsi_list, scsi_list_len, sizeof *scsi_list, cmp_func);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/url.c new/linuxrc-9.0/url.c
--- old/linuxrc-8.20/url.c 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/url.c 2023-07-05 16:15:18.000000000 +0200
@@ -52,7 +52,7 @@
};
static size_t url_write_cb(void *buffer, size_t size, size_t nmemb, void
*userp);
-static int url_progress_cb(void *clientp, double dltotal, double dlnow, double
ultotal, double ulnow);
+static int url_progress_cb(void *clientp, curl_off_t dltotal, curl_off_t
dlnow, curl_off_t ultotal, curl_off_t ulnow);
static int url_read_file_nosig(url_t *url, char *dir, char *src, char *dst,
char *label, unsigned flags);
static int url_mount_really(url_t *url, char *device, char *dir);
@@ -159,8 +159,8 @@
curl_easy_setopt(c_handle, CURLOPT_SSL_VERIFYHOST, config.sslcerts ? 2 : 0);
curl_easy_setopt(c_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
- curl_easy_setopt(c_handle, CURLOPT_PROGRESSFUNCTION, url_progress_cb);
- curl_easy_setopt(c_handle, CURLOPT_PROGRESSDATA, url_data);
+ curl_easy_setopt(c_handle, CURLOPT_XFERINFOFUNCTION, url_progress_cb);
+ curl_easy_setopt(c_handle, CURLOPT_XFERINFODATA, url_data);
curl_easy_setopt(c_handle, CURLOPT_NOPROGRESS, 0);
if(config.net.ipv6 && !config.net.ipv4) {
@@ -387,7 +387,7 @@
}
-int url_progress_cb(void *clientp, double dltotal, double dlnow, double
ultotal, double ulnow)
+int url_progress_cb(void *clientp, curl_off_t dltotal, curl_off_t dlnow,
curl_off_t ultotal, curl_off_t ulnow)
{
url_data_t *url_data = clientp;
@@ -1415,10 +1415,10 @@
/* update */
if(url_data->p_total) {
- percent = (100 * (uint64_t) url_data->p_now) / url_data->p_total;
+ percent = (100 * url_data->p_now) / url_data->p_total;
}
else if(url_data->zp_total) {
- percent = (100 * (uint64_t) url_data->zp_now) / url_data->zp_total;
+ percent = (100 * url_data->zp_now) / url_data->zp_total;
}
if(percent > 100) percent = 100;
@@ -1432,7 +1432,7 @@
strprintf(&buf, "Loading %s", url_print(url_data->url, 0));
}
if(percent >= 0) {
- strprintf(&buf, "%s (%u kB)",
+ strprintf(&buf, "%s (%" PRIu64 " kB)",
buf,
((url_data->zp_total ?: url_data->p_total) + 1023) >> 10
);
@@ -1443,7 +1443,7 @@
else {
if(percent >= 0) {
strprintf(&buf,
- " (%u kB) - ",
+ " (%" PRIu64 " kB) - ",
((url_data->zp_total ?: url_data->p_total) + 1023) >> 10
);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/url.h new/linuxrc-9.0/url.h
--- old/linuxrc-8.20/url.h 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/url.h 2023-07-05 16:15:18.000000000 +0200
@@ -8,8 +8,8 @@
char *err_buf;
char *curl_err_buf;
unsigned err_buf_len;
- unsigned p_now, p_total;
- unsigned zp_now, zp_total;
+ uint64_t p_now, p_total;
+ uint64_t zp_now, zp_total;
unsigned z_progress:1;
unsigned flush:1;
unsigned cramfs:1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.20/util.c new/linuxrc-9.0/util.c
--- old/linuxrc-8.20/util.c 2023-02-08 11:01:27.000000000 +0100
+++ new/linuxrc-9.0/util.c 2023-07-05 16:15:18.000000000 +0200
@@ -3131,13 +3131,13 @@
}
else {
for(sl = config.disks; sl; sl = sl->next) {
- if(!search_str_list(hd_data->disks, sl->key)) {
+ if(!hd_search_str_list(hd_data->disks, sl->key)) {
str_copy(&sl->key, NULL);
str_copy(&sl->value, NULL);
}
}
for(sl = config.partitions; sl; sl = sl->next) {
- if(!search_str_list(hd_data->partitions, sl->key)) {
+ if(!hd_search_str_list(hd_data->partitions, sl->key)) {
str_copy(&sl->key, NULL);
str_copy(&sl->value, NULL);
}
