Hello community, here is the log from the commit of package unetbootin for openSUSE:Factory checked in at 2017-06-20 09:40:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unetbootin (Old) and /work/SRC/openSUSE:Factory/.unetbootin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unetbootin" Tue Jun 20 09:40:17 2017 rev:6 rq:504536 version:0.0.647 Changes: -------- --- /work/SRC/openSUSE:Factory/unetbootin/unetbootin.changes 2016-07-01 10:00:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.unetbootin.new/unetbootin.changes 2017-06-20 09:40:19.004733107 +0200 @@ -1,0 +2,7 @@ +Sat Jun 17 10:36:23 UTC 2017 - [email protected] + +- update to revision 647 +- change selectable openSUSE versions only to supported versions: + 13.2, Leap_42.1, Leap_42.2, Tumbleweed, Factory + +------------------------------------------------------------------- Old: ---- unetbootin-source-625.tar.gz New: ---- unetbootin-source-647.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unetbootin.spec ++++++ --- /var/tmp/diff_new_pack.qGsVlw/_old 2017-06-20 09:40:19.980595517 +0200 +++ /var/tmp/diff_new_pack.qGsVlw/_new 2017-06-20 09:40:19.984594954 +0200 @@ -16,7 +16,7 @@ # -%define rev 625 +%define rev 647 Name: unetbootin Summary: Universal Netboot Installer ++++++ unetbootin-source-625.tar.gz -> unetbootin-source-647.tar.gz ++++++ Binary files old/._INSTALL and new/._INSTALL differ Binary files old/._README.TXT and new/._README.TXT differ Binary files old/._build-nostatic and new/._build-nostatic differ Binary files old/._customdistrolst.cpp and new/._customdistrolst.cpp differ Binary files old/._customdistselect.cpp and new/._customdistselect.cpp differ Binary files old/._distrolst.cpp and new/._distrolst.cpp differ Binary files old/._distrover.cpp and new/._distrover.cpp differ Binary files old/._distrovercust.cpp and new/._distrovercust.cpp differ Binary files old/._main.cpp and new/._main.cpp differ Binary files old/._org.unetbootin.pkexec.unetbootin.policy and new/._org.unetbootin.pkexec.unetbootin.policy differ Binary files old/._unetbootin.cpp and new/._unetbootin.cpp differ Binary files old/._unetbootin.desktop and new/._unetbootin.desktop 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.ts and new/._unetbootin.ts differ Binary files old/._unetbootin.ui and new/._unetbootin.ui differ Binary files old/._unetbootin.xpm and new/._unetbootin.xpm differ Binary files old/._unetbootin_128.png and new/._unetbootin_128.png differ Binary files old/._unetbootin_14.png and new/._unetbootin_14.png differ Binary files old/._unetbootin_16.png and new/._unetbootin_16.png differ Binary files old/._unetbootin_192.png and new/._unetbootin_192.png differ Binary files old/._unetbootin_22.png and new/._unetbootin_22.png differ Binary files old/._unetbootin_24.png and new/._unetbootin_24.png differ Binary files old/._unetbootin_256.png and new/._unetbootin_256.png differ Binary files old/._unetbootin_32.png and new/._unetbootin_32.png differ Binary files old/._unetbootin_48.png and new/._unetbootin_48.png differ Binary files old/._unetbootin_512.png and new/._unetbootin_512.png differ Binary files old/._unetbootin_64.png and new/._unetbootin_64.png differ Binary files old/._unetbootin_am.ts and new/._unetbootin_am.ts differ Binary files old/._unetbootin_ar.ts and new/._unetbootin_ar.ts differ Binary files old/._unetbootin_ast.ts and new/._unetbootin_ast.ts differ Binary files old/._unetbootin_be.ts and new/._unetbootin_be.ts differ Binary files old/._unetbootin_bg.ts and new/._unetbootin_bg.ts differ Binary files old/._unetbootin_bn.ts and new/._unetbootin_bn.ts differ Binary files old/._unetbootin_ca.ts and new/._unetbootin_ca.ts differ Binary files old/._unetbootin_cs.ts and new/._unetbootin_cs.ts differ Binary files old/._unetbootin_custom.ts and new/._unetbootin_custom.ts differ Binary files old/._unetbootin_da.ts and new/._unetbootin_da.ts differ Binary files old/._unetbootin_de.ts and new/._unetbootin_de.ts differ Binary files old/._unetbootin_el.ts and new/._unetbootin_el.ts differ Binary files old/._unetbootin_eo.ts and new/._unetbootin_eo.ts differ Binary files old/._unetbootin_es.ts and new/._unetbootin_es.ts differ Binary files old/._unetbootin_et.ts and new/._unetbootin_et.ts differ Binary files old/._unetbootin_eu.ts and new/._unetbootin_eu.ts differ Binary files old/._unetbootin_fa.ts and new/._unetbootin_fa.ts differ Binary files old/._unetbootin_fi.ts and new/._unetbootin_fi.ts differ Binary files old/._unetbootin_fo.ts and new/._unetbootin_fo.ts differ Binary files old/._unetbootin_fr.ts and new/._unetbootin_fr.ts differ Binary files old/._unetbootin_gl.ts and new/._unetbootin_gl.ts differ Binary files old/._unetbootin_he.ts and new/._unetbootin_he.ts differ Binary files old/._unetbootin_hr.ts and new/._unetbootin_hr.ts differ Binary files old/._unetbootin_hu.ts and new/._unetbootin_hu.ts differ Binary files old/._unetbootin_icons.svg and new/._unetbootin_icons.svg differ Binary files old/._unetbootin_id.ts and new/._unetbootin_id.ts differ Binary files old/._unetbootin_it.ts and new/._unetbootin_it.ts differ Binary files old/._unetbootin_ja.ts and new/._unetbootin_ja.ts differ Binary files old/._unetbootin_lt.ts and new/._unetbootin_lt.ts differ Binary files old/._unetbootin_lv.ts and new/._unetbootin_lv.ts differ Binary files old/._unetbootin_ml.ts and new/._unetbootin_ml.ts differ Binary files old/._unetbootin_ms.ts and new/._unetbootin_ms.ts differ Binary files old/._unetbootin_nan.ts and new/._unetbootin_nan.ts differ Binary files old/._unetbootin_nb.ts and new/._unetbootin_nb.ts differ Binary files old/._unetbootin_nl.ts and new/._unetbootin_nl.ts differ Binary files old/._unetbootin_nn.ts and new/._unetbootin_nn.ts differ Binary files old/._unetbootin_pl.ts and new/._unetbootin_pl.ts differ Binary files old/._unetbootin_pt.ts and new/._unetbootin_pt.ts differ Binary files old/._unetbootin_pt_BR.ts and new/._unetbootin_pt_BR.ts differ Binary files old/._unetbootin_ro.ts and new/._unetbootin_ro.ts differ Binary files old/._unetbootin_ru.ts and new/._unetbootin_ru.ts differ Binary files old/._unetbootin_si.ts and new/._unetbootin_si.ts differ Binary files old/._unetbootin_sk.ts and new/._unetbootin_sk.ts differ Binary files old/._unetbootin_sl.ts and new/._unetbootin_sl.ts differ Binary files old/._unetbootin_sr.ts and new/._unetbootin_sr.ts differ Binary files old/._unetbootin_sv.ts and new/._unetbootin_sv.ts differ Binary files old/._unetbootin_sw.ts and new/._unetbootin_sw.ts differ Binary files old/._unetbootin_tr.ts and new/._unetbootin_tr.ts differ Binary files old/._unetbootin_uk.ts and new/._unetbootin_uk.ts differ Binary files old/._unetbootin_ur.ts and new/._unetbootin_ur.ts differ Binary files old/._unetbootin_vi.ts and new/._unetbootin_vi.ts differ Binary files old/._unetbootin_zh_CN.ts and new/._unetbootin_zh_CN.ts differ Binary files old/._unetbootin_zh_TW.ts and new/._unetbootin_zh_TW.ts differ Binary files old/._vcs-name and new/._vcs-name differ Binary files old/._vcs-revno and new/._vcs-revno differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.TXT new/README.TXT --- old/README.TXT 2016-05-16 11:24:20.000000000 +0200 +++ new/README.TXT 2017-05-01 07:40:11.000000000 +0200 @@ -1,16 +1,16 @@ -UNetbootin Source Revision 625 +UNetbootin Source Revision 647 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 Mon May 16 02:24:20 PDT 2016 +Build generated on Sun Apr 30 22:40:11 PDT 2017 Download using git: git clone https://github.com/gkovacs/unetbootin.git cd unetbootin -git checkout 807d69b20c2bd403ecd63ea4fe8cfbe5bb49ce33 +git checkout e1bb2616dba89676730603cb1fd450679765cc63 Download using bzr: -bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r625 +bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r647 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 2016-05-16 11:16:09.000000000 +0200 +++ new/distrolst.cpp 2017-05-01 07:04:50.000000000 +0200 @@ -18,6 +18,7 @@ #ifndef ubunturelnamereplace #define ubunturelnamereplace \ relname \ + .replace("17.04", "zesty") \ .replace("16.10", "yakkety") \ .replace("16.04", "xenial") \ .replace("15.10", "wily") \ @@ -785,17 +786,9 @@ if (nameDistro == "Parted Magic") { - if (relname == "2.1") - { - downloadfile("http://downloads.sourceforge.net/sourceforge/lubi/partedmagic-2.1-kernel";, QString("%1ubnkern").arg(targetPath)); - downloadfile("http://downloads.sourceforge.net/sourceforge/lubi/partedmagic-2.1-initrd";, QString("%1ubninit").arg(targetPath)); - kernelOpts = "noapic root=/dev/ram0 init=/linuxrc ramdisk_size=200000 keymap=us liveusb vga=791 quiet toram"; - } - else - { - downloadfile("http://partedmagic.com/partedmagic-latest.iso";, isotmpf); - extractiso(isotmpf); - } + downloadfile("http://downloads.sourceforge.net/sourceforge/lubi/partedmagic-2.1-kernel";, QString("%1ubnkern").arg(targetPath)); + downloadfile("http://downloads.sourceforge.net/sourceforge/lubi/partedmagic-2.1-initrd";, QString("%1ubninit").arg(targetPath)); + kernelOpts = "noapic root=/dev/ram0 init=/linuxrc ramdisk_size=200000 keymap=us liveusb vga=791 quiet toram"; } if (nameDistro == "PCLinuxOS") @@ -1198,4 +1191,10 @@ extractiso(isotmpf); } +if (nameDistro == "3CX") +{ + downloadfile(QString("http://unetbootin.sourceforge.net/distros/3CX/pbx_debian_x64.php";), isotmpf); + extractiso(isotmpf); +} + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distrover.cpp new/distrover.cpp --- old/distrover.cpp 2016-05-16 11:18:44.000000000 +0200 +++ new/distrover.cpp 2017-04-24 01:22:37.000000000 +0200 @@ -13,6 +13,8 @@ "14.04_NetInstall" << "14.04_NetInstall_x64" << "14.04_HdMedia" << "14.04_HdMedia_x64" << "14.04_Live" << "14.04_Live_x64" << \ "15.10_NetInstall" << "15.10_NetInstall_x64" << "15.10_HdMedia" << "15.10_HdMedia_x64" << "15.10_Live" << "15.10_Live_x64" << \ "16.04_NetInstall" << "16.04_NetInstall_x64" << "16.04_HdMedia" << "16.04_HdMedia_x64" << "16.04_Live" << "16.04_Live_x64" << \ +"16.10_NetInstall" << "16.10_NetInstall_x64" << "16.10_HdMedia" << "16.10_HdMedia_x64" << "16.10_Live" << "16.10_Live_x64" << \ +"17.04_NetInstall" << "17.04_NetInstall_x64" << "17.04_HdMedia" << "17.04_HdMedia_x64" << "17.04_Live" << "17.04_Live_x64" << \ "Daily_Live" << "Daily_Live_x64" #endif @@ -185,11 +187,11 @@ "<b>Description:</b> Ophcrack can crack Windows passwords.<br/>" "<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() << "Latest_Live" << +distroselect->addItem("Parted Magic", (QStringList() << "2.1_Live" << unetbootin::tr("<b>Homepage:</b> <a href=\"http://partedmagic.com/\";>http://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" << "Latest_Live")); +"2.1_Live")); //distroselect->addItem("PCLinuxOS", (QStringList() << "KDE 2010" << //unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.pclinuxos.com/\";>http://www.pclinuxos.com</a><br/>" // "<b>Description:</b> PCLinuxOS is a user-friendly Mandriva-based distribution.<br/>" @@ -267,3 +269,7 @@ "<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")); +distroselect->addItem("3CX", (QStringList() << "pbx_debian_x64" << +unetbootin::tr("<b>Homepage:</b> <a href=\"https://www.3cx.com/\";>https://www.3cx.com</a><br/>" + "<b>Description:</b> 3CX is a specialist, Debian-based Linux distribution designed to run a complete unified communications platform. It provides a complete open standards-based IP PBX and phone system that works with popular SIP trunks and IP phones. It will automatically configure all supported peripherals and it also comes with clients for Windows, OS X, iOS and Android. The ISO image includes a free license for the 3CX PBX edition.<br/>") << +"pbx_debian_x64")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin.cpp new/unetbootin.cpp --- old/unetbootin.cpp 2016-05-16 10:47:38.000000000 +0200 +++ new/unetbootin.cpp 2017-05-01 07:39:31.000000000 +0200 @@ -552,6 +552,19 @@ return listsanedrives(); } +#ifdef Q_OS_MAC +bool unetbootin::is_external_drive_macos(const QString &drivename) +{ + // drivename: disk3s1 + QString device_info = callexternapp("diskutil", "info " + drivename); + if (device_info.contains("External")) + { + return true; + } + return false; +} +#endif + QStringList unetbootin::listsanedrives() { QStringList fulldrivelist; @@ -621,7 +634,9 @@ QStringList usbdevsL = diskutilList.split("\n").filter(QRegExp("(FAT|Microsoft)")).join(" ").split(" ").filter("disk"); for (int i = 0; i < usbdevsL.size(); ++i) { - fulldrivelist.append("/dev/"+usbdevsL.at(i)); + if (is_external_drive_macos(usbdevsL.at(i))) { + fulldrivelist.append("/dev/"+usbdevsL.at(i)); + } } #endif } @@ -4096,7 +4111,7 @@ // make active if (sfdiskcommand != "") { // use sfdisk if available - callexternapp(sfdiskcommand, QString("%1 -A%2").arg(rawtargetDev, QString(targetDev).remove(rawtargetDev).remove("p"))); + callexternapp(sfdiskcommand, QString("%1 -A %2").arg(rawtargetDev, QString(targetDev).remove(rawtargetDev).remove("p"))); } else { // use fdisk if sfdisk is unavailable bool isOk = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin.h new/unetbootin.h --- old/unetbootin.h 2016-05-16 10:47:38.000000000 +0200 +++ new/unetbootin.h 2017-05-01 04:40:40.000000000 +0200 @@ -295,6 +295,7 @@ #ifdef Q_OS_MAC QString getlabel(QString voldrive, QString diskutilinfo); QString getuuid(QString voldrive, QString diskutilinfo); + bool is_external_drive_macos(const QString &drivename); #endif void refreshdriveslist(); QStringList listcurdrives(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin.pro new/unetbootin.pro --- old/unetbootin.pro 2016-05-16 11:24:22.000000000 +0200 +++ new/unetbootin.pro 2017-05-01 07:40:11.000000000 +0200 @@ -4,6 +4,7 @@ INCLUDEPATH += . CONFIG += release \ static + HEADERS += unetbootin.h FORMS += unetbootin.ui SOURCES += main.cpp \ ++++++ unetbootin-suse.patch ++++++ --- /var/tmp/diff_new_pack.qGsVlw/_old 2017-06-20 09:40:20.204563940 +0200 +++ /var/tmp/diff_new_pack.qGsVlw/_new 2017-06-20 09:40:20.204563940 +0200 @@ -1,18 +1,16 @@ -Index: distrover.cpp -=================================================================== ---- distrover.cpp.orig -+++ distrover.cpp -@@ -175,11 +175,11 @@ unetbootin::tr("<b>Homepage:</b> <a href +--- distrover.cpp.orig 2017-04-24 01:22:37.000000000 +0200 ++++ distrover.cpp 2017-06-17 12:32:55.939553687 +0200 +@@ -177,11 +177,11 @@ "<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_42.1" << ++ distroselect->addItem("openSUSE", (QStringList() << "Leap_42.2" << unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.opensuse.org/\";>http://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")); -+ "13.1" << "13.1_x64" << "13.2" << "13.2_x64" << "Leap_42.1" << "Tumbleweed" << "Tumbleweed_x64" << "Factory" << "Factory_x64")); ++ "13.2" << "13.2_x64" << "Leap_42.1" << "Leap_42.2" << "Tumbleweed" << "Tumbleweed_x64" << "Factory" << "Factory_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/>"
