Hello community, here is the log from the commit of package unetbootin for openSUSE:Factory checked in at 2020-09-21 17:33:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unetbootin (Old) and /work/SRC/openSUSE:Factory/.unetbootin.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unetbootin" Mon Sep 21 17:33:07 2020 rev:10 rq:835430 version:0.0.681 Changes: -------- --- /work/SRC/openSUSE:Factory/unetbootin/unetbootin.changes 2019-04-23 14:39:23.521589341 +0200 +++ /work/SRC/openSUSE:Factory/.unetbootin.new.4249/unetbootin.changes 2020-09-21 17:40:56.960784604 +0200 @@ -1,0 +2,9 @@ +Tue Sep 8 08:37:29 UTC 2020 - ecsos <[email protected]> + +- Update to revision 681 +- Change selectable openSUSE versions only to supported versions: + Leap_15.1, Leap_15.2, Tumbleweed, Factory +- Rebase patches. +- Run spec-cleaner + +------------------------------------------------------------------- Old: ---- unetbootin-source-661.tar.gz New: ---- unetbootin-source-681.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unetbootin.spec ++++++ --- /var/tmp/diff_new_pack.mmFwnL/_old 2020-09-21 17:41:01.252787716 +0200 +++ /var/tmp/diff_new_pack.mmFwnL/_new 2020-09-21 17:41:01.256787718 +0200 @@ -1,7 +1,7 @@ # # spec file for package unetbootin # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define rev 661 +%define rev 681 Name: unetbootin Version: 0.0.%{rev} Release: 0 @@ -24,7 +24,8 @@ License: GPL-2.0-or-later Group: System/GUI/Other URL: https://sourceforge.net/projects/unetbootin/ -Source: %{name}-source-%{rev}.tar.gz +#Source: %%{name}-source-%%{rev}.tar.gz +Source: https://downloads.sourceforge.net/project/unetbootin/UNetbootin/%{rev}/unetbootin-source-%{rev}.tar.gz Patch0: 0001-rought-Qt5-port.patch Patch1: 0002-comment-out-all-sources-that-require-FTP-LIST.patch Patch2: 0003-fix-distrolst.cpp.patch @@ -50,7 +51,7 @@ # Requires syslinux, and that only exists for the following arches: ExclusiveArch: %{ix86} x86_64 # Remove when p7zip-full is in all products -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} >= 1500 Requires: p7zip-full %else Requires: p7zip @@ -78,7 +79,7 @@ lupdate-qt5 unetbootin.pro lrelease-qt5 unetbootin.pro %qmake5 "DEFINES += NOSTATIC" "RESOURCES -= unetbootin.qrc" -make %{?_smp_mflags} +%make_build %install install -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name} ++++++ 0001-rought-Qt5-port.patch ++++++ --- /var/tmp/diff_new_pack.mmFwnL/_old 2020-09-21 17:41:01.276787733 +0200 +++ /var/tmp/diff_new_pack.mmFwnL/_new 2020-09-21 17:41:01.276787733 +0200 @@ -11,11 +11,11 @@ unetbootin.pro | 1 + 4 files changed, 84 insertions(+), 147 deletions(-) -diff --git a/main.cpp b/main.cpp -index 486b75b..1ef7304 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -9,6 +9,8 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY +Index: unetbootin/main.cpp +=================================================================== +--- unetbootin.orig/main.cpp ++++ unetbootin/main.cpp +@@ -9,6 +9,8 @@ This program is distributed in the hope #include "unetbootin.h" @@ -24,7 +24,7 @@ #ifdef Q_OS_WIN32 void configsysUndo(QString uninstPathL) -@@ -380,18 +382,16 @@ int main(int argc, char **argv) +@@ -403,18 +405,16 @@ int main(int argc, char **argv) uninstmsgb.setIcon(QMessageBox::Information); uninstmsgb.setWindowTitle(uninstaller::tr("%1 Uninstaller").arg(UNETBOOTINB)); uninstmsgb.setText(uninstaller::tr("%1 is currently installed. Remove the existing version?").arg(UNETBOOTINB)); @@ -53,11 +53,11 @@ return 0; } #endif -diff --git a/unetbootin.cpp b/unetbootin.cpp -index 3982f61..0767fc8 100644 ---- a/unetbootin.cpp -+++ b/unetbootin.cpp -@@ -9,6 +9,10 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY +Index: unetbootin/unetbootin.cpp +=================================================================== +--- unetbootin.orig/unetbootin.cpp ++++ unetbootin/unetbootin.cpp +@@ -9,6 +9,10 @@ This program is distributed in the hope #include "unetbootin.h" @@ -96,7 +96,7 @@ randtmpfile::randtmpfile(QString rfpath, QString rfextn) { QString basefn = getrandfilename(rfpath, rfextn); -@@ -159,7 +153,7 @@ QString randtmpfile::getrandfilename(QString rfpath, QString rfextn) +@@ -159,7 +153,7 @@ QString randtmpfile::getrandfilename(QSt } return basefn; } @@ -105,7 +105,7 @@ void nDirListStor::sAppendSelfUrlInfoList(QUrlInfo curDirUrl) { if (curDirUrl.isValid() && curDirUrl.isReadable() && curDirUrl.isFile() && curDirUrl.size() > nMinFileSizeBytes && curDirUrl.size() < nMaxFileSizeBytes) -@@ -171,7 +165,7 @@ void nDirListStor::sAppendSelfUrlInfoList(QUrlInfo curDirUrl) +@@ -171,7 +165,7 @@ void nDirListStor::sAppendSelfUrlInfoLis nDirFileListSL.append(curDirUrl.name()); } } @@ -114,7 +114,7 @@ unetbootin::unetbootin(QWidget *parent) : QWidget(parent) { -@@ -471,18 +465,20 @@ bool unetbootin::ubninitialize(QList<QPair<QString, QString> > oppairs) +@@ -471,18 +465,20 @@ bool unetbootin::ubninitialize(QList<QPa { if (psecond.contains("listdistros", Qt::CaseInsensitive)) { @@ -137,7 +137,7 @@ } QApplication::exit(); exit(0); -@@ -1098,7 +1094,7 @@ bool unetbootin::checkifoutofspace(QString destindir) +@@ -1098,7 +1094,7 @@ bool unetbootin::checkifoutofspace(QStri bool outofspace = false; #ifdef Q_OS_UNIX struct statfs diskstatS; @@ -146,7 +146,7 @@ { if (diskstatS.f_bavail * diskstatS.f_bfree < 1024) outofspace = true; -@@ -2620,31 +2616,41 @@ void unetbootin::downloadfile(QString fileurl, QString targetfile, int minsize=5 +@@ -2620,31 +2616,41 @@ void unetbootin::downloadfile(QString fi { rmFile(targetfile); } @@ -203,7 +203,7 @@ QFile dloutfile; if (installType == tr("USB Drive")) { -@@ -2654,83 +2660,17 @@ void unetbootin::downloadfile(QString fileurl, QString targetfile, int minsize=5 +@@ -2654,83 +2660,17 @@ void unetbootin::downloadfile(QString fi { dloutfile.setFileName(targetfile); } @@ -292,7 +292,7 @@ if (QFile(targetfile).size() < minsize) { // download failed -@@ -2812,31 +2752,33 @@ void unetbootin::cpprogressupdate64(qint64 dlbytes, qint64 maxbytes) +@@ -2812,31 +2752,33 @@ void unetbootin::cpprogressupdate64(qint } } @@ -342,7 +342,7 @@ QUrl ldfDirUrl(ldfDirStringUrl); QFtp ldfFtp; QEventLoop ldfWait; -@@ -2851,14 +2793,14 @@ QStringList unetbootin::lstFtpDirFiles(QString ldfDirStringUrl, int ldfMinSize, +@@ -2851,14 +2793,14 @@ QStringList unetbootin::lstFtpDirFiles(Q ldfFtp.list(ldfDirUrl.path()); ldfWait.exec(); ldfFtp.close(); @@ -359,7 +359,7 @@ .replace(">", ">\n") .replace("<", "\n<") .split("\n"); -@@ -3218,11 +3160,11 @@ int unetbootin::letterToNumber(QChar lettertoconvert) +@@ -3218,11 +3160,11 @@ int unetbootin::letterToNumber(QChar let { if (lettertoconvert.isLower()) { @@ -373,37 +373,10 @@ } else { -@@ -3724,7 +3666,7 @@ void unetbootin::writegrub2cfg() - QString menulstxt = QString( - "%9\n\n" - #ifndef NODEFAULTBOOT -- "\nmenuentry \""UNETBOOTINB"\" {\n" -+ "\nmenuentry \"" UNETBOOTINB"\" {\n" - "\tset root=%8\n" - "\t%1 %2 %3 %4\n" - "\t%5 %6 %7\n" -@@ -3845,7 +3787,7 @@ void unetbootin::runinsthdd() - "timeout 10\n" - #endif - #ifndef NODEFAULTBOOT -- "\ntitle "UNETBOOTINB"\n" -+ "\ntitle " UNETBOOTINB"\n" - #ifdef Q_OS_WIN32 - "find --set-root %3\n" - #endif -@@ -4343,7 +4285,7 @@ void unetbootin::fininstall() - sdesc4->setText(QString("<b>%1 %2</b>").arg(sdesc4->text()).arg(trcurrent)); - if (installType == tr("Hard Disk")) - { -- rebootmsgtext->setText(tr("After rebooting, select the "UNETBOOTINB" menu entry to boot.%1").arg(postinstmsg)); -+ rebootmsgtext->setText(tr("After rebooting, select the " UNETBOOTINB" menu entry to boot.%1").arg(postinstmsg)); - } - if (installType == tr("USB Drive")) - { -diff --git a/unetbootin.h b/unetbootin.h -index ea607c8..8cb45d8 100644 ---- a/unetbootin.h -+++ b/unetbootin.h +Index: unetbootin/unetbootin.h +=================================================================== +--- unetbootin.orig/unetbootin.h ++++ unetbootin/unetbootin.h @@ -152,19 +152,13 @@ signals: void finished(); }; @@ -443,10 +416,10 @@ QStringList lstFtpDirFiles(QString ldfDirStringUrl, int ldfMinSize, int ldfMaxSize); QStringList lstHttpDirFiles(QString ldfDirStringUrl); QStringList lstNetDirFiles(QString ldfDirStringUrl, int ldfMinSize, int ldfMaxSize); -diff --git a/unetbootin.pro b/unetbootin.pro -index 3d4cece..f3af65f 100644 ---- a/unetbootin.pro -+++ b/unetbootin.pro +Index: unetbootin/unetbootin.pro +=================================================================== +--- unetbootin.orig/unetbootin.pro ++++ unetbootin/unetbootin.pro @@ -14,6 +14,7 @@ SOURCES += main.cpp \ distrovercust.cpp QT += core \ @@ -455,6 +428,3 @@ network ICON = unetbootin.icns TRANSLATIONS += unetbootin.ts \ --- -2.21.0 - ++++++ unetbootin-desktop.patch ++++++ --- /var/tmp/diff_new_pack.mmFwnL/_old 2020-09-21 17:41:01.300787750 +0200 +++ /var/tmp/diff_new_pack.mmFwnL/_new 2020-09-21 17:41:01.300787750 +0200 @@ -9,15 +9,14 @@ +GenericName=UNetbootin Comment=Tool for creating Live USB drives -Categories=Application;System; --Exec=/usr/bin/unetbootin --Terminal=false +-Exec=/usr/bin/unetbootin_asroot ++Categories=System;Filesystem; ++Exec=/usr/bin/xdg-su -c /usr/sbin/unetbootin + Terminal=false Type=Application -Name[en_US]=UNetbootin -GenericName[en_US]=UNetbootin -Comment[en_US]=Tool for creating Live USB drives -+Exec=/usr/bin/xdg-su -c /usr/sbin/unetbootin -+Terminal=false Icon=unetbootin -+Categories=System;Filesystem; +X-KDE-StartupNotify=true -+X-SuSE-translate=true ++X-SUSE-translate=true ++++++ unetbootin-source-661.tar.gz -> unetbootin-source-681.tar.gz ++++++ Binary files old/._INSTALL and new/._INSTALL differ Binary files old/._README.TXT and new/._README.TXT differ Binary files old/._distrolst.cpp and new/._distrolst.cpp differ Binary files old/._distrover.cpp and new/._distrover.cpp differ Binary files old/._entitlements.xml and new/._entitlements.xml differ Binary files old/._main.cpp and new/._main.cpp differ Binary files old/._mkrelease_github.js and new/._mkrelease_github.js differ Binary files old/._unetbootin.cpp and new/._unetbootin.cpp differ Binary files old/._unetbootin.h and new/._unetbootin.h differ Binary files old/._unetbootin.pro and new/._unetbootin.pro differ Binary files old/._unetbootin.ui and new/._unetbootin.ui differ Binary files old/._unetbootin_asroot and new/._unetbootin_asroot differ Binary files old/._vcs-revno and new/._vcs-revno differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/INSTALL new/INSTALL --- old/INSTALL 2014-04-05 08:33:19.000000000 +0200 +++ new/INSTALL 2019-09-29 02:26:32.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # you will need "qmake" and "libqt4-dev" to build this -# details at http://sourceforge.net/apps/trac/unetbootin/wiki/compile +# details at https://github.com/unetbootin/unetbootin/wiki/compile cp unetbootin.pro unetbootin-pro.bak sed -i '/^RESOURCES/d' unetbootin.pro @@ -10,4 +10,3 @@ qmake "DEFINES += NOSTATIC" "RESOURCES -= unetbootin.qrc" make mv unetbootin-pro.bak unetbootin.pro - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.TXT new/README.TXT --- old/README.TXT 2018-04-28 11:30:54.000000000 +0200 +++ new/README.TXT 2020-06-11 04:01:59.000000000 +0200 @@ -1,16 +1,16 @@ -UNetbootin Source Revision 631 +UNetbootin Source Revision 681 Copyright Geza Kovacs Homepage at http://unetbootin.sourceforge.net Licensed under the GNU GPL v2 and above, components from other projects are licensed under their respective licenses -Build generated on Sat Apr 28 02:30:54 PDT 2018 +Build generated on 2020年 6月10日 星期三 19时01分59秒 PDT Download using git: git clone https://github.com/gkovacs/unetbootin.git cd unetbootin -git checkout ba69d3cab4f41b260d526d9d4c5a406b06591697 +git checkout 62fbbd5983054275c38729a414d4f84dfdef4847 Download using bzr: -bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r631 +bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r681 Build instructions at http://sourceforge.net/apps/trac/unetbootin/wiki/compile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distrolst.cpp new/distrolst.cpp --- old/distrolst.cpp 2018-04-28 03:24:54.000000000 +0200 +++ new/distrolst.cpp 2020-06-10 20:55:17.000000000 +0200 @@ -11,13 +11,18 @@ #define debianrelnamereplace \ relname \ .replace("unstable", "sid") \ - .replace("testing", "stretch") \ - .replace("stable", "jessie"); + .replace("testing", "bullseye") \ + .replace("stable", "buster"); #endif #ifndef ubunturelnamereplace #define ubunturelnamereplace \ relname \ + .replace("20.10", "groovy") \ + .replace("20.04", "focal") \ + .replace("19.10", "eoan") \ + .replace("19.04", "disco") \ + .replace("18.10", "cosmic") \ .replace("18.04", "bionic") \ .replace("17.10", "artful") \ .replace("17.04", "zesty") \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distrover.cpp new/distrover.cpp --- old/distrover.cpp 2018-04-28 11:29:31.000000000 +0200 +++ new/distrover.cpp 2020-06-11 03:56:57.000000000 +0200 @@ -9,35 +9,35 @@ #ifndef ubuntuverlist #define ubuntuverlist \ -"14.04_NetInstall" << "14.04_NetInstall_x64" << "14.04_HdMedia" << "14.04_HdMedia_x64" << "14.04_Live" << "14.04_Live_x64" << \ "16.04_NetInstall" << "16.04_NetInstall_x64" << "16.04_HdMedia" << "16.04_HdMedia_x64" << "16.04_Live" << "16.04_Live_x64" << \ -"17.10_NetInstall" << "17.10_NetInstall_x64" << "17.10_HdMedia" << "17.10_HdMedia_x64" << "17.10_Live_x64" << \ "18.04_NetInstall" << "18.04_NetInstall_x64" << "18.04_HdMedia" << "18.04_HdMedia_x64" << "18.04_Live_x64" << \ +"19.10_NetInstall_x64" << "19.10_HdMedia_x64" << "19.10_Live_x64" << \ +"20.04_Live_x64" << \ "Daily_Live" << "Daily_Live_x64" #endif distroselect->addItem(unetbootin::tr("== Select Distribution =="), (QStringList() << unetbootin::tr("== Select Version ==") << -unetbootin::tr("Welcome to <a href=\"http://unetbootin.sourceforge.net/\";>UNetbootin</a>, the Universal Netboot Installer. Usage:" +unetbootin::tr("Welcome to <a href=\"https://unetbootin.github.io/\";>UNetbootin</a>, the Universal Netboot Installer. Usage:" "<ol><li>Select a distribution and version to download from the list above, or manually specify files to load below.</li>" "<li>Select an installation type, and press OK to begin installing.</li></ol>") << unetbootin::tr("== Select Version =="))); distroselect->addItem("Arch Linux", (QStringList() << "core" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.archlinux.org/\";>http://www.archlinux.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.archlinux.org/\";>https://www.archlinux.org</a><br/>" "<b>Description:</b> Arch Linux is a lightweight distribution optimized for speed and flexibility.<br/>" "<b>Install Notes:</b> The default version allows for installation over the internet (FTP).") << "core" << "core_x64" << "netinstall" << "netinstall_x64")); distroselect->addItem("BackTrack", (QStringList() << "5R1-GNOME" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.backtrack-linux.org/\";>http://www.backtrack-linux.org/</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.backtrack-linux.org/\";>https://www.backtrack-linux.org/</a><br/>" "<b>Description:</b> BackTrack is a distribution focused on network analysis and penetration testing.<br/>" "<b>Install Notes:</b> BackTrack is booted and run in live mode; no installation is required to use it.") << "5R1-GNOME" << "5R1-GNOME_x64" << "5R1-KDE" << "5R1-KDE_x64")); -distroselect->addItem("CentOS", (QStringList() << "6_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.centos.org/\";>http://www.centos.org</a><br/>" +distroselect->addItem("CentOS", (QStringList() << "8_Live" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.centos.org/\";>https://www.centos.org</a><br/>" "<b>Description:</b> CentOS is a free Red Hat Enterprise Linux clone.<br/>" "<b>Install Notes:</b> The default version allows for both installation over the internet (FTP), or offline installation using pre-downloaded installation ISO files.") << -"4" << "4_x64" << "5" << "5_x64" << "6" << "6_x64" << "6_Live" << "6_Live_x64")); +"4" << "4_x64" << "5" << "5_x64" << "6" << "6_x64" << "6_Live" << "6_Live_x64" << "7_Live" << "7_Live_x64" << "8_Live" << "8_Live_x64")); distroselect->addItem("CloneZilla", (QStringList() << "1.1.0-8" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://clonezilla.org/\";>http://clonezilla.org/</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://clonezilla.org/\";>https://clonezilla.org/</a><br/>" "<b>Description:</b> CloneZilla is a distribution used for disk backup and imaging.<br/>" "<b>Install Notes:</b> CloneZilla is booted and run in live mode; no installation is required to use it.") << "1.1.0-8")); @@ -47,48 +47,47 @@ "<b>Install Notes:</b> The Live version loads the entire system into RAM and boots from memory, so installation is not required but optional.") << "Latest_Live")); distroselect->addItem("Debian", (QStringList() << "Stable_NetInstall" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.debian.org/\";>http://www.debian.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.debian.org/\";>https://www.debian.org</a><br/>" "<b>Description:</b> Debian is a community-developed Linux distribution that supports a wide variety of architectures and offers a large repository of packages.<br/>" "<b>Install Notes:</b> The NetInstall version allows for installation over FTP. If you would like to use a pre-downloaded install iso, use the HdMedia option, and then place the install iso file on the root directory of your hard drive or USB drive") << "Stable_NetInstall" << "Stable_NetInstall_x64" << "Stable_HdMedia" << "Stable_HdMedia_x64" << "Testing_NetInstall" << "Testing_NetInstall_x64" << "Testing_HdMedia" << "Testing_HdMedia_x64" << "Unstable_NetInstall" << "Unstable_NetInstall_x64" << "Unstable_HdMedia" << "Unstable_HdMedia_x64")); // "Stable_NetInstall" << "Stable_NetInstall_x64" << "Stable_Live" << "Testing_NetInstall" << "Testing_NetInstall_x64" << "Testing_Live" << "Unstable_NetInstall" << "Unstable_NetInstall_x64" << "Unstable_Live")); distroselect->addItem("Dreamlinux", (QStringList() << "Latest_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.dreamlinux.com.br/\";>http://www.dreamlinux.com.br</a><br/>" - "<b>Description:</b> Dreamlinux is a user-friendly Debian-based distribution.<br/>" +unetbootin::tr("<b>Description:</b> Dreamlinux is a user-friendly Debian-based distribution.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << "Latest_Live")); distroselect->addItem("Dr.Web AntiVirus", (QStringList() << "Latest_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.freedrweb.com/livecd\";>http://www.freedrweb.com/livecd</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.freedrweb.com/livecd\";>https://www.freedrweb.com/livecd</a><br/>" "<b>Description:</b> Dr.Web AntiVirus is an anti-virus emergency kit to restore a system that broke due to malware.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which malware scans can be launched.") << "Latest_Live")); distroselect->addItem("Elive", (QStringList() << "Stable_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.elivecd.org/\";>http://www.elivecd.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.elivecd.org/\";>https://www.elivecd.org</a><br/>" "<b>Description:</b> Elive is a Debian-based distribution featuring the Enlightenment window manager.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << "Stable_Live")); -distroselect->addItem("Fedora", (QStringList() << "26_Live_x64" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://fedoraproject.org/\";>http://fedoraproject.org</a><br/>" +distroselect->addItem("Fedora", (QStringList() << "30_Live_x64" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://getfedora.org/\";>https://getfedora.org</a><br/>" "<b>Description:</b> Fedora is a Red Hat sponsored community distribution which showcases the latest cutting-edge free/open-source software.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for both installation over the internet (FTP), or offline installation using pre-downloaded installation ISO files.") << - "24_NetInstall" << "24_NetInstall_x64" << "24_Live" << "24_Live_x64" << "25_NetInstall" << "25_NetInstall_x64" << "25_Live" << "25_Live_x64" << "26_NetInstall_x64" << "26_Live_x64" << "Rawhide_NetInstall_x64")); + "24_NetInstall" << "24_NetInstall_x64" << "24_Live" << "24_Live_x64" << "25_NetInstall" << "25_NetInstall_x64" << "25_Live" << "25_Live_x64" << "26_NetInstall_x64" << "26_Live_x64" << "27_NetInstall_x64" << "27_Live_x64" << "28_NetInstall_x64" << "28_Live_x64" << "29_NetInstall_x64" << "29_Live_x64" << "30_NetInstall_x64" << "30_Live_x64" << "Rawhide_NetInstall_x64")); distroselect->addItem("FreeBSD", (QStringList() << "8.0" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.freebsd.org/\";>http://www.freebsd.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.freebsd.org/\";>https://www.freebsd.org</a><br/>" "<b>Description:</b> FreeBSD is a general-purpose Unix-like operating system designed for scalability and performance.<br/>" "<b>Install Notes:</b> The default version allows for both installation over the internet (FTP), or offline installation using pre-downloaded installation ISO files.") << "6.3" << "6.3_x64" << "7.0" << "7.0_x64" << "7.2" << "7.2_x64" << "8.0" << "8.0_x64")); distroselect->addItem("FreeDOS", (QStringList() << "1.0" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.freedos.org/\";>http://www.freedos.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.freedos.org/\";>https://www.freedos.org</a><br/>" "<b>Description:</b> FreeDOS is a free MS-DOS compatible operating system.<br/>" "<b>Install Notes:</b> See the <a href=\"http://fd-doc.sourceforge.net/wiki/index.php?n=FdDocEn.FdInstall\";>manual</a> for installation details.") << "1.0")); distroselect->addItem("FreeNAS", (QStringList() << "0.7.4919" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://freenas.org/\";>http://www.freenas.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://freenas.org/\";>https://www.freenas.org</a><br/>" "<b>Description:</b> FreeNAS is an embedded open source NAS (Network-Attached Storage) distribution based on FreeBSD.<br/>" "<b>Install Notes:</b> The LiveCD version creates a RAM drive for FreeNAS, and uses a FAT formatted floppy disk or USB key for saving the configuration file. The embedded version allows installation to hard disk.") << "0.7.1.5024_Live" << "0.7.1.4997_Live_x64")); distroselect->addItem("Frugalware", (QStringList() << "Stable" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://frugalware.org/\";>http://frugalware.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://frugalware.org/\";>https://frugalware.org</a><br/>" "<b>Description:</b> Frugalware is a general-purpose Slackware-based distro for advanced users.<br/>" "<b>Install Notes:</b> The default option allows for both installation over the internet (FTP), or offline installation using pre-downloaded installation ISO files.") << "Stable" << "Stable_x64" << "Testing" << "Testing_x64" << "Current" << "Current_x64")); @@ -98,7 +97,7 @@ // "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which malware scans can be launched.") << // "Latest_Live")); distroselect->addItem("GeeXboX", (QStringList() << "2.0-i386" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.geexbox.org/\";>http://www.geexbox.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.geexbox.org/\";>https://www.geexbox.org</a><br/>" "<b>Description:</b> GeeXboX is an Embedded Linux Media Center Distribution.<br/>") << "2.0-i386" << "2.0-x86_64")); //distroselect->addItem("Gentoo", (QStringList() << "2008.0_Live" << //unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.gentoo.org/\";>http://www.gentoo.org</a><br/>" @@ -116,47 +115,46 @@ "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << "Latest_Live")); distroselect->addItem("Gujin", (QStringList() << "2.4" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://gujin.sourceforge.net/\";>http://gujin.sourceforge.net</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://sourceforge.net/projects/gujin/\";>https://sourceforge.net/projects/gujin</a><br/>" "<b>Description:</b> Gujin is a graphical boot manager which can bootstrap various volumes and files.<br/>" "<b>Install Notes:</b> Gujin simply boots and runs; no installation is required to use it.") << "2.4")); distroselect->addItem("Kaspersky Rescue Disk", (QStringList() << "10_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://ftp.kaspersky.com/devbuilds/RescueDisk/\";>http://ftp.kaspersky.com/devbuilds/RescueDisk/</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://support.kaspersky.com/14229/\";>https://support.kaspersky.com/14229</a><br/>" "<b>Description:</b> Kaspersky Rescue Disk detects and removes malware from your Windows installation.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which malware scans can be launched.") << "10_Live" << "8_Live")); - distroselect->addItem("Kubuntu", (QStringList() << "18.04_Live_x64" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.kubuntu.org/\";>http://www.kubuntu.org</a><br/>" + distroselect->addItem("Kubuntu", (QStringList() << "20.04_Live_x64" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.kubuntu.org/\";>https://www.kubuntu.org</a><br/>" "<b>Description:</b> Kubuntu is an official Ubuntu derivative featuring the KDE desktop.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") << ubuntuverlist)); distroselect->addItem("LinuxConsole", (QStringList() << "1.0.2010-cd" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://linuxconsole.org/\";>http://linuxconsole.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://linuxconsole.org/\";>https://linuxconsole.org</a><br/>" "<b>Description:</b> LinuxConsole is a desktop distro to play games, easy to install, easy to use and fast to boot .<br/>" "<b>Install Notes:</b> The 1.0.2010 is latest 1.0, now available on rolling release (run liveuptate to update modules and kernel).") << "1.0.2010-cd")); - distroselect->addItem("Linux Mint", (QStringList() << "17.2_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://linuxmint.com/\";>http://linuxmint.com</a><br/>" + distroselect->addItem("Linux Mint", (QStringList() << "19.2_Live" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://linuxmint.com/\";>https://linuxmint.com</a><br/>" "<b>Description:</b> Linux Mint is a user-friendly Ubuntu-based distribution which includes additional proprietary codecs and other software by default.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << - "17_Live" << "17_Live_x64" << "17.1_Live" << "17.1_Live_x64" << "17.2_Live" << "17.2_Live_x64")); -distroselect->addItem("Lubuntu", (QStringList() << "18.04_Live_x64" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.lubuntu.net/\";>http://www.lubuntu.net</a><br/>" + "19.2_Live" << "19.2_Live_x64")); +distroselect->addItem("Lubuntu", (QStringList() << "20.04_Live_x64" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.lubuntu.net/\";>https://www.lubuntu.net</a><br/>" "<b>Description:</b> Lubuntu is an official Ubuntu derivative featuring the LXDE desktop.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") << ubuntuverlist)); distroselect->addItem("Mandriva", (QStringList() << "2008.1_NetInstall" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.mandriva.com/\";>http://www.mandriva.com/</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.openmandriva.org/\";>https://www.openmandriva.org/</a><br/>" "<b>Description:</b> Mandriva is a user-friendly distro formerly known as Mandrake Linux.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over the internet (FTP) or via pre-downloaded <a href=\"http://www.mandriva.com/en/download\";>\"Free\" iso image files</a>.") << "2008.0_NetInstall" << "2008.0_NetInstall_x64" << "2008.1_NetInstall" << "2008.1_NetInstall_x64")); distroselect->addItem("MEPIS", (QStringList() << "SimplyMEPIS" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.mepis.org/\";>http://www.mepis.org</a><br/>" - "<b>Description:</b> MEPIS is a Debian-based distribution. SimplyMEPIS is a user-friendly version based on KDE, while AntiX is a lightweight version for older computers.<br/>" +unetbootin::tr("<b>Description:</b> MEPIS is a Debian-based distribution. SimplyMEPIS is a user-friendly version based on KDE, while AntiX is a lightweight version for older computers.<br/>" "<b>Install Notes:</b> MEPIS supports booting in Live mode, from which the installer can optionally be launched.") << "SimplyMEPIS" << "SimplyMEPIS_x64" << "AntiX")); distroselect->addItem("NetbootCD", (QStringList() << "Latest" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://netbootcd.tuxfamily.org/\";>http://netbootcd.tuxfamily.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://netbootcd.us/\";>https://netbootcd.us/</a><br/>" "<b>Description:</b> NetbootCD is a small boot CD that downloads and boots network-based installers for other distributions.<br/>" "<b>Install Notes:</b> NetbootCD boots and runs in live mode.") << "Latest")); @@ -171,12 +169,12 @@ "<b>Install Notes:</b> NimbleX boots in Live mode.") << "Latest_Live")); distroselect->addItem("NTPasswd", (QStringList() << "2011.05.11" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://pogostick.net/~pnh/ntpasswd/\";>http://pogostick.net/~pnh/ntpasswd/</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://pogostick.net/~pnh/ntpasswd/\";>https://pogostick.net/~pnh/ntpasswd/</a><br/>" "<b>Description:</b> The Offline NT Password and Registry Editor can reset Windows passwords and edit the registry on Windows 2000-Vista.<br/>" "<b>Install Notes:</b> NTPasswd is booted and run in live mode; no installation is required to use it.") << "2008.05.26" << "2011.05.11")); distroselect->addItem("openSUSE", (QStringList() << "11.1" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.opensuse.org/\";>http://www.opensuse.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.opensuse.org/\";>https://www.opensuse.org</a><br/>" "<b>Description:</b> openSUSE is a user-friendly Novell sponsored distribution.<br/>" "<b>Install Notes:</b> The default version allows for both installation over the internet (FTP), or offline installation using pre-downloaded installation ISO files.") << "11.1" << "11.1_x64" << "Factory" << "Factory_x64")); @@ -186,7 +184,7 @@ "<b>Install Notes:</b> Ophcrack is booted and run in live mode; no installation is required to use it.") << "XP-LiveCD-2.0" << "Vista-LiveCD-2.0")); distroselect->addItem("Parted Magic", (QStringList() << "2.1_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://partedmagic.com/\";>http://partedmagic.com</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://partedmagic.com/\";>https://partedmagic.com</a><br/>" "<b>Description:</b> Parted Magic includes the GParted partition manager and other system utilities which can resize, copy, backup, and manipulate disk partitions.<br/>" "<b>Install Notes:</b> Parted Magic is booted and run in live mode; no installation is required to use it.") << "2.1_Live")); @@ -201,12 +199,12 @@ "<b>Install Notes:</b> The Live version loads the entire system into RAM and boots from memory, so installation is not required but optional.") << "Latest_Live")); distroselect->addItem("Sabayon Linux", (QStringList() << "5.2" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.sabayonlinux.org/\";>http://www.sabayonlinux.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.sabayon.org/\";>https://www.sabayon.org</a><br/>" "<b>Description:</b> Sabayon Linux is a Gentoo-based Live DVD distribution which features the Entropy binary package manager in addition to the source-based Portage.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The LiteMCE edition is 2 GB, while the full edition will need an 8 GB USB drive") << "5.1" << "5.1_x64" << "5.2" << "5.2_x64")); distroselect->addItem("Salix", (QStringList() << "13.37_Live_Xfce" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://salixos.org\";>http://salixos.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://salixos.org\";>https://salixos.org</a><br/>" "<b>Description:</b> Salix is a GNU/Linux distribution based on Slackware (fully compatible) that is simple, fast and easy to use.<br/>" "Like a bonsai, Salix is small, light & the product of infinite care.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.<br/>" @@ -218,7 +216,7 @@ "Latest_HdMedia_Fluxbox" << "Latest_HdMedia_Fluxbox_x64" << "Latest_HdMedia_KDE" << "Latest_HdMedia_KDE_x64" << "Latest_HdMedia_LXDE" << "Latest_HdMedia_LXDE_x64" << "Latest_HdMedia_Ratpoison" << "Latest_HdMedia_Ratpoison_x64" << "Latest_HdMedia_Xfce" << "Latest_HdMedia_Xfce_x64" << "Latest_Live_Fluxbox" << "Latest_Live_Fluxbox_x64" << "Latest_Live_KDE" << "Latest_Live_KDE_x64" << "Latest_Live_LXDE" << "Latest_Live_LXDE_x64" << "Latest_Live_Ratpoison" << "Latest_Live_Ratpoison_x64" << "Latest_Live_Xfce" << "Latest_Live_Xfce_x64")); distroselect->addItem("Slax", (QStringList() << "Latest_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.slax.org/\";>http://www.slax.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.slax.org/\";>https://www.slax.org</a><br/>" "<b>Description:</b> Slax is a Slackware-based distribution featuring the KDE desktop.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << "Latest_Live")); @@ -233,13 +231,12 @@ "<b>Install Notes:</b> SBM simply boots and runs; no installation is required to use it.") << "3.7")); distroselect->addItem("Super Grub Disk", (QStringList() << "Latest" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.supergrubdisk.org\";>http://www.supergrubdisk.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.supergrubdisk.org\";>https://www.supergrubdisk.org</a><br/>" "<b>Description:</b> Super Grub Disk is a bootloader which can perform a variety of MBR and bootloader recovery tasks.<br/>" "<b>Install Notes:</b> SGD simply boots and runs; no installation is required to use it.") << "Latest")); distroselect->addItem("Super OS", (QStringList() << "Latest_Live" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://hacktolive.org/wiki/Super_OS\";>http://hacktolive.org/wiki/Super_OS</a><br/>" - "<b>Description:</b> Super OS is an unofficial derivative of Ubuntu which includes additional software by default. Requires a 2GB USB drive to install.<br/>" +unetbootin::tr("<b>Description:</b> Super OS is an unofficial derivative of Ubuntu which includes additional software by default. Requires a 2GB USB drive to install.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << "Latest_Live")); //distroselect->addItem("SystemRescueCD", (QStringList() << "Latest_Live" << @@ -247,8 +244,8 @@ // "<b>Description:</b> SystemRescueCD includes various partition management and data recovery and backup tools.<br/>" // "<b>Install Notes:</b> SystemRescueCD is booted and run in live mode; no installation is required to use it.") << //"Latest_Live")); -distroselect->addItem("Ubuntu", (QStringList() << "18.04_Live_x64" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.ubuntu.com/\";>http://www.ubuntu.com</a><br/>" +distroselect->addItem("Ubuntu", (QStringList() << "20.04_Live_x64" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.ubuntu.com/\";>https://www.ubuntu.com</a><br/>" "<b>Description:</b> Ubuntu is a user-friendly Debian-based distribution. It is currently the most popular Linux desktop distribution.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") << ubuntuverlist)); @@ -257,13 +254,13 @@ "<b>Description:</b> xPUD is a lightweight distribution featuring a simple kiosk-like interface with a web browser and media player.<br/>" "<b>Install Notes:</b> The Live version loads the entire system into RAM and boots from memory.") << "Stable_Live" << "Unstable_Live")); -distroselect->addItem("Xubuntu", (QStringList() << "18.04_Live_x64" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.xubuntu.org/\";>http://www.xubuntu.org</a><br/>" +distroselect->addItem("Xubuntu", (QStringList() << "20.04_Live_x64" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.xubuntu.org/\";>https://www.xubuntu.org</a><br/>" "<b>Description:</b> Xubuntu is an official Ubuntu derivative featuring the XFCE desktop.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") << ubuntuverlist)); distroselect->addItem("Zenwalk", (QStringList() << "5.2" << -unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.zenwalk.org/\";>http://www.zenwalk.org</a><br/>" +unetbootin::tr("<b>Homepage:</b> <a href=\"https://zenwalkgnulinux.blogspot.com/\";>https://zenwalkgnulinux.blogspot.com</a><br/>" "<b>Description:</b> Zenwalk is a Slackware-based distribution featuring the XFCE desktop.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << "5.2")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/entitlements.xml new/entitlements.xml --- old/entitlements.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/entitlements.xml 2020-01-21 10:39:54.000000000 +0100 @@ -0,0 +1,23 @@ +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";> +<plist version="1.0"> + <dict> + <key>com.apple.security.files.downloads.read-only</key> + <true/> + <key>com.apple.security.files.all</key> + <true/> + <key>com.apple.security.cs.disable-library-validation</key> + <true/> + <key>com.apple.security.cs.disable-executable-page-protection</key> + <true/> + <key>com.apple.security.cs.allow-jit</key> + <true/> + <key>com.apple.security.cs.allow-unsigned-executable-memory</key> + <true/> + <key>com.apple.security.cs.allow-dyld-environment-variables</key> + <true/> + <key>com.apple.security.device.usb</key> + <true/> + <key>com.apple.security.network.client</key> + <true/> + </dict> +</plist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/main.cpp new/main.cpp --- old/main.cpp 2016-05-16 10:57:42.000000000 +0200 +++ new/main.cpp 2020-01-21 10:32:54.000000000 +0100 @@ -299,16 +299,6 @@ gksuarg1 += QString("'"); QStringList gksuargs; gksuargs.append(gksuarg1); - - /* - QString pkexeclocation = checkforgraphicalsu("pkexec"); - if (pkexeclocation != "REQCNOTFOUND" && app.applicationFilePath() == "/usr/bin/unetbootin" && QFile::exists("/usr/share/polkit-1/actions/org.unetbootin.pkexec.unetbootin.policy")) - { - //QProcess::startDetached(QString("%1 %2 %3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc)); - QProcess::startDetached(QString("%1 %2 %3").arg(pkexeclocation).arg(app.applicationFilePath()).arg(argsconc)); - return 0; - } - */ QString gksulocation = checkforgraphicalsu("gksu"); if (gksulocation != "REQCNOTFOUND") { @@ -341,7 +331,7 @@ rootmsgb.setIcon(QMessageBox::Warning); rootmsgb.setWindowTitle(uninstaller::tr("Must run as root")); rootmsgb.setTextFormat(Qt::RichText); - rootmsgb.setText(uninstaller::tr("%2 must be run as root. Close it, and re-run using either:<br/><b>sudo QT_X11_NO_MITSHM=1 %1</b><br/>or:<br/><b>su -c 'QT_X11_NO_MITSHM=1 %1'</b>").arg(app.applicationFilePath()).arg(UNETBOOTINB)); + rootmsgb.setText(uninstaller::tr("%2 must be run as root. Run it from the command line using:<br/><b>sudo QT_X11_NO_MITSHM=1 %1</b><br/>").arg(app.applicationFilePath()).arg(UNETBOOTINB)); rootmsgb.setStandardButtons(QMessageBox::Ok); switch (rootmsgb.exec()) { @@ -350,6 +340,17 @@ default: break; } + return 0; + /* + QString pkexeclocation = checkforgraphicalsu("pkexec"); + if (pkexeclocation != "REQCNOTFOUND" && app.applicationFilePath() == "/usr/bin/unetbootin" && QFile::exists("/usr/share/polkit-1/actions/org.unetbootin.pkexec.unetbootin.policy")) + { + QProcess::startDetached(QString("%1 %2").arg(pkexeclocation).arg(app.applicationFilePath())); + //QProcess::startDetached(QString("%1 %2 %3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc)); + //QProcess::startDetached(QString("%1 %2 %3").arg(pkexeclocation).arg(app.applicationFilePath()).arg(argsconc)); + return 0; + } + */ #endif #ifdef Q_OS_MAC /* @@ -361,7 +362,29 @@ */ //qDebug() << QString("osascript -e 'do shell script \"%1 %2\" with administrator privileges'").arg(app.applicationFilePath()).arg(argsconc); //QProcess::startDetached(QString("osascript -e 'do shell script \"%1 %2\" with administrator privileges'").arg(app.applicationFilePath()).arg(argsconc)); - QProcess::startDetached("osascript", QStringList() << "-e" << QString("do shell script \"'%1' %2\" with administrator privileges").arg(app.applicationFilePath()).arg(argsconcSingleQuote)); + QProcess process; + process.start("sw_vers", QStringList() << "-productVersion"); + process.waitForFinished(-1); // will wait forever until finished + QString stdout = QString(process.readAllStandardOutput()).trimmed(); + bool is_mojave_or_above = false; + if (stdout.count('.') == 2) { + QStringList version_parts = stdout.split('.'); + int major_version = version_parts[0].toInt(); + int sub_version = version_parts[1].toInt(); + if (major_version == 10 && sub_version >= 14) { + is_mojave_or_above = true; + } else if (major_version > 10) { + is_mojave_or_above = true; + } + } + if (is_mojave_or_above) { + QDir resourceDir = QDir(QApplication::applicationDirPath()); + resourceDir.cdUp(); + resourceDir.cd("Resources"); + QProcess::startDetached("bash", QStringList() << "-c" << QString("SUDO_ASKPASS='%1' sudo --askpass '%2' %3").arg(resourceDir.absoluteFilePath("askpass.js")).arg(app.applicationFilePath()).arg(argsconcSingleQuote)); + } else { + QProcess::startDetached("osascript", QStringList() << "-e" << QString("do shell script \"'%1' %2\" with administrator privileges").arg(app.applicationFilePath()).arg(argsconcSingleQuote)); + } return 0; #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkrelease_github.js new/mkrelease_github.js --- old/mkrelease_github.js 1970-01-01 01:00:00.000000000 +0100 +++ new/mkrelease_github.js 2018-04-28 03:24:54.000000000 +0200 @@ -0,0 +1,38 @@ +// should be run with node.js. install dependencies by running yarn + +let Octokat = require('octokat') +let {exec} = require('shelljs') +let fs = require('fs') +let getsecret = require('getsecret') + +let octo = new Octokat({token: getsecret('github_api_key')}) +let repo = octo.repos('unetbootin', 'unetbootin') + +let version = exec('./vcs-revno').trim() + +let gh = require('ghreleases') +let auth = { + token: getsecret('github_api_key') +} + +async function main() { + let existing_releases = await repo.releases.fetch() + for (let release_info of existing_releases.items) { + if (release_info.tagName == version) { + await repo.releases(release_info.id).remove() + } + } + let release = await repo.releases.create({tag_name: version, body: version, name: version}) + let release_files = [ + `unetbootin-source-${version}.tar.gz`, + `unetbootin-source-${version}.zip`, + `unetbootin-linux-${version}.bin`, + `unetbootin-linux64-${version}.bin`, + `unetbootin-windows-${version}.exe`, + `unetbootin-mac-${version}.dmg` + ].map(x => `release/${x}`) + await new Promise(cb => gh.uploadAssets(auth, 'unetbootin', 'unetbootin', `tags/${version}`, release_files, cb)) +} + +main() + Binary files old/unetbootin.app/Contents/Resources/._askpass.js and new/unetbootin.app/Contents/Resources/._askpass.js differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin.app/Contents/Resources/askpass.js new/unetbootin.app/Contents/Resources/askpass.js --- old/unetbootin.app/Contents/Resources/askpass.js 1970-01-01 01:00:00.000000000 +0100 +++ new/unetbootin.app/Contents/Resources/askpass.js 2020-01-13 08:43:24.000000000 +0100 @@ -0,0 +1,20 @@ +#!/usr/bin/env osascript -l JavaScript + +ObjC.import('stdlib') + +const app = Application.currentApplication() +app.includeStandardAdditions = true + +const result = app.displayDialog('UNetbootin needs permissions to write to your USB drive. Type your password to allow this.', { + defaultAnswer: '', + withIcon: 'stop', + buttons: ['Cancel', 'Ok'], + defaultButton: 'Ok', + hiddenAnswer: true, +}) + +if (result.buttonReturned === 'Ok') { + result.textReturned +} else { + $.exit(255) +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin.cpp new/unetbootin.cpp --- old/unetbootin.cpp 2018-04-28 03:24:54.000000000 +0200 +++ new/unetbootin.cpp 2019-09-29 02:26:32.000000000 +0200 @@ -3724,7 +3724,7 @@ QString menulstxt = QString( "%9\n\n" #ifndef NODEFAULTBOOT - "\nmenuentry \""UNETBOOTINB"\" {\n" + "\nmenuentry \"" UNETBOOTINB "\" {\n" "\tset root=%8\n" "\t%1 %2 %3 %4\n" "\t%5 %6 %7\n" @@ -3845,7 +3845,7 @@ "timeout 10\n" #endif #ifndef NODEFAULTBOOT - "\ntitle "UNETBOOTINB"\n" + "\ntitle " UNETBOOTINB "\n" #ifdef Q_OS_WIN32 "find --set-root %3\n" #endif @@ -4343,7 +4343,7 @@ sdesc4->setText(QString("<b>%1 %2</b>").arg(sdesc4->text()).arg(trcurrent)); if (installType == tr("Hard Disk")) { - rebootmsgtext->setText(tr("After rebooting, select the "UNETBOOTINB" menu entry to boot.%1").arg(postinstmsg)); + rebootmsgtext->setText(tr("After rebooting, select the " UNETBOOTINB " menu entry to boot.%1").arg(postinstmsg)); } if (installType == tr("USB Drive")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin.desktop new/unetbootin.desktop --- old/unetbootin.desktop 2014-04-05 08:33:20.000000000 +0200 +++ new/unetbootin.desktop 2018-05-09 06:14:10.000000000 +0200 @@ -3,7 +3,7 @@ Name=UNetbootin Comment=Tool for creating Live USB drives Categories=Application;System; -Exec=/usr/bin/unetbootin +Exec=/usr/bin/unetbootin_asroot Terminal=false Type=Application Name[en_US]=UNetbootin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin_asroot new/unetbootin_asroot --- old/unetbootin_asroot 1970-01-01 01:00:00.000000000 +0100 +++ new/unetbootin_asroot 2019-09-29 02:26:32.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/bash + +if hash gksu 2> /dev/null; then +gksu env QT_X11_NO_MITSHM=1 unetbootin +elif hash kdesu 2> /dev/null; then +kdesu env QT_X11_NO_MITSHM=1 unetbootin +elif hash gnomesudo 2> /dev/null; then +gnomesudo env QT_X11_NO_MITSHM=1 unetbootin +elif hash kdesudo 2> /dev/null; then +kdesudo env QT_X11_NO_MITSHM=1 unetbootin +elif hash pkexec 2> /dev/null; then +pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY QT_X11_NO_MITSHM=1 unetbootin +else +unetbootin +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vcs-revno new/vcs-revno --- old/vcs-revno 2014-04-05 08:33:20.000000000 +0200 +++ new/vcs-revno 2018-05-09 06:17:32.000000000 +0200 @@ -1,10 +1,11 @@ #!/bin/bash vcsname="$(./vcs-name)" +offset=30 if [ "$vcsname" == "git" ] then -git log --first-parent --pretty=oneline | wc -l | tr -d ' ' +echo $[`git log --first-parent --pretty=oneline | wc -l | tr -d ' '` + $offset] exit 0 fi ++++++ unetbootin-suse.patch ++++++ --- /var/tmp/diff_new_pack.mmFwnL/_old 2020-09-21 17:41:01.476787878 +0200 +++ /var/tmp/diff_new_pack.mmFwnL/_new 2020-09-21 17:41:01.480787881 +0200 @@ -1,8 +1,8 @@ -diff --git a/distrolst.cpp b/distrolst.cpp -index 8cc6580..511ea06 100644 ---- a/distrolst.cpp -+++ b/distrolst.cpp -@@ -753,23 +753,36 @@ if (nameDistro == "openSUSE") +Index: unetbootin/distrolst.cpp +=================================================================== +--- unetbootin.orig/distrolst.cpp ++++ unetbootin/distrolst.cpp +@@ -758,23 +758,36 @@ if (nameDistro == "openSUSE") { cpuarch = "i386"; } @@ -46,23 +46,22 @@ postinstmsg = unetbootin::tr("\n*IMPORTANT* After rebooting, ignore any error messages and select back if prompted for a CD, then go to the main menu, select the 'Start Installation' option, choose 'Network' as the source, choose 'HTTP' as the protocol, enter 'download.opensuse.org' when prompted for a server, and enter '/distribution/%1/repo/oss' when asked for the folder.").arg(relname); } kernelOpts = "splash=silent showopts"; -diff --git a/distrover.cpp b/distrover.cpp -index 156666b..50596d5 100644 ---- a/distrover.cpp -+++ b/distrover.cpp -@@ -175,11 +175,11 @@ unetbootin::tr("<b>Homepage:</b> <a href=\"http://pogostick.net/~pnh/ntpasswd/\"; +Index: unetbootin/distrover.cpp +=================================================================== +--- unetbootin.orig/distrover.cpp ++++ unetbootin/distrover.cpp +@@ -173,11 +173,11 @@ unetbootin::tr("<b>Homepage:</b> <a href "<b>Description:</b> The Offline NT Password and Registry Editor can reset Windows passwords and edit the registry on Windows 2000-Vista.<br/>" "<b>Install Notes:</b> NTPasswd is booted and run in live mode; no installation is required to use it.") << "2008.05.26" << "2011.05.11")); - distroselect->addItem("openSUSE", (QStringList() << "11.1" << -+ distroselect->addItem("openSUSE", (QStringList() << "Leap_15.1" << - unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.opensuse.org/\";>http://www.opensuse.org</a><br/>" ++ distroselect->addItem("openSUSE", (QStringList() << "Leap_15.2" << + unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.opensuse.org/\";>https://www.opensuse.org</a><br/>" - "<b>Description:</b> openSUSE is a user-friendly Novell sponsored distribution.<br/>" -+"<b>Description:</b> The openSUSE project is a community program sponsored by SUSE Linux and other companies.<br/>" ++ "<b>Description:</b> The openSUSE project is a community program sponsored by SUSE Linux and other companies.<br/>" "<b>Install Notes:</b> The default version allows for both installation over the internet (FTP), or offline installation using pre-downloaded installation ISO files.") << - "11.1" << "11.1_x64" << "Factory" << "Factory_x64")); -+ "Leap_15.0" << "Leap_15.1" << "Tumbleweed" << "Tumbleweed_x64")); ++ "Leap_15.1" << "Leap_15.2" << "Tumbleweed" << "Tumbleweed_x64")); distroselect->addItem("Ophcrack", (QStringList() << "XP-LiveCD-2.0" << unetbootin::tr("<b>Homepage:</b> <a href=\"http://ophcrack.sourceforge.net/\";>http://ophcrack.sourceforge.net</a><br/>" "<b>Description:</b> Ophcrack can crack Windows passwords.<br/>" ---
