svn commit: r524170 - in head/sysutils/unetbootin: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Sun Jan 26 11:30:19 UTC 2020
Author: danfe
Date: Sun Jan 26 11:30:18 2020
New Revision: 524170
URL: https://svnweb.freebsd.org/changeset/ports/524170
Log:
- Update to version 677
- Avoid segmentation fault
PR: 236972
Modified:
head/sysutils/unetbootin/Makefile
head/sysutils/unetbootin/distinfo
head/sysutils/unetbootin/files/patch-unetbootin.cpp
Modified: head/sysutils/unetbootin/Makefile
==============================================================================
--- head/sysutils/unetbootin/Makefile Sun Jan 26 11:28:39 2020 (r524169)
+++ head/sysutils/unetbootin/Makefile Sun Jan 26 11:30:18 2020 (r524170)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unetbootin
-PORTVERSION= 661
+PORTVERSION= 677
CATEGORIES= sysutils
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
Modified: head/sysutils/unetbootin/distinfo
==============================================================================
--- head/sysutils/unetbootin/distinfo Sun Jan 26 11:28:39 2020 (r524169)
+++ head/sysutils/unetbootin/distinfo Sun Jan 26 11:30:18 2020 (r524170)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524913051
-SHA256 (unetbootin-source-661.tar.gz) = 0f909a1a473617e3b8d40d14741b6de58697c48b4c4c782d3d427a82a3b9cd10
-SIZE (unetbootin-source-661.tar.gz) = 768431
+TIMESTAMP = 1579602262
+SHA256 (unetbootin-source-677.tar.gz) = 7e0ef849041a56f06cfebf543e3bf6ae41b2f9d8c4762636aeb58a347d69e7bf
+SIZE (unetbootin-source-677.tar.gz) = 770463
Modified: head/sysutils/unetbootin/files/patch-unetbootin.cpp
==============================================================================
--- head/sysutils/unetbootin/files/patch-unetbootin.cpp Sun Jan 26 11:28:39 2020 (r524169)
+++ head/sysutils/unetbootin/files/patch-unetbootin.cpp Sun Jan 26 11:30:18 2020 (r524170)
@@ -1,4 +1,4 @@
---- unetbootin.cpp.orig 2018-04-28 01:24:54 UTC
+--- unetbootin.cpp.orig 2019-09-29 00:26:32 UTC
+++ unetbootin.cpp
@@ -9,6 +9,11 @@ This program is distributed in the hope that it will b
@@ -539,7 +539,7 @@
}
else if (srcfName == "mbr.bin")
{
-@@ -3516,11 +3535,19 @@ void unetbootin::runinst()
+@@ -3516,11 +3535,26 @@ void unetbootin::runinst()
}
if (installType == tr("USB Drive"))
{
@@ -552,6 +552,13 @@
+#endif
+#ifdef Q_OS_FREEBSD
+ QStringList driveinfo = driveselect->currentText().split(":");
++ if (driveinfo.size() < 2) {
++ QTextStream out(stdout);
++ out << "/!\\ Target drive must be passed as "
++ "<device-name>:<mount-point>" << endl << flush;
++ QApplication::exit();
++ exit(1);
++ }
+ targetDev = driveinfo.at(0);
+ installDir = ginstallDir = "";
+ targetDrive = QString("%1/").arg(driveinfo.at(1));
@@ -559,7 +566,7 @@
}
#ifdef Q_OS_LINUX
if (targetDev.contains(QRegExp("p\\d$")))
-@@ -3528,7 +3555,7 @@ void unetbootin::runinst()
+@@ -3528,7 +3562,7 @@ void unetbootin::runinst()
else
rawtargetDev = QString(targetDev).remove(QRegExp("\\d$"));
#endif
@@ -568,25 +575,7 @@
rawtargetDev = QString(targetDev).remove(QRegExp("s\\d$"));
#endif
#endif
-@@ -3724,7 +3751,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 +3872,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
-@@ -4281,21 +4308,47 @@ void unetbootin::runinstusb()
+@@ -4281,21 +4315,47 @@ void unetbootin::runinstusb()
instIndvfl("libutil.c32", QString("%1libutil.c32").arg(targetPath));
instIndvfl("libcom32.c32", QString("%1libcom32.c32").arg(targetPath));
}
@@ -645,7 +634,7 @@
if (this->persistenceSpaceMB > 0)
{
pdesc1->setText(tr("Setting up persistence"));
-@@ -4334,6 +4387,20 @@ void unetbootin::fininstall()
+@@ -4334,6 +4394,20 @@ void unetbootin::fininstall()
rmFile(mke2fscommand);
#endif
}
@@ -666,16 +655,7 @@
pdesc1->setText("");
progresslayer->setEnabled(false);
progresslayer->hide();
-@@ -4343,7 +4410,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"))
- {
-@@ -4357,7 +4424,8 @@ void unetbootin::fininstall()
+@@ -4357,7 +4431,8 @@ void unetbootin::fininstall()
finishLogging();
if (exitOnCompletion)
{
More information about the svn-ports-head
mailing list