diff -Nru unetbootin-675/debian/changelog unetbootin-677/debian/changelog --- unetbootin-675/debian/changelog 2019-10-04 06:20:18.000000000 +0000 +++ unetbootin-677/debian/changelog 2020-01-22 09:14:48.000000000 +0000 @@ -1,8 +1,14 @@ -unetbootin (675-1~xenial1) xenial; urgency=low +unetbootin (677-1~xenial1) xenial; urgency=low * Upload to Launchpad - -- Geza Kovacs Thu, 03 Oct 2019 23:20:16 -0700 + -- Geza Kovacs Wed, 22 Jan 2020 01:14:46 -0800 + +unetbootin (677-1) unstable; urgency=medium + + * Import Upstream version 677 + + -- Geza Kovacs Wed, 22 Jan 2020 01:10:55 -0800 unetbootin (675-1) unstable; urgency=medium Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._distrolst.cpp and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._distrolst.cpp differ Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._distrover.cpp and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._distrover.cpp differ Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._entitlements.xml and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._entitlements.xml differ diff -Nru unetbootin-675/entitlements.xml unetbootin-677/entitlements.xml --- unetbootin-675/entitlements.xml 1970-01-01 00:00:00.000000000 +0000 +++ unetbootin-677/entitlements.xml 2020-01-21 09:39:54.000000000 +0000 @@ -0,0 +1,23 @@ + + + + com.apple.security.files.downloads.read-only + + com.apple.security.files.all + + com.apple.security.cs.disable-library-validation + + com.apple.security.cs.disable-executable-page-protection + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.allow-dyld-environment-variables + + com.apple.security.device.usb + + com.apple.security.network.client + + + Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._INSTALL and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._INSTALL differ diff -Nru unetbootin-675/main.cpp unetbootin-677/main.cpp --- unetbootin-675/main.cpp 2018-05-09 02:45:36.000000000 +0000 +++ unetbootin-677/main.cpp 2020-01-21 09:32:54.000000000 +0000 @@ -362,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 } Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._mkrelease_github.js and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._mkrelease_github.js differ diff -Nru unetbootin-675/mkrelease_github.js unetbootin-677/mkrelease_github.js --- unetbootin-675/mkrelease_github.js 1970-01-01 00:00:00.000000000 +0000 +++ unetbootin-677/mkrelease_github.js 2018-04-28 01:24:54.000000000 +0000 @@ -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() + diff -Nru unetbootin-675/README.TXT unetbootin-677/README.TXT --- unetbootin-675/README.TXT 2019-10-04 04:38:39.000000000 +0000 +++ unetbootin-677/README.TXT 2020-01-21 10:24:19.000000000 +0000 @@ -1,16 +1,16 @@ -UNetbootin Source Revision 675 +UNetbootin Source Revision 677 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 2019年10月 3日星期四 21时38分39秒 PDT +Build generated on 2020年 1月21日星期二 02时24分19秒 PST Download using git: git clone https://github.com/gkovacs/unetbootin.git cd unetbootin -git checkout eba0a2da6c40f3493d88bc5bce733cf288f8d6ce +git checkout 408785193d87b38d866273365c0b4a0be847d4a3 Download using bzr: -bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r675 +bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r677 Build instructions at http://sourceforge.net/apps/trac/unetbootin/wiki/compile Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/unetbootin.app/Contents/Resources/._askpass.js and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/unetbootin.app/Contents/Resources/._askpass.js differ diff -Nru unetbootin-675/unetbootin.app/Contents/Resources/askpass.js unetbootin-677/unetbootin.app/Contents/Resources/askpass.js --- unetbootin-675/unetbootin.app/Contents/Resources/askpass.js 1970-01-01 00:00:00.000000000 +0000 +++ unetbootin-677/unetbootin.app/Contents/Resources/askpass.js 2020-01-13 07:43:24.000000000 +0000 @@ -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 Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._unetbootin_asroot and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._unetbootin_asroot differ Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._unetbootin.cpp and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._unetbootin.cpp differ Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._unetbootin.h and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._unetbootin.h differ Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._unetbootin.pro and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._unetbootin.pro differ Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._unetbootin.ui and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._unetbootin.ui differ Binary files /tmp/tmpEhcv8h/qrTeV1Q2oP/unetbootin-675/._vcs-revno and /tmp/tmpEhcv8h/bh5N3VP58w/unetbootin-677/._vcs-revno differ